JAL-3563 adds Jalview.setSynchronous()

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 91e1948..1e58d1b 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -227,18 +227,6 @@ public class Desktop extends GDesktop
 
   public JInternalFrame PIDSlider;
 
-  /**
-   * just an instance (for testng, probably); no actual frames
-   * 
-   * This flag, when set true, allows a headless-like operation, with a Desktop
-   * object but no actual frames. Though not headless, this option disallows
-   * dialogs to run in test environments.
-   * 
-   * It is set by invoking Desktop.getInstanceOnly().
-   * 
-   */
-  boolean instanceOnly;
-
   class MyDesktopManager implements DesktopManager
   {
 
@@ -377,28 +365,11 @@ public class Desktop extends GDesktop
             : (Desktop) ApplicationSingletonProvider
                     .getInstance(Desktop.class);
   }
-
-  /**
-   * For TestNG, this constructor can be utilized to allow the creation of a
-   * singleton Desktop instance with the creation of frames, but no addition to
-   * the Desktop object, as in headless mode. Dialogs are not initiated.
-   * Cache.log is also initialized for some tests that require it despite there
-   * being no Desktop.
-   * 
-   */
-  public static Desktop getInstanceOnly()
-  {
-    Desktop d = (Desktop) ApplicationSingletonProvider
-            .getInstance(Desktop.class);
-    d.instanceOnly = true;
-    return d;
-  }
   
   /**
    * Private constructor enforces singleton pattern. It is called by reflection
    * from ApplicationSingletonProvider.getInstance().
    */
-  @SuppressWarnings("unused")
   private Desktop()
   {
     Cache.initLogger();
@@ -470,7 +441,7 @@ public class Desktop extends GDesktop
       // it deletes the unneeded Java-only code form the JavaScript version
       // completely (@j2sIgnore), since it will never be used there.
 
-      if (!Platform.isJS())
+      if (!Platform.isJS() && !Jalview.isSynchronous())
       /**
        * Java only
        * 
@@ -927,9 +898,9 @@ public class Desktop extends GDesktop
     }
     // THIS IS A PUBLIC STATIC METHOD, SO IT MAY BE CALLED EVEN IN
     // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
-    // IF JALVIEW IS RUNNING HEADLESS OR IN INSTANCE-ONLY (testNG) MODE
+    // IF JALVIEW IS RUNNING HEADLESS
     // ///////////////////////////////////////////////
-    if (Jalview.isHeadlessMode() || Desktop.getInstance().instanceOnly)
+    if (Jalview.isHeadlessMode())
     {
       return;
     }
@@ -1876,7 +1847,7 @@ public class Desktop extends GDesktop
           {
                try 
             {
-              new Jalview2XML().loadJalviewAlign(choice);
+              new Jalview2XML().loadJalviewAlign(selectedFile);
             } catch (OutOfMemoryError oom)
                {
                  new OOMWarning("Whilst loading project from " + choice, oom);
@@ -3312,7 +3283,7 @@ public class Desktop extends GDesktop
           {
           }
         }
-        if (instanceOnly || Jalview.isHeadlessMode())
+        if (Jalview.isHeadlessMode())
         {
           return;
         }