X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignViewportTest.java;h=ff8b19cc34da5ae64564ca3c29ab9e71befd224c;hb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;hp=6252cbedf6dab3d55cfc1485da1c940a28dcf2fd;hpb=5721b73c6d5de84b21a989a8734e4c161f5dc630;p=jalview.git

diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java
index 6252cbe..ff8b19c 100644
--- a/test/jalview/gui/AlignViewportTest.java
+++ b/test/jalview/gui/AlignViewportTest.java
@@ -79,9 +79,7 @@ public class AlignViewportTest
     /*
      * remove any sequence mappings left lying around by other tests
      */
-    StructureSelectionManager ssm = StructureSelectionManager
-            .getStructureSelectionManager(Desktop.getInstance());
-    ssm.resetAll();
+    Desktop.getInstance().getStructureSelectionManager().resetAll();
   }
 
   @BeforeMethod(alwaysRun = true)
@@ -127,9 +125,8 @@ public class AlignViewportTest
      * Verify that creating the alignment for the new View has registered the
      * mappings
      */
-    StructureSelectionManager ssm = StructureSelectionManager
-            .getStructureSelectionManager(Desktop.getInstance());
-    List<AlignedCodonFrame> sequenceMappings = ssm.getSequenceMappings();
+    List<AlignedCodonFrame> sequenceMappings = Desktop.getInstance()
+            .getStructureSelectionManager().getSequenceMappings();
     assertEquals(2, sequenceMappings.size());
     assertTrue(sequenceMappings.contains(acf1));
     assertTrue(sequenceMappings.contains(acf2));
@@ -152,8 +149,8 @@ public class AlignViewportTest
   {
     Desktop d = Desktop.getInstance();
     assertNotNull(d);
-    StructureSelectionManager ssm = StructureSelectionManager
-            .getStructureSelectionManager(Desktop.getInstance());
+    StructureSelectionManager ssm = Desktop.getInstance()
+            .getStructureSelectionManager();
     ssm.resetAll();
 
     AlignFrame af1 = new FileLoader().LoadFileWaitTillLoaded(
@@ -215,8 +212,8 @@ public class AlignViewportTest
   {
     Desktop d = Desktop.getInstance();
     assertNotNull(d);
-    StructureSelectionManager ssm = StructureSelectionManager
-            .getStructureSelectionManager(Desktop.getInstance());
+    StructureSelectionManager ssm = Desktop.getInstance()
+            .getStructureSelectionManager();
     ssm.resetAll();
 
     AlignFrame af1 = new FileLoader().LoadFileWaitTillLoaded(
@@ -448,7 +445,6 @@ public class AlignViewportTest
     {
       c++;
     }
-    ;
     Assert.assertEquals(c, 1, "Expected to find one occupancy row.");
   }