JAL-4409 Make HttpUtils.equivalentJalviewUrlString 'non-destructive'

diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java
index 05b987e..97ab98e 100644 (file)
--- a/src/jalview/bin/Commands.java
+++ b/src/jalview/bin/Commands.java
@@ -239,8 +239,6 @@ public class Commands
         String openFile0 = av.getValue();
         String openFile = HttpUtils.equivalentJalviewUrl(openFile0);
         if (openFile == null)
-          openFile = openFile0;
-        if (openFile == null)
           continue;
 
         theseArgsWereParsed = true;

diff --git a/src/jalview/util/ArgParserUtils.java b/src/jalview/util/ArgParserUtils.java
index be0f428..fabbc76 100644 (file)
--- a/src/jalview/util/ArgParserUtils.java
+++ b/src/jalview/util/ArgParserUtils.java
@@ -100,7 +100,8 @@ public class ArgParserUtils
             continue;
           }
           filenames.add(pos + 1, a.argString());
-          filenames.add(pos + 2, associatedFile);
+          filenames.add(pos + 2,
+                  HttpUtils.equivalentJalviewUrl(associatedFile));
         }
       }
       // add an --open arg to separate from other files

diff --git a/src/jalview/util/HttpUtils.java b/src/jalview/util/HttpUtils.java
index c3f32fc..04a820d 100644 (file)
--- a/src/jalview/util/HttpUtils.java
+++ b/src/jalview/util/HttpUtils.java
@@ -243,7 +243,8 @@ public class HttpUtils
   {
     if (!isJalviewSchemeUri(jalviewUriString))
     {
-      return null;
+      // not a jalviewUriString, hand it back
+      return jalviewUriString;
     }
     URI jalviewUri;
     try