JAL-3253 jalview.bin.Instance streamlining

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

diff --git a/src/jalview/gui/VamsasApplication.java b/src/jalview/gui/VamsasApplication.java
index f467b42..3731102 100644 (file)
--- a/src/jalview/gui/VamsasApplication.java
+++ b/src/jalview/gui/VamsasApplication.java
@@ -21,7 +21,6 @@
 package jalview.gui;
 
 import jalview.bin.Cache;
-import jalview.bin.Instance;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.ColumnSelection;
 import jalview.datamodel.HiddenColumns;
@@ -670,7 +669,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
                   if (reply == JvOptionPane.YES_OPTION)
                   {
                     Cache.log.debug("Prompting for vamsas store filename.");
-                    Instance.getDesktop().vamsasSave_actionPerformed(null);
+                    Desktop.getInstance().vamsasSave_actionPerformed(null);
                     Cache.log
                             .debug("Finished attempt at storing document.");
                   }
@@ -689,7 +688,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
 
   public void disableGui(boolean b)
   {
-    Instance.getDesktop().setVamsasUpdate(b);
+    Desktop.getInstance().setVamsasUpdate(b);
   }
 
   Hashtable _backup_vobj2jv;
@@ -762,10 +761,10 @@ public class VamsasApplication implements SelectionSource, VamsasSource
       }
       try
       {
-        final IPickManager pm = vclient.getPickManager();
-        final StructureSelectionManager ssm = StructureSelectionManager
-                .getStructureSelectionManager(Instance.getDesktop());
-        final VamsasApplication me = this;
+        IPickManager pm = vclient.getPickManager();
+        StructureSelectionManager ssm = Desktop
+                .getStructureSelectionManager();
+        VamsasApplication me = this;
         pm.registerMessageHandler(new IMessageHandler()
         {
           String last = null;