Context Navigation

ArgumentHandling

Timestamp:

09/21/12 14:41:56 (12 years ago)

Author:

jkarder

Message:

#1926: refactored argument handling infrastructure based on the changes suggested by ascheibe in comment:7:ticket:1926

Location:

Files:

-                      r8563
+                      r8677
 #endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
 …
 namespace HeuristicLab.PluginInfrastructure {
   public static class ArgumentHandling {
-    public const string StartToken = "start";
     public static IArgument[] GetArguments(string[] args) {
       var arguments = new HashSet<IArgument>();
+      var exceptions = new List<Exception>();
       foreach (var entry in args) {
         var argument = ParseArgument(entry);
         if (argument != null && argument.Valid) arguments.Add(argument);
+        else exceptions.Add(new ArgumentException(string.Format("The argument \"{0}\" is invalid.", entry)));
+      }
+      if (exceptions.Any()) throw new AggregateException("One or more arguments are invalid.", exceptions);
       return arguments.ToArray();
+    }
     private static Argument ParseArgument(string entry) {
       var regex = new Regex("^/[a-z]+(:[A-Za-z0-9 ]+)?$");
+      var regex = new Regex(@"^/[a-z]+(:[A-Za-z0-9\s]+)?$");
       if (!regex.IsMatch(entry)) return null;
       entry = entry.Remove(0, 1);
 …
       string key = parts[0];
       string value = parts.Length == 2 ? parts[1].Trim() : string.Empty;
+      switch (key) {
+        case StartToken: return new StartArgument(value);
+        default: return null;
+      }
+      return new Argument(key.ToLower(), value);
+    }
+  }

-                      r8563
+                      r8677
 namespace HeuristicLab.PluginInfrastructure {
+  public abstract class Argument : IArgument {
+  public class Argument : IArgument {
+    public const string START = "start";
+    public string Token { get; private set; }
     public string Value { get; private set; }
     public abstract bool Valid { get; }
+    public bool Valid { get { return !string.IsNullOrEmpty(Value); } }
+    protected Argument(string value) {
+      this.Value = value;
+    public Argument(string token, string value) {
+      Token = token;
+      Value = value;
+    }
     public override bool Equals(object obj) {
       if (obj == null || this.GetType() != obj.GetType()) return false;
+      return this.Value == ((Argument)obj).Value;
+      var other = (Argument)obj;
+      return this.Token == other.Token && this.Value == other.Value;
+    }
 …
+    }
+  }
-  public class StartArgument : Argument {
-    public override bool Valid {
-      get { return !string.IsNullOrEmpty(Value); }
+    }
-    public StartArgument(string value) : base(value) { }
+  }
+}

r8563	r8677
22	22	namespace HeuristicLab.PluginInfrastructure {
23	23	public interface IArgument {
	24	string Token { get; }
24	25	string Value { get; }
25	26	bool Valid { get; }

Note: See TracChangeset for help on using the changeset viewer.