X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FVamsasApplication.java;h=c094b1c362ffce4ffbe320cf23b771e5ee2bb7d1;hb=4f77328104498504339216829abf5ea87e2791ec;hp=4404a8dff7adee370713140988078accfc5e9f39;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git

diff --git a/src/jalview/gui/VamsasApplication.java b/src/jalview/gui/VamsasApplication.java
index 4404a8d..c094b1c 100644
--- a/src/jalview/gui/VamsasApplication.java
+++ b/src/jalview/gui/VamsasApplication.java
@@ -173,7 +173,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
           }
         } catch (InvalidSessionDocumentException e)
         {
-          JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(),
+          JvOptionPane.showInternalMessageDialog(Desktop.desktop,
 
                   MessageManager.getString(
                           "label.vamsas_doc_couldnt_be_opened_as_new_session"),
@@ -455,7 +455,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
     VamsasAppDatastore vds = new VamsasAppDatastore(doc, vobj2jv, jv2vobj,
             baseProvEntry(), alRedoState);
     // wander through frames
-    JInternalFrame[] frames = Desktop.getDesktopPane().getAllFrames();
+    JInternalFrame[] frames = Desktop.desktop.getAllFrames();
 
     if (frames == null)
     {
@@ -660,7 +660,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
                   Cache.log.debug(
                           "Asking user if the vamsas session should be stored.");
                   int reply = JvOptionPane.showInternalConfirmDialog(
-                          Desktop.getDesktopPane(),
+                          Desktop.desktop,
                           "The current VAMSAS session has unsaved data - do you want to save it ?",
                           "VAMSAS Session Shutdown",
                           JvOptionPane.YES_NO_OPTION,
@@ -669,7 +669,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
                   if (reply == JvOptionPane.YES_OPTION)
                   {
                     Cache.log.debug("Prompting for vamsas store filename.");
-                    Desktop.getInstance().vamsasSave_actionPerformed(null);
+                    Desktop.instance.vamsasSave_actionPerformed(null);
                     Cache.log
                             .debug("Finished attempt at storing document.");
                   }
@@ -688,7 +688,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
 
   public void disableGui(boolean b)
   {
-    Desktop.getInstance().setVamsasUpdate(b);
+    Desktop.instance.setVamsasUpdate(b);
   }
 
   Hashtable _backup_vobj2jv;
@@ -761,10 +761,10 @@ public class VamsasApplication implements SelectionSource, VamsasSource
       }
       try
       {
-        IPickManager pm = vclient.getPickManager();
-        StructureSelectionManager ssm = Desktop.getInstance()
-                .getStructureSelectionManager();
-        VamsasApplication me = this;
+        final IPickManager pm = vclient.getPickManager();
+        final StructureSelectionManager ssm = StructureSelectionManager
+                .getStructureSelectionManager(Desktop.instance);
+        final VamsasApplication me = this;
         pm.registerMessageHandler(new IMessageHandler()
         {
           String last = null;
@@ -830,6 +830,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
                 {
                   type = jvobjs[o].getClass();
                 }
+                ;
                 if (type != jvobjs[o].getClass())
                 {
                   send = false;
@@ -953,6 +954,7 @@ public class VamsasApplication implements SelectionSource, VamsasSource
               {
                 jvobjs[c] = null;
               }
+              ;
               jvobjs = null;
               return;
             }