JAL-3253 preliminary static fixes for JavaScript part 4 of 3

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 9e3382a..9da666b 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -106,6 +106,12 @@ import groovy.util.GroovyScriptEngine;
  */
 public class Jalview
 {
+
+  public Jalview()
+  {
+    setInstance(this);
+  }
+
   static
   {
     Platform.getURLCommandArguments();
@@ -126,6 +132,10 @@ public class Jalview
 
   public static Jalview getInstance()
   {
+    if (instance == null)
+    {
+      instance = new Jalview();
+    }
     Jalview j;
     @SuppressWarnings("unused")
     ThreadGroup g = Thread.currentThread().getThreadGroup();
@@ -260,7 +270,7 @@ public class Jalview
   public static void main(String[] args)
   {
     // setLogging(); // BH - for event debugging in JavaScript
-    setInstance(new Jalview());
+    new Jalview();
     getInstance().doMain(args);
   }