Extract handles logic to AbstractConsoleArgument

Argument implementations can now declare their minimum size and aliases
and let the abstract layer handle the bulk of the matching.

Author: hinerm

src/main/java/org/scijava/command/console/RunArgument.java

@@ -35,11 +35,8 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 import org.scijava.command.CommandInfo;
-import org.scijava.command.CommandModule;
 import org.scijava.command.CommandService;
 import org.scijava.console.AbstractConsoleArgument;
 import org.scijava.console.ConsoleArgument;
@@ -67,6 +64,12 @@ public class RunArgument extends AbstractConsoleArgument {
 	@Parameter
 	private LogService logService;
 
+	// -- Constructor --
+
+	public RunArgument() {
+		super(2, "--run");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -80,13 +83,6 @@ public void handle(final LinkedList<String> args) {
 		run(commandToRun, optionString);
 	}
 
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final LinkedList<String> args) {
-		return args != null && args.size() >= 2 && args.getFirst().equals("--run");
-	}
-
 	// -- Helper methods --
 
 	/** Implements the {@code --run} command line argument. */

src/main/java/org/scijava/console/AbstractConsoleArgument.java

@@ -31,7 +31,9 @@
 
 package org.scijava.console;
 
+import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.Set;
 
 import org.scijava.plugin.AbstractHandlerPlugin;
 
@@ -43,13 +45,43 @@
 public abstract class AbstractConsoleArgument extends
 	AbstractHandlerPlugin<LinkedList<String>> implements ConsoleArgument
 {
+	private int numArgs;
+	private Set<String> aliasFlags;
+
+	public AbstractConsoleArgument() {
+		this(1, new String[0]);
+	}
+
+	public AbstractConsoleArgument(final String... aliases) {
+		this(1, aliases);
+	}
+	
+	public AbstractConsoleArgument(final int requiredArgs, final String... aliases) {
+		numArgs = requiredArgs;
+		aliasFlags = new HashSet<String>();
+		for (final String s : aliases) aliasFlags.add(s);
+	}
 
 	// -- Typed methods --
 
+	@Override
+	public boolean supports(final LinkedList<String> args) {
+		if (args == null || args.size() < numArgs) return false;
+		return isAlias(args);
+	}
+
 	@Override
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Class<LinkedList<String>> getType() {
 		return (Class) String.class;
 	}
 
+	/**
+	 * @return true if there are no aliases for this {@code ConsoleArgument}, or
+	 *         at least one alias matches the first argument in the provided
+	 *         list
+	 */
+	protected boolean isAlias(final LinkedList<String> args) {
+		return aliasFlags.isEmpty() || aliasFlags.contains(args.getFirst());
+	}
 }

src/main/java/org/scijava/console/SystemPropertyArgument.java

@@ -49,6 +49,12 @@ public class SystemPropertyArgument extends AbstractConsoleArgument {
 	private static final String SYS_PROP_REGEX = "-D([\\w\\._-]+)(=(.*))?";
 	private static final Pattern SYS_PROP_PAT = Pattern.compile(SYS_PROP_REGEX);
 
+	// -- Constructor --
+
+	public SystemPropertyArgument() {
+		super(1);
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -69,7 +75,7 @@ public void handle(final LinkedList<String> args) {
 
 	@Override
 	public boolean supports(final LinkedList<String> args) {
-		if (args == null || args.isEmpty()) return false;
+		if (!super.supports(args)) return false;
 		final String arg = args.getFirst();
 		if (!arg.startsWith("-D")) return false;
 		return SYS_PROP_PAT.matcher(arg).matches();

src/main/java/org/scijava/io/console/OpenArgument.java

@@ -59,6 +59,12 @@ public class OpenArgument extends AbstractConsoleArgument {
 	@Parameter
 	private LogService log;
 
+	// -- Constructor --
+
+	public OpenArgument() {
+		super(2, "--open");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -76,12 +82,4 @@ public void handle(final LinkedList<String> args) {
 			log.error(exc);
 		}
 	}
-
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final LinkedList<String> args) {
-		return args != null && args.size() >= 2 && args.getFirst().equals("--open");
-	}
-
 }

src/main/java/org/scijava/main/console/MainArgument.java

@@ -57,6 +57,12 @@ public class MainArgument extends AbstractConsoleArgument {
 	@Parameter(required = false)
 	private LogService log;
 
+	// -- Constructor --
+
+	public MainArgument() {
+		super(2, "--main", "--main-class");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -67,7 +73,7 @@ public void handle(final LinkedList<String> args) {
 		final String className = args.removeFirst();
 
 		final List<String> argList = new ArrayList<String>();
-		while (!args.isEmpty() && !isMainFlag(args) && !isSeparator(args)) {
+		while (!args.isEmpty() && !isAlias(args) && !isSeparator(args)) {
 			argList.add(args.removeFirst());
 		}
 		if (isSeparator(args)) args.removeFirst(); // remove the -- separator
@@ -80,17 +86,11 @@ public void handle(final LinkedList<String> args) {
 
 	@Override
 	public boolean supports(final LinkedList<String> args) {
-		return mainService != null && isMainFlag(args);
+		return mainService != null && super.supports(args);
 	}
 
 	// -- Helper methods --
 
-	private boolean isMainFlag(final LinkedList<String> args) {
-		if (args == null || args.isEmpty()) return false;
-		final String arg = args.getFirst();
-		return arg.equals("--main") || arg.equals("--main-class");
-	}
-
 	private boolean isSeparator(final LinkedList<String> args) {
 		if (args == null || args.isEmpty()) return false;
 		return args.getFirst().equals("--");

src/main/java/org/scijava/ui/console/UIArgument.java

@@ -55,6 +55,12 @@ public class UIArgument extends AbstractConsoleArgument {
 	@Parameter
 	private LogService log;
 
+	// -- Constructor --
+
+	public UIArgument() {
+		super(2, "--ui");
+	}
+
 	// -- ConsoleArgument methods --
 
 	@Override
@@ -73,11 +79,4 @@ public void handle(final LinkedList<String> args) {
 			}
 	}
 
-	// -- Typed methods --
-
-	@Override
-	public boolean supports(final LinkedList<String> args) {
-		return args != null && args.size() >= 2 && args.getFirst().equals("--ui");
-	}
-
 }

src/test/java/org/scijava/console/ConsoleServiceTest.java

@@ -208,6 +208,10 @@ private void assertOutputEvent(final Source source, final String output,
 	@Plugin(type = ConsoleArgument.class, priority = Priority.HIGH_PRIORITY)
 	public static class FooArgument extends AbstractConsoleArgument {
 
+		public FooArgument() {
+			super(1, "--foo");
+		}
+
 		private boolean argsHandled;
 
 		@Override
@@ -219,11 +223,6 @@ public void handle(final LinkedList<String> args) {
 			args.clear();
 			argsHandled = true;
 		}
-
-		@Override
-		public boolean supports(final LinkedList<String> args) {
-			return !args.isEmpty() && args.getFirst().equals("--foo");
-		}
 	}
 
 	private static class OutputTracker implements OutputListener {