From 20db613096a297f8bc85368efff017d2db0515f7 Mon Sep 17 00:00:00 2001 From: Lukasz Baldyga Date: Sun, 15 Nov 2020 04:57:21 +0000 Subject: [PATCH] Replaced parameters.Length with dedicated variable for length --- .../Verbs/VerbFactory.cs | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs index 2572d0e..67a68b0 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.CodeDom; using System.Collections.Generic; using System.Linq; @@ -30,12 +30,14 @@ namespace Advanced_Software_Engineering { string command = commandAndParameters["command"][0]; string[] parameters = commandAndParameters.Keys.Contains("parameters") ? commandAndParameters["parameters"] : new string[] { }; + int parameterLength = parameters.Length; switch (command) { + //Drawing commands case "move": case "moveto": //Check parameters - if (parameters.Length == 2) { + if (parameterLength == 2) { return new MoveTo(drawer, Value.ConvertToInt(parameters[0]), Value.ConvertToInt(parameters[1])); @@ -46,7 +48,7 @@ namespace Advanced_Software_Engineering { case "line": case "lineto": //Check parameters - if (parameters.Length == 2) { + if (parameterLength == 2) { return new DrawTo(drawer, Value.ConvertToInt(parameters[0]), @@ -55,13 +57,13 @@ namespace Advanced_Software_Engineering { case "regularpolygon": case "rp": //Check parameters - if (parameters.Length == 2) { + if (parameterLength == 2) { return new RegularPolygon(drawer, Value.ConvertToInt(parameters[0]), Value.ConvertToDouble(parameters[1]) ); - } else if (parameters.Length == 3) { + } else if (parameterLength == 3) { return new RegularPolygon(drawer, Value.ConvertToInt(parameters[0]), Value.ConvertToDouble(parameters[1]), @@ -70,12 +72,12 @@ namespace Advanced_Software_Engineering { } else throw new Exception(command + " has an incorrect number of parameters"); case "square": //Check parameters - if (parameters.Length == 1) { + if (parameterLength == 1) { return new Square(drawer, Value.ConvertToDouble(parameters[0]) ); - } else if (parameters.Length == 2) { + } else if (parameterLength == 2) { return new Square(drawer, Value.ConvertToDouble(parameters[0]), Value.ConvertToDouble(parameters[1]) @@ -83,7 +85,7 @@ namespace Advanced_Software_Engineering { } else throw new Exception(command + " has an incorrect number of parameters"); case "quadrilateral": //Check parameters - if (parameters.Length == 8) { + if (parameterLength == 8) { return new Quadrilateral(drawer, Value.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[2], parameters[3]), @@ -93,12 +95,12 @@ namespace Advanced_Software_Engineering { } else throw new Exception(command + " has an incorrect number of parameters"); case "rectangle": //Check parameters - if (parameters.Length == 2) { + if (parameterLength == 2) { return new Rectangle(drawer, Value.ConvertToDouble(parameters[0]), Value.ConvertToDouble(parameters[1]) ); - } else if (parameters.Length == 8) { + } else if (parameterLength == 8) { return new Quadrilateral(drawer, Value.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[2], parameters[3]), @@ -108,7 +110,7 @@ namespace Advanced_Software_Engineering { } else throw new Exception(command + " has an incorrect number of parameters"); case "circle": //Check parameters - if (parameters.Length == 1) { + if (parameterLength == 1) { return new Circle(drawer, Value.ConvertToDouble(parameters[0]) @@ -116,18 +118,18 @@ namespace Advanced_Software_Engineering { } else throw new Exception(command + " has an incorrect number of parameters"); case "triangle": //Check parameters - if (parameters.Length == 1) { + if (parameterLength == 1) { return new Triangle(drawer, Value.ConvertToDouble(parameters[0]) ); - } else if (parameters.Length == 2) { + } else if (parameterLength == 2) { return new Triangle(drawer, Value.ConvertToDouble(parameters[0]), Value.ConvertToDouble(parameters[1]) ); - } else if (parameters.Length == 6) { + } else if (parameterLength == 6) { return new Triangle(drawer, Value.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[2], parameters[3]), @@ -136,36 +138,36 @@ namespace Advanced_Software_Engineering { } else throw new Exception(command + " has an incorrect number of parameters"); case "dot": - if (parameters.Length == 0) { + if (parameterLength == 0) { return new Dot(drawer); } else throw new Exception(command + " doesn't take parameters"); case "clear": - if (parameters.Length == 0) { + if (parameterLength == 0) { return new Clear(drawer); } else throw new Exception(command + " doesn't take parameters"); case "reset": case "resetpen": - if (parameters.Length == 0) { + if (parameterLength == 0) { return new ResetPen(drawer); } else throw new Exception(command + " doesn't take parameters"); case "fillon": - if (parameters.Length == 0) { + if (parameterLength == 0) { return new Fill(drawer, true); } else throw new Exception(command + " doesn't take parameters"); case "filloff": - if (parameters.Length == 0) { + if (parameterLength == 0) { return new Fill(drawer, false); } else throw new Exception(command + " doesn't take parameters"); case "pen": - if (parameters.Length == 1) { + if (parameterLength == 1) { return new PenColor(drawer, Value.TextToColor(parameters[0])); - } else if (parameters.Length == 3) { + } else if (parameterLength == 3) { return new PenColor(drawer, Value.IntsToColor( Value.ConvertToInt(parameters[0]), @@ -173,7 +175,7 @@ namespace Advanced_Software_Engineering { Value.ConvertToInt(parameters[2]) ) ); - } else if (parameters.Length == 4) { + } else if (parameterLength == 4) { return new PenColor(drawer, Value.IntsToColor( Value.ConvertToInt(parameters[0]), @@ -184,9 +186,9 @@ namespace Advanced_Software_Engineering { ); } else throw new Exception(command + " has an incorrect number of parameters"); case "fill": - if (parameters.Length == 1) { + if (parameterLength == 1) { return new FillColor(drawer, Value.TextToColor(parameters[0])); - } else if (parameters.Length == 3) { + } else if (parameterLength == 3) { return new FillColor(drawer, Value.IntsToColor( Value.ConvertToInt(parameters[0]), @@ -194,7 +196,7 @@ namespace Advanced_Software_Engineering { Value.ConvertToInt(parameters[2]) ) ); - } else if (parameters.Length == 4) { + } else if (parameterLength == 4) { return new FillColor(drawer, Value.IntsToColor( Value.ConvertToInt(parameters[0]),