From 884acbcde7de02d941fafb86ed91020e4ff7687d Mon Sep 17 00:00:00 2001 From: Lukasz Baldyga Date: Sat, 28 Nov 2020 21:38:52 +0000 Subject: [PATCH] Code cleanup --- .../SettingsAndHelperFunctions.cs | 5 ++--- .../Verbs/DrawingVerbs/Actions/DrawLines.cs | 2 +- .../Verbs/DrawingVerbs/Color/FillColor.cs | 1 - .../Verbs/DrawingVerbs/Color/PenColor.cs | 1 - .../Verbs/DrawingVerbs/Shape/DrawTo.cs | 4 +--- .../Verbs/DrawingVerbs/Shape/MoveTo.cs | 3 +-- .../Verbs/DrawingVerbs/Shape/Quadrilateral.cs | 4 +--- .../Verbs/DrawingVerbs/Shape/Rectangle.cs | 2 -- .../DrawingVerbs/Shape/RegularPolygon.cs | 1 - .../Verbs/DrawingVerbs/Shape/Triangle.cs | 1 - .../Verbs/Value/DeclareVariable.cs | 7 +++---- .../Verbs/Value/ValueFactory.cs | 6 +++--- .../Verbs/Value/ValueHelper.cs | 1 - .../Verbs/Value/ValueObjects/ColorValue.cs | 3 +-- .../Verbs/Value/ValueObjects/PointValue.cs | 5 ++--- .../Verbs/Value/ValueTypes/ExpressionValue.cs | 5 ----- .../Verbs/VerbFactory.cs | 20 ++++++++----------- 17 files changed, 23 insertions(+), 48 deletions(-) diff --git a/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs b/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs index ba00219..60d7c79 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs +++ b/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; - string[] parameters; + private string command; + private string[] parameters; public CommandAndParameterParserResult(string command, string[] parameters) { this.command = command; @@ -117,7 +117,6 @@ namespace Advanced_Software_Engineering { /// A string command /// Directory with the command and its parameters cleanly separated public static CommandAndParameterParserResult CommandAndParameterParser(string text) { - //prepare the parameters by stripping them of spaces string prepParameters = Strip(text); if (prepParameters.Length == 0) return null; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs index 65276b9..a1edd6f 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs @@ -34,7 +34,7 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { /// Gets description of the command. /// /// A generic description of the command - public string GetDescription() { + public string GetDescription() { return "Draws a shape at specific points."; } } diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs index 09047d5..cf38ccb 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs +++ b/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 { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs index bbe5eb4..aa0d116 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs +++ b/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 { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs index ac6e50a..dff65d3 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs +++ b/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 System.Drawing; +using Advanced_Software_Engineering.Verbs.Value.ValueObjects; namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs index 064ca0c..08852b2 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs +++ b/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 { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs index 9e6704c..0ae2382 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs +++ b/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 System.Drawing; +using Advanced_Software_Engineering.Verbs.Value.ValueObjects; namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs index ce855df..e3c50c7 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs +++ b/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 { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs index 5a5b509..3228014 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs +++ b/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 { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs index ebca14d..0a03291 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs +++ b/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 { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs index 673d0ae..e2e5960 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs @@ -17,7 +17,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { /// The name of the variable /// True if the name is valid, otherwise false private bool CheckName(string name) { - foreach(char character in illegalCharacters) { + foreach (char character in illegalCharacters) { if (name.Contains(character.ToString())) return false; } return true; @@ -27,13 +27,13 @@ namespace Advanced_Software_Engineering.Verbs.Value { this.drawer = drawer; // get variable name - // assignment looks something like this at this point: + // assignment looks something like this at this point: // i = 20 // or // i = 2 == 5 // bools have == - if(!(type == "bool")) { + if (!(type == "bool")) { //Seperate the assignment from the variables List 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() { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueFactory.cs index a1e4975..b9d72bd 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueFactory.cs +++ b/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 { @@ -63,7 +63,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { public static IValue CreateValue(Drawer drawer, string value) { value = SettingsAndHelperFunctions.Strip(value); if (drawer.CheckVariableExists(value)) return new VariableValue(drawer, value); - else return ValueHelper.ConvertToIValue(value); + else return ValueHelper.ConvertToIValue(value); } public static IValue CreateValue(bool b) { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs index 95b85e2..40e1d2a 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueHelper.cs +++ b/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(".")) diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs index 6ddd3c8..0831036 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/ColorValue.cs +++ b/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) { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs index 7d4e3a2..e846fd7 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs +++ b/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 { @@ -28,7 +27,7 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects { public int GetY() { return y.ToInt(); - } + } public Point GetPoint() { return new Point(GetX(), GetY()); diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs index b4a63d9..fed0145 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs +++ b/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(); } } diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs index 563382a..f775541 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs +++ b/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]); - } else throw new Exception(command + "s need to be initialised"); + return new DeclareVariable(drawer, command, commandParameters[0]); + } else throw new Exception(command + "s need to be initialised"); default: //assignment @@ -51,14 +50,12 @@ namespace Advanced_Software_Engineering { break; } - List parameters = new List(); - 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,9 +182,8 @@ 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"); } }