JAL-3253 jalview.bin.Instance streamlining

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

diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java
index 61eea30..d6f3df1 100644 (file)
--- a/src/jalview/gui/StructureChooser.java
+++ b/src/jalview/gui/StructureChooser.java
@@ -23,7 +23,6 @@ package jalview.gui;
 
 import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.bin.Cache;
-import jalview.bin.Instance;
 import jalview.bin.Jalview;
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.DBRefSource;
@@ -147,16 +146,16 @@ public class StructureChooser extends GStructureChooser
    */
   protected void discoverStructureViews()
   {
-    if (Instance.getDesktop() != null)
+    if (Desktop.getInstance() != null)
     {
       targetView.removeAllItems();
-      Desktop d = Instance.getDesktop();
+      Desktop d = Desktop.getInstance();
       if (d.lastTargetedView != null && !d.lastTargetedView.isVisible())
       {
         d.lastTargetedView = null;
       }
       int linkedViewsAt = 0;
-      for (StructureViewerBase view : Instance.getDesktop()
+      for (StructureViewerBase view : Desktop.getInstance()
               .getStructureViewers(null, null))
       {
         StructureViewer viewHandler = (d.lastTargetedView != null
@@ -995,10 +994,9 @@ public class StructureChooser extends GStructureChooser
           {
             selectedSequence = userSelectedSeq;
           }
-          PDBEntry fileEntry = new AssociatePdbFileWithSeq()
+          PDBEntry fileEntry = AssociatePdbFileWithSeq
                   .associatePdbWithSeq(selectedPdbFileName,
-                          DataSourceType.FILE, selectedSequence, true,
-                          Instance.getDesktop());
+                          DataSourceType.FILE, selectedSequence, true);
 
           sViewer = launchStructureViewer(
                   ssm, new PDBEntry[]
@@ -1154,7 +1152,7 @@ public class StructureChooser extends GStructureChooser
     }
     setProgressBar(null, progressId);
     // remember the last viewer we used...
-    Instance.getDesktop().lastTargetedView = theViewer;
+    Desktop.getInstance().lastTargetedView = theViewer;
     return theViewer;
   }