From c74ee42b382c0bde7a34f4622f0effe15625a6b0 Mon Sep 17 00:00:00 2001 From: Lukasz Baldyga Date: Sun, 29 Nov 2020 12:01:44 +0000 Subject: [PATCH] Updated Expression Value to not use drawer parameter --- .../Verbs/DrawingVerbs/Shape/Rectangle.cs | 4 ++-- .../Verbs/Value/ValueTypes/ExpressionValue.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 e3c50c7..8198664 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 @@ -22,8 +22,8 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs { /// rectangle width /// rectangle height public Rectangle(Drawer drawer, IValue width, IValue height) { - IValue negativeWidth = new ExpressionValue(drawer, new IntValue(0), width, ExpressionValue.SUBTRACT); - IValue negativeHeight = new ExpressionValue(drawer, new IntValue(0), height, ExpressionValue.SUBTRACT); + IValue negativeWidth = new ExpressionValue(new IntValue(0), width, ExpressionValue.SUBTRACT); + IValue negativeHeight = new ExpressionValue(new IntValue(0), height, ExpressionValue.SUBTRACT); points = new PointValue[] { 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 883f8d8..a18c564 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 @@ -16,7 +16,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { private bool evaluated = false; private IValue evaluatedValue; - public ExpressionValue(Drawer drawer, IValue variable1, IValue variable2, int operation) { + public ExpressionValue(IValue variable1, IValue variable2, int operation) { this.variable1 = variable1; this.variable2 = variable2; this.operation = operation; @@ -25,7 +25,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { if (operation > 3 && operation < 0) throw new Exception("Bad operation"); } - public ExpressionValue(Drawer drawer, IValue variable1, IValue variable2, string operation) { + public ExpressionValue(IValue variable1, IValue variable2, string operation) { switch (operation) { case "+": this.operation = ADD;