Code cleanup

Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs

@@ -4,8 +4,8 @@ using System.Windows.Forms;
 namespace Advanced_Software_Engineering {
 
     public class CommandAndParameterParserResult {
-        string command;
+        private string command;
-        string[] parameters;
+        private string[] parameters;
 
         public CommandAndParameterParserResult(string command, string[] parameters) {
             this.command = command;
@@ -117,7 +117,6 @@ namespace Advanced_Software_Engineering {
         /// <param name="text">A string command</param>
         /// <returns>Directory with the command and its parameters cleanly separated</returns>
         public static CommandAndParameterParserResult CommandAndParameterParser(string text) {
-
             //prepare the parameters by stripping them of spaces
             string prepParameters = Strip(text);
             if (prepParameters.Length == 0) return null;

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs

@@ -1,5 +1,4 @@
 using Advanced_Software_Engineering.Verbs.Value;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs

@@ -1,5 +1,4 @@
 using Advanced_Software_Engineering.Verbs.Value;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs

@@ -1,6 +1,4 @@
-using Advanced_Software_Engineering.Verbs.Value;
+using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
-using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs

@@ -1,5 +1,4 @@
-using Advanced_Software_Engineering.Verbs.Value;
+using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
-using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs

@@ -1,6 +1,4 @@
-using Advanced_Software_Engineering.Verbs.Value;
+using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
-using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs

@@ -1,8 +1,6 @@
 using Advanced_Software_Engineering.Verbs.Value;
 using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
 using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
-using System.Collections.Generic;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs

@@ -3,7 +3,6 @@ using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
 using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs

@@ -1,7 +1,6 @@
 using Advanced_Software_Engineering.Verbs.Value;
 using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
 using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs

@@ -17,7 +17,7 @@ namespace Advanced_Software_Engineering.Verbs.Value {
         /// <param name="name">The name of the variable</param>
         /// <returns>True if the name is valid, otherwise false</returns>
         private bool CheckName(string name) {
-            foreach(char character in illegalCharacters) {
+            foreach (char character in illegalCharacters) {
                 if (name.Contains(character.ToString())) return false;
             }
             return true;
@@ -33,7 +33,7 @@ namespace Advanced_Software_Engineering.Verbs.Value {
             // i = 2 == 5
 
             // bools have ==
-            if(!(type == "bool")) {
+            if (!(type == "bool")) {
                 //Seperate the assignment from the variables
                 List<string> assignmentList = SettingsAndHelperFunctions.StripStringArray(assignment.Split("="[0]));
                 name = assignmentList[0];
@@ -44,7 +44,6 @@ namespace Advanced_Software_Engineering.Verbs.Value {
                 //boolean here
                 throw new NotImplementedException("Booleans cannot be parsed yet");
             }
-
         }
 
         public void ExecuteVerb() {

Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueFactory.cs

@@ -1,5 +1,5 @@
-using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
+using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
-using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
+using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
 using System;
 
 namespace Advanced_Software_Engineering.Verbs.Value {

Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs

@@ -124,7 +124,6 @@ namespace Advanced_Software_Engineering.Verbs.Value {
             text = SettingsAndHelperFunctions.Strip(text);
             //No assignmnet
             if (!text.Contains("=")) {
-
                 if (!text.Contains("#")) {
                     //Check if string is a number
                     if (!text.Contains("."))

Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs

@@ -1,5 +1,4 @@
 using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
-using System;
 using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects {
@@ -9,7 +8,7 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects {
         private IValue g;
         private IValue b;
 
-        bool hasAlpha;
+        private bool hasAlpha;
         private IValue a;
 
         public ColorValue(Color value) {

Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs

@@ -1,5 +1,4 @@
-using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
+using System.Drawing;
-using System.Drawing;
 
 namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects {
 

Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs

@@ -23,7 +23,6 @@ namespace Advanced_Software_Engineering.Verbs.Value {
 
             //Check for bad input
             if (operation > 3 && operation < 0) throw new Exception("Bad operation");
-            
         }
 
         private IValue Evaluate() {
@@ -99,22 +98,18 @@ namespace Advanced_Software_Engineering.Verbs.Value {
         }
 
         public bool ToBool() {
- 
             return Evaluate().ToBool();
         }
 
         public Color ToColor() {
-
             return Evaluate().ToColor();
         }
 
         public double ToDouble() {
-
             return Evaluate().ToDouble();
         }
 
         public int ToInt() {
-
             return Evaluate().ToInt();
         }
     }

Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs

@@ -4,7 +4,6 @@ using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
 using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Advanced_Software_Engineering {
 
@@ -31,15 +30,15 @@ namespace Advanced_Software_Engineering {
 
             //process declarations first
 
-            if(!(commandParameters == null))
+            if (!(commandParameters == null))
                 switch (command) {
                     case "int":
                     case "double":
                     case "bool":
                     case "color":
                         if (commandParameters.Length == 1) {
-                        return new DeclareVariable(drawer, command, commandParameters[0]);
+                            return new DeclareVariable(drawer, command, commandParameters[0]);
-                    } else throw new Exception(command + "s need to be initialised");
+                        } else throw new Exception(command + "s need to be initialised");
 
                     default:
                         //assignment
@@ -51,14 +50,12 @@ namespace Advanced_Software_Engineering {
                         break;
                 }
 
-
             List<IValue> parameters = new List<IValue>();
-            if( !(commandParameters == null) ) foreach(string parameter in commandParameters) {
+            if (!(commandParameters == null)) foreach (string parameter in commandParameters) {
                     parameters.Add(ValueFactory.CreateValue(drawer, parameter));
-            }
+                }
             int parameterLength = parameters.Count;
 
-
             //process drawing commands and extras second
             switch (command) {
                 //Drawing commands
@@ -81,7 +78,7 @@ namespace Advanced_Software_Engineering {
                 case "rp":
                     //Check parameters
                     if (parameterLength == 2) {
-                        return new RegularPolygon(drawer, parameters[0], parameters[1], new IntValue(0), new BoolValue(true) );
+                        return new RegularPolygon(drawer, parameters[0], parameters[1], new IntValue(0), new BoolValue(true));
                     } else if (parameterLength == 3) {
                         return new RegularPolygon(drawer, parameters[0], parameters[1], parameters[2], new BoolValue(true));
                     } else throw new Exception(command + " has an incorrect number of parameters");
@@ -90,7 +87,7 @@ namespace Advanced_Software_Engineering {
                     //Check parameters
                     if (parameterLength == 1) {
                         return new
-                            Square(drawer,parameters[0]);
+                            Square(drawer, parameters[0]);
                     } else if (parameterLength == 2) {
                         return new Square(drawer, parameters[0], parameters[1]);
                     } else throw new Exception(command + " has an incorrect number of parameters");
@@ -185,7 +182,6 @@ namespace Advanced_Software_Engineering {
                         return new FillColor(drawer, new ColorValue(parameters[0], parameters[1], parameters[2], parameters[3]));
                     } else throw new Exception(command + " has an incorrect number of parameters");
 
-
                 default:
 
                     throw new Exception("Unknown command or cannot parse");