From bd23d9e503107232697f3e7732f54c96884e7ebb Mon Sep 17 00:00:00 2001 From: Lukasz Baldyga Date: Sat, 28 Nov 2020 11:11:22 +0000 Subject: [PATCH] Organised files into folders Moved some files around --- .../Advanced Software Engineering.csproj | 30 +++++++++---------- .../Verbs/DrawingVerbs/{ => Actions}/Clear.cs | 0 .../DrawingVerbs/{ => Actions}/DrawLines.cs | 0 .../DrawingVerbs/{ => Actions}/ResetPen.cs | 0 .../Verbs/DrawingVerbs/{ => Color}/Fill.cs | 0 .../DrawingVerbs/{ => Color}/FillColor.cs | 0 .../DrawingVerbs/{ => Color}/PenColor.cs | 0 .../Verbs/DrawingVerbs/{ => Shape}/Circle.cs | 0 .../Verbs/DrawingVerbs/{ => Shape}/Dot.cs | 0 .../Verbs/DrawingVerbs/{ => Shape}/DrawTo.cs | 0 .../Verbs/DrawingVerbs/{ => Shape}/MoveTo.cs | 0 .../DrawingVerbs/{ => Shape}/Quadrilateral.cs | 0 .../DrawingVerbs/{ => Shape}/Rectangle.cs | 0 .../{ => Shape}/RegularPolygon.cs | 0 .../Verbs/DrawingVerbs/{ => Shape}/Square.cs | 0 .../DrawingVerbs/{ => Shape}/Triangle.cs | 0 .../Verbs/Value/ValueObjects/PointValue.cs | 10 +++---- 17 files changed, 20 insertions(+), 20 deletions(-) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Actions}/Clear.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Actions}/DrawLines.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Actions}/ResetPen.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Color}/Fill.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Color}/FillColor.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Color}/PenColor.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/Circle.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/Dot.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/DrawTo.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/MoveTo.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/Quadrilateral.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/Rectangle.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/RegularPolygon.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/Square.cs (100%) rename Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/{ => Shape}/Triangle.cs (100%) diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj index 056b403..e21f97c 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj +++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj @@ -74,21 +74,21 @@ True Resources.resx - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/Clear.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/Clear.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/ResetPen.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/ResetPen.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/Fill.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/Fill.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Circle.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Circle.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Dot.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Dot.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Square.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Square.cs diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs 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 1d4139d..7d4e3a2 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 @@ -7,16 +7,16 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects { private IValue x; private IValue y; - public PointValue(int x, int y) { - this.x = new IntValue(x); - this.y = new IntValue(y); - } - public PointValue(IValue x, IValue y) { this.x = x; this.y = y; } + public PointValue(Drawer drawer, string parameter1, string parameter2) { + x = ValueFactory.CreateValue(drawer, parameter1); + y = ValueFactory.CreateValue(drawer, parameter2); + } + public PointValue(string parameter1, string parameter2) { x = ValueFactory.CreateValue(parameter1, "int"); y = ValueFactory.CreateValue(parameter2, "int");