Skip to content

Commit 001b3dd

Browse files
committed
Move parameter logic to AbstractConsoleArgument
The AbstractConsoleArgument already had a protected isFlag method; for consistently, let's just put single parameter extraction there too.
1 parent bfc0a60 commit 001b3dd

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,17 @@ public Class<LinkedList<String>> getType() {
8686
protected boolean isFlag(final LinkedList<String> args) {
8787
return flags.isEmpty() || flags.contains(args.getFirst());
8888
}
89+
90+
/**
91+
* If the next argument is an appropriate parameter to a
92+
* {@link ConsoleArgument}, retrieves it; otherwise, returns null.
93+
*
94+
* @return The first argument of the given list, if it does not
95+
* start with a {@code '-'} character; or null otherwise.
96+
*/
97+
protected String getParam(final LinkedList<String> args) {
98+
if (args.isEmpty()) return null;
99+
final String arg = args.getFirst();
100+
return arg.startsWith("-") ? null : arg;
101+
}
89102
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void handle(final LinkedList<String> args) {
7575

7676
args.removeFirst(); // --run
7777
final String code = args.removeFirst();
78-
final String arg = ConsoleUtils.hasParam(args) ? args.removeFirst() : null;
78+
final String arg = getParam(args);
7979

8080
final Items items = parser.parse(arg);
8181
try {

0 commit comments

Comments
 (0)