From 5e4829cb65128427c4c628092cc935baa1ab5492 Mon Sep 17 00:00:00 2001
From: Lukasz Baldyga <c3ypt1c@gmail.com>
Date: Wed, 25 Nov 2020 05:19:58 +0000
Subject: [PATCH] Code clean up

---
 .../ValueHelperTester.cs                      |  2 +-
 .../Advanced Software Engineering.csproj      |  2 +-
 .../Verbs/DrawingVerbs/Rectangle.cs           |  2 +-
 .../Verbs/Value/InitialiseVariable.cs         | 22 ++++++++++++++++++
 .../Verbs/Value/ValueTypes/IntValue.cs        | 23 +++++++++----------
 5 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/InitialiseVariable.cs

diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/ValueHelperTester.cs b/Advanced Software Engineering/Advanced Software Engineering Tests/ValueHelperTester.cs
index 7ebc264..513b663 100644
--- a/Advanced Software Engineering/Advanced Software Engineering Tests/ValueHelperTester.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering Tests/ValueHelperTester.cs	
@@ -1,4 +1,4 @@
-using Advanced_Software_Engineering.Verbs;
+using Advanced_Software_Engineering.Verbs.Value;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 
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 1adcea3..3c46142 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
@@ -89,12 +89,12 @@
     <Compile Include="Verbs\DrawingVerbs\ResetPen.cs" />
     <Compile Include="Verbs\DrawingVerbs\Square.cs" />
     <Compile Include="Verbs\DrawingVerbs\Triangle.cs" />
+    <Compile Include="Verbs\Value\InitialiseVariable.cs" />
     <Compile Include="Verbs\Value\ValueFactory.cs" />
     <Compile Include="Verbs\Value\IValue.cs" />
     <Compile Include="Verbs\Value\ValueHelper.cs" />
     <Compile Include="Verbs\IVerb.cs" />
     <Compile Include="Verbs\Value\ValueTypes\BoolValue.cs" />
-    <Compile Include="Verbs\Value\ValueTypes\BytesValue.cs" />
     <Compile Include="Verbs\Value\ValueTypes\ColorValue.cs" />
     <Compile Include="Verbs\Value\ValueTypes\DoubleValue.cs" />
     <Compile Include="Verbs\Value\ValueTypes\IntValue.cs" />
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 464b29d..9d9ed5e 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs	
@@ -14,7 +14,7 @@ namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
         private readonly Drawer drawer;
         private readonly PointF[] points;
 
-        private  readonly double width;
+        private readonly double width;
         private readonly double height;
 
         /// <summary>
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/InitialiseVariable.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/InitialiseVariable.cs
new file mode 100644
index 0000000..54f3a5a
--- /dev/null
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/InitialiseVariable.cs	
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Advanced_Software_Engineering.Verbs.Value {
+    public class InitialiseVariable : IVerb {
+
+        public InitialiseVariable(Drawer drawer, string type, string assgnment) {
+
+        }
+
+        void IVerb.ExecuteVerb() {
+            throw new NotImplementedException();
+        }
+
+        string IVerb.GetDescription() {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs
index c3f6f03..991093d 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/IntValue.cs	
@@ -4,21 +4,20 @@ using System.Drawing;
 namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes {
 
     internal class IntValue : IValue {
+        private readonly bool initialised = false;
 
-        bool initialised = false;
+        private int value;
 
-        int value;
+        private bool doubleValueCacheAvaiable = false;
+        private double doubleValueCache;
 
-        bool doubleValueCacheAvaiable = false;
-        double doubleValueCache;
+        private bool boolValueCacheAvailable = false;
+        private bool boolValueCache;
 
-        bool boolValueCacheAvailable = false;
-        bool boolValueCache;
+        private bool colorValueCacheAvailable = false;
+        private Color colorValueCache;
 
-        bool colorValueCacheAvailable = false;
-        Color colorValueCache;
-
-        Type type = typeof(int);
+        private Type type = typeof(int);
 
         public IntValue(int value) {
             this.value = value;
@@ -33,7 +32,7 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes {
         }
 
         public bool ToBool() {
-            if(!boolValueCacheAvailable) {
+            if (!boolValueCacheAvailable) {
                 boolValueCache = value <= 0;
                 boolValueCacheAvailable = true;
             }
@@ -42,7 +41,7 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes {
         }
 
         public Color ToColor() {
-            if(!colorValueCacheAvailable) {
+            if (!colorValueCacheAvailable) {
                 byte[] bytes = BitConverter.GetBytes(value);
                 Array.Reverse(bytes);
                 colorValueCache = ValueHelper.IntsToColor(bytes[1], bytes[2], bytes[3], bytes[0]);