JAL-2075 make GroovyConsole a singleton so tests requiring a valid AlignFrame but...

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index e439696..67152f2 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -922,7 +922,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
             .setSelected(av.getGlobalColourScheme() instanceof jalview.schemes.RNAHelicesColour);
 
     showProducts.setEnabled(canShowProducts());
-    setGroovyEnabled(Desktop.instance.getGroovyConsole() != null);
+    setGroovyEnabled(Desktop.getGroovyConsole() != null);
 
     updateEditMenuBar();
   }

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index ba7f255..b7c4098 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -3164,7 +3164,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     Desktop.currentAlignFrame = currentAlignFrame;
   }
 
-  public Object getGroovyConsole()
+  public static Object getGroovyConsole()
   {
     return groovyConsole;
   }