X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2Fargparser%2FArgValues.java;h=27d52bae287241892dfc37b8738f52bdbb16dcf3;hb=50d53d249fbfcc56c87edfd20fe2adadfd7d7841;hp=0be776822c816d15153b451b6073e17c72f2a5f8;hpb=2e59bc7938c0f10bde61fd30d1841bedb3d8319e;p=jalview.git diff --git a/src/jalview/bin/argparser/ArgValues.java b/src/jalview/bin/argparser/ArgValues.java index 0be7768..27d52ba 100644 --- 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.stream.Collectors; 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; @@ -85,16 +86,12 @@ public class ArgValues 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"); @@ -111,6 +108,11 @@ public class ArgValues 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)