X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2Fargparser%2FArgValues.java;h=4a60efd7f41b3ea4a51a08b77265d381f76b43f3;hb=2bb9cad4fa36d64cebbe09bc63732e8dbb4dcb32;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..4a60efd 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");
@@ -108,7 +105,12 @@ public class ArgValues
 
   protected void addValue(String val, int argIndex)
   {
-    addArgValue(new ArgValue(val, argIndex));
+    addArgValue(new ArgValue(arg(), val, argIndex));
+  }
+
+  protected void addValue(SubVals sv, String content, int argIndex)
+  {
+    addArgValue(new ArgValue(arg(), sv, content, argIndex));
   }
 
   protected void addArgValue(ArgValue av)
@@ -121,7 +123,7 @@ public class ArgValues
     {
       argValueList = new ArrayList<ArgValue>();
     }
-    SubVals sv = ArgParser.getSubVals(av.getValue());
+    SubVals sv = new SubVals(av.getValue());
     if (sv.has(ID))
     {
       String id = sv.get(ID);