JAL-3210 Barebones gradle/buildship/eclipse. See README

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

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index ff3285c..7d01222 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -29,7 +29,6 @@ import jalview.api.FeatureSettingsModelI;
 import jalview.api.FeaturesDisplayedI;
 import jalview.api.ViewStyleI;
 import jalview.bin.Cache;
-import jalview.bin.Instance;
 import jalview.commands.CommandI;
 import jalview.datamodel.AlignedCodonFrame;
 import jalview.datamodel.Alignment;
@@ -385,7 +384,7 @@ public class AlignViewport extends AlignmentViewport
     if (align != null)
     {
       StructureSelectionManager ssm = StructureSelectionManager
-              .getStructureSelectionManager(Instance.getDesktop());
+              .getStructureSelectionManager(Desktop.instance);
       ssm.registerMappings(align.getCodonFrames());
     }
 
@@ -407,7 +406,7 @@ public class AlignViewport extends AlignmentViewport
       if (mappings != null)
       {
         StructureSelectionManager ssm = StructureSelectionManager
-                .getStructureSelectionManager(Instance.getDesktop());
+                .getStructureSelectionManager(Desktop.instance);
         for (AlignedCodonFrame acf : mappings)
         {
           if (noReferencesTo(acf))
@@ -533,7 +532,7 @@ public class AlignViewport extends AlignmentViewport
   public void sendSelection()
   {
     jalview.structure.StructureSelectionManager
-            .getStructureSelectionManager(Instance.getDesktop())
+            .getStructureSelectionManager(Desktop.instance)
             .sendSelection(new SequenceGroup(getSelectionGroup()),
                     new ColumnSelection(getColumnSelection()),
                     new HiddenColumns(getAlignment().getHiddenColumns()),
@@ -579,7 +578,7 @@ public class AlignViewport extends AlignmentViewport
   public StructureSelectionManager getStructureSelectionManager()
   {
     return StructureSelectionManager
-            .getStructureSelectionManager(Instance.getDesktop());
+            .getStructureSelectionManager(Desktop.instance);
   }
 
   @Override
@@ -771,7 +770,7 @@ public class AlignViewport extends AlignmentViewport
      * dialog responses 0, 1, 2 (even though JOptionPane shows them
      * in reverse order)
      */
-    JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.getDesktopPane())
+    JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop)
             .setResponseHandler(0, new Runnable()
             {
               @Override