JAL-1588 refactoring to StructureViewerBase and related

[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 1736af5..858806b 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
+++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
@@ -1,19 +1,14 @@
 package jalview.ext.rbvi.chimera;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
 import jalview.gui.StructureViewer;
-import jalview.gui.StructureViewer.Viewer;
+import jalview.gui.StructureViewer.ViewerType;
 import jalview.io.FormatAdapter;
 
-import java.awt.Desktop;
-import java.io.File;
-
-import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -58,25 +53,30 @@ public class JalviewChimeraView
       if (dsq.getPDBId()!=null && dsq.getPDBId().size()>0) {
         for (int q=0;q<dsq.getPDBId().size();q++) 
         {
-          new StructureViewer(af.getViewport().getStructureSelectionManager()).viewStructures(Viewer.JMOL,
+          new StructureViewer(af.getViewport()
+                  .getStructureSelectionManager()).viewStructures(
+                  ViewerType.JMOL,
                   af.getCurrentView().getAlignPanel(),
                   new PDBEntry[] { (PDBEntry)dsq.getPDBId().elementAt(q) },
                   new SequenceI[][] { new SequenceI[] { sq } });
 
-          new StructureViewer(af.getViewport().getStructureSelectionManager()).viewStructures(Viewer.CHIMERA,
+          new StructureViewer(af.getViewport()
+                  .getStructureSelectionManager()).viewStructures(
+                  ViewerType.CHIMERA,
                   af.getCurrentView().getAlignPanel(),
                   new PDBEntry[] { (PDBEntry)dsq.getPDBId().elementAt(q) },
                   new SequenceI[][] { new SequenceI[] { sq } });
+          // todo: break here means only once through this loop?
           break;
         }
         break;
       }
    }
-    try {
-      Thread.sleep(200000);
-    } catch (InterruptedException q)
-    {
-      
-    }
+    // try {
+      // why?
+//      Thread.sleep(200000);
+//    } catch (InterruptedException q)
+//    {
+    // }
   }
 }