Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview...

diff --git a/src/jalview/bin/JalviewAppLoader.java b/src/jalview/bin/JalviewAppLoader.java
index 5d60cf9..194d619 100644 (file)
--- a/src/jalview/bin/JalviewAppLoader.java
+++ b/src/jalview/bin/JalviewAppLoader.java
@@ -343,7 +343,7 @@ public class JalviewAppLoader
       DataSourceType protocol = resolveFileProtocol(app,
               ret);
 
-      result = app.parseFeaturesFile(param, protocol);
+      result = app.parseFeaturesFile(ret[0], protocol);
     }
 
     param = app.getParameter("showFeatureSettings");

diff --git a/src/jalview/util/Platform.java b/src/jalview/util/Platform.java
index 0c962f7..9b57a5a 100644 (file)
--- a/src/jalview/util/Platform.java
+++ b/src/jalview/util/Platform.java
@@ -621,30 +621,40 @@ public class Platform
   {
     try
     {
-      return (isJS() ? new URL(/**
-                                * @j2sNative J2S.thisApplet._applet.appletViewer.appletDocumentBase
-                                *            ||
-                                */
-              "") : null);
+      if (isJS())
+      {
+        @SuppressWarnings("unused")
+        Object g = Thread.currentThread().getThreadGroup();
+        return new URL(/**
+                        * @j2sNative g.秘html5Applet._appletPanel.appletDocumentBase
+                        *            ||
+                        */
+                "");
+      }
     } catch (MalformedURLException e)
     {
-      return null;
     }
+    return null;
   }
 
   public static URL getCodeBase()
   {
     try
     {
-      return (isJS() ? new URL(/**
-                                * @j2sNative J2S.thisApplet._applet.appletViewer.appletCodeBase
-                                *            ||
-                                */
-              "") : null);
+      if (isJS())
+      {
+        @SuppressWarnings("unused")
+        Object g = Thread.currentThread().getThreadGroup();
+        return new URL(/**
+                        * @j2sNative g.秘html5Applet._appletPanel.appletCodeBase
+                        *            ||
+                        */
+                "");
+      }
     } catch (MalformedURLException e)
     {
-      return null;
     }
+    return null;
   }
 
 }