Merge branch 'releases/Release_2_11_1_Branch' of http://source.jalview.org/git/jalvie...

diff --git a/RELEASE b/RELEASE
index 3600be2..90eaa35 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
 jalview.release=releases/Release_2_11_1_Branch
-jalview.version=2.11.1.1
+jalview.version=2.11.1.2

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index d402a12..249bf8b 100755 (executable)
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -57,6 +57,24 @@ li:before {
     </tr>
     <tr>
       <td width="60" align="center" nowrap><strong><a
+          id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.2">.2</a><br />
+          <em>24/09/2020</em></strong></td>
+      <td align="left" valign="top">
+        <ul>
+        </ul>
+      </td>
+      <td align="left" valign="top">
+        <ul>
+          <li>
+            <!-- JAL-3757 -->Fresh install of Jalview 2.11.1.1 reports
+            "Encountered problems opening
+            https://www.jalview.org/examples/exampleFile_2_7.jvp"
+          </li>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td width="60" align="center" nowrap><strong><a
           id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.1">.1</a><br />
           <em>17/09/2020</em></strong></td>
       <td align="left" valign="top">

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 7ad7320..3a238bb 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -691,12 +691,7 @@ public class Jalview
         jalview.bin.Cache.removeProperty("STARTUP_FILE");
       }
 
-      protocol = DataSourceType.FILE;
-
-      if (HttpUtils.startsWithHttpOrHttps(file))
-      {
-        protocol = DataSourceType.URL;
-      }
+      protocol = AppletFormatAdapter.checkProtocol(file);
 
       if (file.endsWith(".jar"))
       {