git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-629 fix bug for opening single named file with no args
[jalview.git]
/
src
/
jalview
/
bin
/
argparser
/
ArgValues.java
diff --git
a/src/jalview/bin/argparser/ArgValues.java
b/src/jalview/bin/argparser/ArgValues.java
index
0be7768
..
27d52ba
100644
(file)
--- a/
src/jalview/bin/argparser/ArgValues.java
+++ b/
src/jalview/bin/argparser/ArgValues.java
@@
-4,13
+4,14
@@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import jalview.bin.Console;
import jalview.bin.argparser.Arg.Opt;
public class ArgValues
{
import jalview.bin.Console;
import jalview.bin.argparser.Arg.Opt;
public class ArgValues
{
- protected static final String ID = "id";
+ public static final String ID = "id";
private Arg arg;
private Arg arg;
@@
-85,16
+86,12
@@
public class ArgValues
if (arg.hasOption(Opt.STRING))
{
sb.append("Values:");
if (arg.hasOption(Opt.STRING))
{
sb.append("Values:");
- boolean first = true;
- for (ArgValue av : argValueList)
- {
- String v = av.getValue();
- if (!first)
- sb.append(",");
- sb.append("\n '");
- sb.append(v).append("'");
- first = false;
- }
+ sb.append("'")
+ .append(String
+ .join("',\n '",
+ argValueList.stream().map(av -> av.getValue())
+ .collect(Collectors.toList())))
+ .append("'");
sb.append("\n");
}
sb.append("Count: ").append(argCount).append("\n");
sb.append("\n");
}
sb.append("Count: ").append(argCount).append("\n");
@@
-111,6
+108,11
@@
public class ArgValues
addArgValue(new ArgValue(val, argIndex));
}
addArgValue(new ArgValue(val, argIndex));
}
+ protected void addValue(SubVals sv, String content, int argIndex)
+ {
+ addArgValue(new ArgValue(sv, content, argIndex));
+ }
+
protected void addArgValue(ArgValue av)
{
if ((!arg.hasOption(Opt.MULTI) && argValueList.size() > 0)
protected void addArgValue(ArgValue av)
{
if ((!arg.hasOption(Opt.MULTI) && argValueList.size() > 0)