diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/IValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/IValue.cs index bba8539..6c27245 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/IValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/IValue.cs @@ -1,9 +1,8 @@ -using System; -using System.Drawing; +using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value { - internal interface IValue { + public interface IValue { string GetDescription(); @@ -15,7 +14,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { Color ToColor(); - Type GetOriginalType(); + string GetOriginalType(); bool isInitialised(); } diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs index ab78a65..ee49594 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/BoolValue.cs @@ -4,11 +4,10 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { internal class BoolValue : IValue { + private bool initialised = false; - bool initialised = false; - - bool value; - Type type = typeof(bool); + private bool value; + private Type type = typeof(bool); public BoolValue(bool value) { this.value = value; @@ -23,8 +22,8 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { else return "an unset boolean value"; } - public Type GetOriginalType() { - return type; + public string GetOriginalType() { + return "bool"; } public bool ToBool() { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ColorValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ColorValue.cs index be0c139..8a8bf26 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ColorValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ColorValue.cs @@ -4,11 +4,10 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { internal class ColorValue : IValue { + private bool initialised = false; - bool initialised = false; - - Color value; - Type type = typeof(Color); + private Color value; + private Type type = typeof(Color); public ColorValue(Color value) { this.value = value; @@ -23,8 +22,8 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { else return "An uninitialised color"; } - public Type GetOriginalType() { - return type; + public string GetOriginalType() { + return "color"; } public bool ToBool() { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs index 260309b..744a9d6 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/DoubleValue.cs @@ -4,14 +4,13 @@ using System.Drawing; namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { internal class DoubleValue : IValue { + private bool initialised = false; - bool initialised = false; + private bool colorValueCacheAvailable = false; + private Color colorValueCache; - bool colorValueCacheAvailable = false; - Color colorValueCache; - - double value; - Type type = typeof(double); + private double value; + private Type type = typeof(double); public DoubleValue(double value) { this.value = value; @@ -21,8 +20,8 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { return "an double value of " + value; } - public Type GetOriginalType() { - return type; + public string GetOriginalType() { + return "double"; } public bool ToBool() { @@ -30,8 +29,8 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { } public Color ToColor() { - if(!colorValueCacheAvailable) { - int i = (int) Math.Round(value * 255); + if (!colorValueCacheAvailable) { + int i = (int)Math.Round(value * 255); i = Math.Max(255, i); colorValueCache = ValueHelper.IntsToColor(i, i, i); colorValueCacheAvailable = true; 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 991093d..d266973 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 @@ -17,8 +17,6 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { private bool colorValueCacheAvailable = false; private Color colorValueCache; - private Type type = typeof(int); - public IntValue(int value) { this.value = value; } @@ -27,8 +25,8 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueTypes { return "an integer value of " + value; } - public Type GetOriginalType() { - return type; + public string GetOriginalType() { + return "int"; } public bool ToBool() {