JAL-3253 jalview.bin.Instance streamlining

[jalview.git] / src / jalview / io / FileLoader.java

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index d3bf4e0..9f9e956 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -25,7 +25,6 @@ import jalview.api.FeatureSettingsModelI;
 import jalview.api.FeaturesDisplayedI;
 import jalview.api.FeaturesSourceI;
 import jalview.bin.Cache;
-import jalview.bin.Instance;
 import jalview.bin.Jalview;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.HiddenColumns;
@@ -38,7 +37,6 @@ import jalview.gui.JvOptionPane;
 import jalview.json.binding.biojson.v1.ColourSchemeMapper;
 import jalview.project.Jalview2XML;
 import jalview.schemes.ColourSchemeI;
-import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
 import jalview.ws.utils.UrlDownloadClient;
@@ -279,9 +277,9 @@ public class FileLoader implements Runnable
     Runtime rt = Runtime.getRuntime();
     try
     {
-      if (Instance.getDesktop() != null)
+      if (Desktop.getInstance() != null)
       {
-        Instance.getDesktop().startLoading(file);
+        Desktop.getInstance().startLoading(file);
       }
       if (format == null)
       {
@@ -303,7 +301,7 @@ public class FileLoader implements Runnable
 
       if (format == null)
       {
-        Instance.getDesktop().stopLoading();
+        Desktop.getInstance().stopLoading();
         System.err.println("The input file \"" + file
                 + "\" has null or unidentifiable data content!");
         if (!Jalview.isHeadlessMode())
@@ -411,8 +409,7 @@ public class FileLoader implements Runnable
               {
                 // register PDB entries with desktop's structure selection
                 // manager
-                StructureSelectionManager
-                        .getStructureSelectionManager(Instance.getDesktop())
+                Desktop.getStructureSelectionManager()
                         .registerPDBEntry(pdbe);
               }
             }
@@ -501,9 +498,9 @@ public class FileLoader implements Runnable
         }
         else
         {
-          if (Instance.getDesktop() != null)
+          if (Desktop.getInstance() != null)
           {
-            Instance.getDesktop().stopLoading();
+            Desktop.getInstance().stopLoading();
           }
 
           final String errorMessage = MessageManager.getString(
@@ -611,9 +608,9 @@ public class FileLoader implements Runnable
       }
     }
     // remove the visual delay indicator
-    if (Instance.getDesktop() != null)
+    if (Desktop.getInstance() != null)
     {
-      Instance.getDesktop().stopLoading();
+      Desktop.getInstance().stopLoading();
     }
 
   }