X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FInstance.java;h=a8db18fd7b01cb9c91986c026ad8f7f8f81ae3a8;hb=5864fb13da0d1c50f0b16be014e73394ec234f46;hp=3bcd618318398ce21445d6f435019aec508bbdf5;hpb=8fa5d7b968b7aea4cad06c7a413a26253157046f;p=jalview.git

diff --git a/src/jalview/bin/Instance.java b/src/jalview/bin/Instance.java
index 3bcd618..a8db18f 100644
--- a/src/jalview/bin/Instance.java
+++ b/src/jalview/bin/Instance.java
@@ -38,6 +38,7 @@ import jalview.schemes.ColourSchemes;
 import jalview.structure.StructureImportSettings;
 import jalview.structure.StructureSelectionManager;
 import jalview.urls.IdOrgSettings;
+import jalview.util.Platform;
 import jalview.ws.jws1.Discoverer;
 import jalview.ws.jws2.Jws2Discoverer;
 import jalview.ws.jws2.jabaws2.Jws2InstanceFactory;
@@ -86,21 +87,23 @@ public class Instance
    */
   public static Instance getInstance()
   {
-    Instance i;
+
+    // assign g only if JavaScript and instance only if Java
+
     @SuppressWarnings("unused")
-    ThreadGroup g = Thread.currentThread().getThreadGroup();
-    /**
-     * @j2sNative i = g._jalviewInstance;
-     */
-    {
-      i = instance;
-    }
+    ThreadGroup g = (Platform.isJS()
+            ? Thread.currentThread().getThreadGroup()
+            : null);
+    Instance i = /** @j2sNative g._jalviewInstance || */
+            instance;
     if (i == null)
     {
-      i = instance = new Instance();
-      /**
-       * @j2sNative g._jalviewInstance = i;
-       */
+      i = /**
+           * @j2sNative g._jalviewInstance =
+           */
+              new Instance();
+      instance = /** @j2sNative null && */
+              i;
     }
     return i;
   }