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;
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");
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)
{
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);