Extract ConsoleUtils.hasParam method

For checking if a non-flag argument is available

Author: hinerm

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

@@ -74,7 +74,7 @@ public void handle(final LinkedList<String> args) {
 
 		args.removeFirst(); // --run
 		final String commandToRun = args.removeFirst();
-		final String paramString = args.isEmpty() ? "" : args.removeFirst();
+		final String paramString = ConsoleUtils.hasParam(args) ? "" : args.removeFirst();
 
 		run(commandToRun, paramString);
 	}

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

@@ -32,6 +32,7 @@
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.Map;
 
 import org.scijava.command.CommandInfo;
@@ -83,4 +84,15 @@ else if (logService != null)
 		return inputMap;
 
 	}
+
+	/**
+	 * Test if the next argument is an appropriate parameter to a
+	 * {@link ConsoleArgument}.
+	 *
+	 * @return {@code true} if the first argument of the given list does not
+	 *         start with a {@code '-'} character.
+	 */
+	public static boolean hasParam(final LinkedList<String> args) {
+		return !(args.isEmpty() || args.getFirst().startsWith("-"));
+	}
 }

src/main/java/org/scijava/script/console/RunScriptArgument.java

@@ -72,7 +72,7 @@ public void handle(final LinkedList<String> args) {
 
 		args.removeFirst(); // --run
 		final String scriptToRun = args.removeFirst();
-		final String paramString = args.isEmpty() ? "" : args.removeFirst();
+		final String paramString = ConsoleUtils.hasParam(args) ? "" : args.removeFirst();
 
 		run(scriptToRun, paramString);
 	}