X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=1899bd3ea52c94e9731aaadf0e08901075548a52;hb=1e9f882c52f5b95d198c42973e7b2b1ce2b420df;hp=91e19487f98348599e127ca989756fed18be207f;hpb=d6ab7729d96fd22c5e733dbb0af998f8e6387200;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 91e1948..1899bd3 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -237,7 +237,7 @@ public class Desktop extends GDesktop * It is set by invoking Desktop.getInstanceOnly(). * */ - boolean instanceOnly; + static boolean instanceOnly; class MyDesktopManager implements DesktopManager { @@ -388,17 +388,14 @@ public class Desktop extends GDesktop */ public static Desktop getInstanceOnly() { - Desktop d = (Desktop) ApplicationSingletonProvider - .getInstance(Desktop.class); - d.instanceOnly = true; - return d; + instanceOnly = true; + return getInstance(); } /** * Private constructor enforces singleton pattern. It is called by reflection * from ApplicationSingletonProvider.getInstance(). */ - @SuppressWarnings("unused") private Desktop() { Cache.initLogger(); @@ -929,7 +926,7 @@ public class Desktop extends GDesktop // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN // IF JALVIEW IS RUNNING HEADLESS OR IN INSTANCE-ONLY (testNG) MODE // /////////////////////////////////////////////// - if (Jalview.isHeadlessMode() || Desktop.getInstance().instanceOnly) + if (Jalview.isHeadlessMode() || Desktop.instanceOnly) { return; }