From 0d8fa716027e7fec25ae57e2f436bd980cbe0fc5 Mon Sep 17 00:00:00 2001 From: Lukasz Baldyga Date: Sun, 25 Oct 2020 10:26:43 +0000 Subject: [PATCH] Changed DrawingVerbs to have a different name space --- .../Verbs/DrawingVerbs/Circle.cs | 2 +- .../Verbs/DrawingVerbs/Clear.cs | 2 +- .../Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs | 2 +- .../Verbs/DrawingVerbs/DrawLines.cs | 2 +- .../Verbs/DrawingVerbs/DrawTo.cs | 2 +- .../Verbs/DrawingVerbs/FillColor.cs | 2 +- .../Verbs/DrawingVerbs/MoveTo.cs | 2 +- .../Verbs/DrawingVerbs/PenColor.cs | 2 +- .../Verbs/DrawingVerbs/Quadrilateral.cs | 2 +- .../Verbs/DrawingVerbs/Rectangle.cs | 2 +- .../Verbs/DrawingVerbs/RegularPolygon.cs | 2 +- .../Verbs/DrawingVerbs/ResetPen.cs | 2 +- .../Verbs/DrawingVerbs/Square.cs | 2 +- .../Verbs/DrawingVerbs/Triangle.cs | 2 +- .../Advanced Software Engineering/Verbs/VerbFactory.cs | 5 +++-- 15 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs index fbac6ef..ac85be2 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { class Circle : Verb { Drawer drawer; double scale; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs index f95e7c9..610f986 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { public class Clear : Verb { Drawer drawer; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs index ba65e4f..9ba6844 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { public class Dot : Verb { Drawer drawer; public Dot(Drawer drawer) { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs index 97d02cf..dee31bb 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { class DrawLines : Verb { Drawer drawer; Point[] points; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs index d1fc659..ea8f97e 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { public class DrawTo : Verb { protected Drawer drawer; protected Point moveToPoint; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs index b4cb41a..7eb3df5 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { public class FillColor : Verb { Drawer drawer; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs index f1483a3..10c2c3e 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { public class MoveTo : Verb { protected Drawer drawer; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs index b498f54..615527a 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { class PenColor : Verb { Drawer drawer; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs index 00129e1..9e53e2c 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { class Quadrilateral : Verb { Verb verb; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs index 2534839..2a89048 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { //TODO: correct class Rectangle : Verb { Verb verb; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs index ceff3df..0c17f92 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { /// /// A class that generates a RegularPolygon verb. /// diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs index cc0912d..dfbc405 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { public class ResetPen : Verb { Drawer drawer; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs index d7cf1d0..ad8be6e 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { class Square : Verb { Verb verb; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs index 49195e4..994ec81 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Advanced_Software_Engineering { +namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { public class Triangle : Verb { Verb verb; diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs index b383285..1477eeb 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Security.Cryptography; using System.Windows.Forms; using System.Windows.Forms.VisualStyles; +using Advanced_Software_Engineering.Verbs.DrawingVerbs; namespace Advanced_Software_Engineering { public class VerbFactory { @@ -81,7 +82,7 @@ namespace Advanced_Software_Engineering { case "rectangle": //Check parameters if (parameters.Length == 2) { - return new Rectangle(drawer, + return new Advanced_Software_Engineering.Verbs.DrawingVerbs.Rectangle(drawer, Value.ConvertToDouble(parameters[0]), Value.ConvertToDouble(parameters[1]) ); @@ -93,7 +94,7 @@ namespace Advanced_Software_Engineering { Value.ConvertToPoint(parameters[6], parameters[7]) ); } else if (parameters.Length == 4) { - return new Rectangle(drawer, + return new Advanced_Software_Engineering.Verbs.DrawingVerbs.Rectangle(drawer, Value.ConvertToPoint(parameters[0], parameters[1]), Value.ConvertToPoint(parameters[2], parameters[3]) );