X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplitFrame.java;h=253b02c45d93a9c9cb279d41310b57b9f095e5e8;hb=f300e30df117ff4be7d1df5c781161efd0285e5f;hp=8d559ee05ddd1943bef81cbc7f759d26066618fc;hpb=53b2ec17b88081e402f60deab2723750bc4867d1;p=jalview.git

diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java
index 8d559ee..253b02c 100644
--- a/src/jalview/gui/SplitFrame.java
+++ b/src/jalview/gui/SplitFrame.java
@@ -21,7 +21,6 @@
 package jalview.gui;
 
 import jalview.api.SplitContainerI;
-import jalview.bin.Instance;
 import jalview.datamodel.AlignmentI;
 import jalview.jbgui.GAlignFrame;
 import jalview.jbgui.GSplitFrame;
@@ -133,7 +132,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
     // allow about 65 pixels for Desktop decorators on Windows
 
     int newHeight = Math.min(height,
-            Instance.getDesktop().getHeight() - DESKTOP_DECORATORS_HEIGHT);
+            Desktop.getInstance().getHeight() - DESKTOP_DECORATORS_HEIGHT);
     if (newHeight != height)
     {
       int oldDividerLocation = getDividerLocation();
@@ -150,8 +149,8 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
   {
     // TODO if CommandListener is only ever 1:1 for complementary views,
     // may change broadcast pattern to direct messaging (more efficient)
-    final StructureSelectionManager ssm = StructureSelectionManager
-            .getStructureSelectionManager(Instance.getDesktop());
+    final StructureSelectionManager ssm = Desktop
+            .getStructureSelectionManager();
     ssm.addCommandListener(((AlignFrame) getTopFrame()).getViewport());
     ssm.addCommandListener(((AlignFrame) getBottomFrame()).getViewport());
   }
@@ -283,7 +282,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
       public void internalFrameClosed(InternalFrameEvent evt)
       {
         close();
-      };
+      }
     });
   }
 
@@ -556,8 +555,8 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
      */
     adjustLayout();
 
-    final StructureSelectionManager ssm = StructureSelectionManager
-            .getStructureSelectionManager(Instance.getDesktop());
+    final StructureSelectionManager ssm = Desktop
+            .getStructureSelectionManager();
     ssm.addCommandListener(newTopPanel.av);
     ssm.addCommandListener(newBottomPanel.av);
   }
@@ -684,7 +683,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
    */
   protected void expandViews_actionPerformed()
   {
-    Instance.getDesktop().explodeViews(this);
+    Desktop.getInstance().explodeViews(this);
   }
 
   /**
@@ -693,7 +692,7 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
    */
   protected void gatherViews_actionPerformed()
   {
-    Instance.getDesktop().gatherViews(this);
+    Desktop.getInstance().gatherViews(this);
   }
 
   /**