Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

[jalview.git] / src / jalview / bin / argparser / ArgValue.java

diff --git a/src/jalview/bin/argparser/ArgValue.java b/src/jalview/bin/argparser/ArgValue.java
index 2aa32df..3467f61 100644 (file)
--- a/src/jalview/bin/argparser/ArgValue.java
+++ b/src/jalview/bin/argparser/ArgValue.java
@@ -1,23 +1,65 @@
 package jalview.bin.argparser;
 
+import jalview.bin.argparser.Arg.Opt;
+import jalview.bin.argparser.Arg.Type;
+
 /**
  * A helper class to keep an index of argument position with argument values
  */
-public class ArgValue
+public class ArgValue implements Comparable<ArgValue>
 {
+  private Arg arg;
+
   private int argIndex;
 
   private String value;
 
+  /*
+   * Type type is only really used by --help-type
+   */
+  private Type type = null;
+
+  /*
+   * This id is set by a subVal id= to identify the product of this ArgValue
+   * later. Set but not currently used.
+   */
   private String id;
 
-  private SubVals subVals = null;
+  private SubVals subVals;
+
+  protected ArgValue(Arg a, SubVals sv, Type type, String content,
+          int argIndex)
+  {
+    this.arg = a;
+    this.value = content;
+    this.argIndex = argIndex;
+    this.subVals = sv == null ? new SubVals("") : sv;
+    this.setType(type);
+  }
 
-  protected ArgValue(String value, int argIndex)
+  protected ArgValue(Arg a, Type type, String value, int argIndex)
   {
-    this.value = value;
+    this.arg = a;
     this.argIndex = argIndex;
-    this.subVals = ArgParser.getSubVals(getValue());
+    this.subVals = new SubVals(value);
+    this.value = getSubVals().getContent();
+    this.setType(type);
+  }
+
+  protected void setType(Type t)
+  {
+    if (this.getArg().hasOption(Opt.HASTYPE))
+      this.type = t;
+  }
+
+  public Type getType()
+  {
+    return type;
+  }
+
+  public Arg getArg()
+  {
+    return arg;
   }
 
   public String getValue()
@@ -56,4 +98,10 @@ public class ArgValue
   {
     this.subVals.put(key, val);
   }
+
+  @Override
+  public final int compareTo(ArgValue o)
+  {
+    return this.getArgIndex() - o.getArgIndex();
+  }
 }
\ No newline at end of file