JAL-629 parse SubVals once with ArgValue. Ensure SubVals exists. Change to setprops...

[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 28cead9..c9e86b8 100644 (file)
--- a/src/jalview/bin/argparser/ArgValue.java
+++ b/src/jalview/bin/argparser/ArgValue.java
@@ -11,19 +11,19 @@ public class ArgValue
 
   private String id;
 
-  private SubVals subVals = null;
+  private SubVals subVals;
 
   protected ArgValue(SubVals sv, String content, int argIndex)
   {
     this.value = content;
     this.argIndex = argIndex;
-    this.subVals = sv;
+    this.subVals = sv == null ? new SubVals("") : sv;
   }
 
   protected ArgValue(String value, int argIndex)
   {
     this.argIndex = argIndex;
-    this.subVals = ArgParser.getSubVals(value);
+    this.subVals = new SubVals(value);
     this.value = getSubVals().getContent();
   }