Changeset 8677 for trunk/sources/HeuristicLab.PluginInfrastructure/3.3/ArgumentHandling/ArgumentHandling.cs

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

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/3.3/ArgumentHandling/ArgumentHandling.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/3.3/ArgumentHandling/ArgumentHandling.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26 +27 @@
 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);
@@ -44 +48 @@
       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);
     }
   }