X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fbin%2Fargparser%2FArgValue.java;h=eab38ca3ce8858859d27ce95c6ac22cfa7e4b840;hb=c1e71094304dcd2b975c485416ec5e25cca30815;hp=28cead9e73f8dc5a41cd91fd6b39820e4b9b0071;hpb=988d7abeef3e08d01ff8ebb918325d95caae70b7;p=jalview.git

diff --git a/src/jalview/bin/argparser/ArgValue.java b/src/jalview/bin/argparser/ArgValue.java
index 28cead9..eab38ca 100644
--- a/src/jalview/bin/argparser/ArgValue.java
+++ b/src/jalview/bin/argparser/ArgValue.java
@@ -1,30 +1,85 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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(SubVals sv, String content, int argIndex)
+  protected ArgValue(Arg a, SubVals sv, Type type, String content,
+          int argIndex)
   {
+    this.arg = a;
     this.value = content;
     this.argIndex = argIndex;
-    this.subVals = sv;
+    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.arg = a;
     this.argIndex = argIndex;
-    this.subVals = ArgParser.getSubVals(value);
+    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()
@@ -63,4 +118,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