JAL-629 improvements to argparser toString. Improvements to cli paeFile structure...

[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..2c71f63 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.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");