Changeset 2227 for trunk/eraser/Eraser/Program.cs

Timestamp:

8/4/2010 1:09:55 AM (22 months ago)

Author:

lowjoel

Message:

Do not assume that only one configurer can handle every command line-argument. Always check for the situation where two configurers can handle the same argument; detect the error, display a message and exit.

File:

• trunk/eraser/Eraser/Program.cs (modified) (2 diffs)

trunk/eraser/Eraser/Program.cs

@@ -294 +294 @@
 where action is
   help                Show this help message.
-  addtask             Adds tasks to the current task list.
+  addtask             Adds a task to the current task list.
   querymethods        Lists all registered Erasure methods.
   importtasklist      Imports an Eraser Task list to the current user's Task
@@ -422 +422 @@
             foreach (string argument in arguments.PositionalArguments)
             {
-                bool processed = false;
+                ErasureTarget selectedTarget = null;
+
+                //Iterate over every defined erasure target
                 foreach (ErasureTarget target in ManagerLibrary.Instance.ErasureTargetRegistrar)
-                    if (target.Configurer.ProcessArgument(argument))
+                {
+                    //See if this argument can be handled by the target's configurer
+                    IErasureTargetConfigurer configurer = target.Configurer;
+                    if (configurer.ProcessArgument(argument))
                     {
-                        target.Method = method;
-                        task.Targets.Add(target);
-                        processed = true;
-                        break;
+                        //Check whether a target has been set (implicitly: check whether two
+                        //configurers can process the argument)
+                        if (selectedTarget == null)
+                        {
+                            configurer.SaveTo(target);
+                            selectedTarget = target;
+                        }
+                        else
+                        {
+                            //Yes, it is an ambiguity. Throw an error.
+                            throw new InvalidOperationException("Ambiguous argument: {0} can be " +
+                                "handled by more than one erasure target.");
+                        }
                     }
-
-                if (!processed)
+                }
+
+                //Check whether a target has been made from parsing the entry.
+                if (selectedTarget == null)
                 {
                     Console.WriteLine(S._("Unknown argument: {0}, skipped.", argument));
-                    continue;
+                }
+                else
+                {
+                    selectedTarget.Method = method;
+                    task.Targets.Add(selectedTarget);
                 }
             }