JAL-4277 Corrected choice of all or last opened linkedIds. Better wildcard syntactic...

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

diff --git a/src/jalview/bin/argparser/ArgValuesMap.java b/src/jalview/bin/argparser/ArgValuesMap.java
index 085099a..4aa8570 100644 (file)
--- a/src/jalview/bin/argparser/ArgValuesMap.java
+++ b/src/jalview/bin/argparser/ArgValuesMap.java
@@ -120,6 +120,33 @@ public class ArgValuesMap
     return m.keySet();
   }
 
+  public ArgValue getArgValueOfArgWithSubValKey(Arg a, String svKey)
+  {
+    return getArgValueOfArgWithSubValKey(a, svKey, false);
+  }
+
+  public ArgValue getArgValueOfArgWithSubValKey(Arg a, String svKey,
+          boolean last)
+  {
+    ArgValues avs = this.getArgValues(a);
+    if (avs == null)
+    {
+      return null;
+    }
+    List<ArgValue> compareAvs = avs.getArgValueList();
+    for (int i = 0; i < compareAvs.size(); i++)
+    {
+      int index = last ? compareAvs.size() - 1 - i : i;
+      ArgValue av = compareAvs.get(index);
+      SubVals sv = av.getSubVals();
+      if (sv.has(svKey) && !sv.get(svKey).equals("false"))
+      {
+        return av;
+      }
+    }
+    return null;
+  }
+
   public ArgValue getClosestPreviousArgValueOfArg(ArgValue thisAv, Arg a)
   {
     ArgValue closestAv = null;
@@ -161,6 +188,7 @@ public class ArgValuesMap
     return closestAv;
   }
 
+  // TODO this is incomplete and currently unused (fortunately)
   public ArgValue[] getArgValuesReferringTo(String key, String value, Arg a)
   {
     // this looks for the *next* arg that *might* be referring back to
@@ -198,7 +226,7 @@ public class ArgValuesMap
    */
   public String getBasename()
   {
-    return getDirBasenameOrExtension(false, false);
+    return getDirBasenameOrExtension(false, false, false);
   }
 
   /*
@@ -207,7 +235,7 @@ public class ArgValuesMap
    */
   public String getExtension()
   {
-    return getDirBasenameOrExtension(false, true);
+    return getDirBasenameOrExtension(false, true, false);
   }
 
   /*
@@ -216,11 +244,11 @@ public class ArgValuesMap
    */
   public String getDirname()
   {
-    return getDirBasenameOrExtension(true, false);
+    return getDirBasenameOrExtension(true, false, false);
   }
 
   public String getDirBasenameOrExtension(boolean dirname,
-          boolean extension)
+          boolean extension, boolean absoluteDirname)
   {
     String filename = null;
     String appendVal = getValue(Arg.APPEND);