JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

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

diff --git a/src/jalview/io/VamsasAppDatastore.java b/src/jalview/io/VamsasAppDatastore.java
index 3145fe9..84d31f0 100644 (file)
--- a/src/jalview/io/VamsasAppDatastore.java
+++ b/src/jalview/io/VamsasAppDatastore.java
@@ -21,7 +21,6 @@
 package jalview.io;
 
 import jalview.bin.Cache;
-import jalview.bin.Instance;
 import jalview.datamodel.AlignedCodonFrame;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.GraphLine;
@@ -390,7 +389,6 @@ public class VamsasAppDatastore
         {
           dssmods.addElement(sequence);
         }
-        ;
       }
       if (dssmods.size() > 0)
       {
@@ -586,7 +584,6 @@ public class VamsasAppDatastore
                           (AlignmentSequence) alsref, aa[i]);
                   break;
                 }
-                ;
               }
             }
           }
@@ -723,7 +720,7 @@ public class VamsasAppDatastore
       // FIND ANY ASSOCIATED TREES
       if (Desktop.getDesktopPane() != null)
       {
-        javax.swing.JInternalFrame[] frames = Instance.getDesktop()
+        javax.swing.JInternalFrame[] frames = Desktop.getInstance()
                 .getAllFrames();
 
         for (int t = 0; t < frames.length; t++)
@@ -1479,8 +1476,7 @@ public class VamsasAppDatastore
           // active
           if (mappings != null)
           {
-            jalview.structure.StructureSelectionManager
-                    .getStructureSelectionManager(Instance.getDesktop())
+            Desktop.getStructureSelectionManager()
                     .registerMappings(mappings);
           }
         }