Private
Public Access
Code cleanup
This commit is contained in:
Lukasz Baldyga committed
1 parent
7c89cbbe99
commit
884acbcde7
16 files changed
+9
-34
No files matched your search
+2
-3
@@ -4,8 +4,8 @@ using System.Windows.Forms;
|
||||
namespace Advanced_Software_Engineering {
|
||||
|
||||
public class CommandAndParameterParserResult {
|
||||
string command;
|
||||
string[] parameters;
|
||||
private string command;
|
||||
private string[] parameters;
|
||||
|
||||
public CommandAndParameterParserResult(string command, string[] parameters) {
|
||||
this.command = command;
|
||||
@@ -117,7 +117,6 @@ namespace Advanced_Software_Engineering {
|
||||
/// <param name="text">A string command</param>
|
||||
/// <returns>Directory with the command and its parameters cleanly separated</returns>
|
||||
public static CommandAndParameterParserResult CommandAndParameterParser(string text) {
|
||||
|
||||
//prepare the parameters by stripping them of spaces
|
||||
string prepParameters = Strip(text);
|
||||
if (prepParameters.Length == 0) return null;
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
-1
@@ -1,5 +1,4 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
+1
-3
@@ -1,6 +1,4 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using System.Drawing;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
+1
-2
@@ -1,5 +1,4 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
+1
-3
@@ -1,6 +1,4 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using System.Drawing;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
-2
@@ -1,8 +1,6 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
-1
@@ -3,7 +3,6 @@ using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.DrawingVerbs {
|
||||
|
||||
|
||||
-1
@@ -44,7 +44,6 @@ namespace Advanced_Software_Engineering.Verbs.Value {
|
||||
//boolean here
|
||||
throw new NotImplementedException("Booleans cannot be parsed yet");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void ExecuteVerb() {
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using System;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.Value {
|
||||
|
||||
@@ -124,7 +124,6 @@ namespace Advanced_Software_Engineering.Verbs.Value {
|
||||
text = SettingsAndHelperFunctions.Strip(text);
|
||||
//No assignmnet
|
||||
if (!text.Contains("=")) {
|
||||
|
||||
if (!text.Contains("#")) {
|
||||
//Check if string is a number
|
||||
if (!text.Contains("."))
|
||||
|
||||
+1
-2
@@ -1,5 +1,4 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using System;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects {
|
||||
@@ -9,7 +8,7 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects {
|
||||
private IValue g;
|
||||
private IValue b;
|
||||
|
||||
bool hasAlpha;
|
||||
private bool hasAlpha;
|
||||
private IValue a;
|
||||
|
||||
public ColorValue(Color value) {
|
||||
|
||||
+1
-2
@@ -1,5 +1,4 @@
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using System.Drawing;
|
||||
using System.Drawing;
|
||||
|
||||
namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects {
|
||||
|
||||
|
||||
-5
@@ -23,7 +23,6 @@ namespace Advanced_Software_Engineering.Verbs.Value {
|
||||
|
||||
//Check for bad input
|
||||
if (operation > 3 && operation < 0) throw new Exception("Bad operation");
|
||||
|
||||
}
|
||||
|
||||
private IValue Evaluate() {
|
||||
@@ -99,22 +98,18 @@ namespace Advanced_Software_Engineering.Verbs.Value {
|
||||
}
|
||||
|
||||
public bool ToBool() {
|
||||
|
||||
return Evaluate().ToBool();
|
||||
}
|
||||
|
||||
public Color ToColor() {
|
||||
|
||||
return Evaluate().ToColor();
|
||||
}
|
||||
|
||||
public double ToDouble() {
|
||||
|
||||
return Evaluate().ToDouble();
|
||||
}
|
||||
|
||||
public int ToInt() {
|
||||
|
||||
return Evaluate().ToInt();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ using Advanced_Software_Engineering.Verbs.Value.ValueObjects;
|
||||
using Advanced_Software_Engineering.Verbs.Value.ValueTypes;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Advanced_Software_Engineering {
|
||||
|
||||
@@ -51,14 +50,12 @@ namespace Advanced_Software_Engineering {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
List<IValue> parameters = new List<IValue>();
|
||||
if (!(commandParameters == null)) foreach (string parameter in commandParameters) {
|
||||
parameters.Add(ValueFactory.CreateValue(drawer, parameter));
|
||||
}
|
||||
int parameterLength = parameters.Count;
|
||||
|
||||
|
||||
//process drawing commands and extras second
|
||||
switch (command) {
|
||||
//Drawing commands
|
||||
@@ -185,7 +182,6 @@ namespace Advanced_Software_Engineering {
|
||||
return new FillColor(drawer, new ColorValue(parameters[0], parameters[1], parameters[2], parameters[3]));
|
||||
} else throw new Exception(command + " has an incorrect number of parameters");
|
||||
|
||||
|
||||
default:
|
||||
|
||||
throw new Exception("Unknown command or cannot parse");
|
||||
|
||||
Reference in new issue
Block a user