JAL-1622 fix bug computing superposition + associated refactorings

[jalview.git] / test / jalview / ext / rbvi / chimera / JalviewChimeraView.java

diff --git a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
index f2535cb..807d7bb 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
+++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
@@ -7,7 +7,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import jalview.api.structures.JalviewStructureDisplayI;
-import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
 import jalview.gui.StructureViewer;
@@ -63,14 +62,11 @@ public class JalviewChimeraView
         {
           final StructureViewer structureViewer = new StructureViewer(af
                   .getViewport().getStructureSelectionManager());
-
+          structureViewer.setViewerType(ViewerType.JMOL);
           JalviewStructureDisplayI jmolViewer = structureViewer
-                  .viewStructures(ViewerType.JMOL, af.getCurrentView()
-                          .getAlignPanel(), new PDBEntry[]
-                  { (PDBEntry) dsq.getPDBId().elementAt(q) },
-                          new SequenceI[][]
-                          { new SequenceI[]
-                          { sq } });
+                  .viewStructures(dsq.getPDBId().elementAt(q),
+                          new SequenceI[]
+                  { sq }, af.getCurrentView().getAlignPanel());
           /*
            * Wait for viewer thread to start
            */
@@ -110,14 +106,11 @@ public class JalviewChimeraView
         {
           final StructureViewer structureViewer = new StructureViewer(af
                   .getViewport().getStructureSelectionManager());
-
+          structureViewer.setViewerType(ViewerType.CHIMERA);
           JalviewStructureDisplayI chimeraViewer = structureViewer
-                  .viewStructures(ViewerType.CHIMERA, af.getCurrentView()
-                          .getAlignPanel(), new PDBEntry[]
-                  { (PDBEntry) dsq.getPDBId().elementAt(q) },
-                          new SequenceI[][]
-                          { new SequenceI[]
-                          { sq } });
+                  .viewStructures(dsq.getPDBId().elementAt(q),
+                          new SequenceI[]
+                          { sq }, af.getCurrentView().getAlignPanel());
           /*
            * Wait for viewer thread to start
            */