JAL-1333 more abstraction and refactoring and working demo of Jalview talking to...

[jalview.git] / src / jalview / gui / StructureViewer.java

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index ce22d84..e307aa9 100644 (file)
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -66,17 +66,19 @@ public class StructureViewer
   public JalviewStructureDisplayI viewStructures(AlignmentPanel ap,
           PDBEntry[] pr, SequenceI[][] collateForPDB)
   {
+    return viewStructures(getViewerType(), ap, pr, collateForPDB);
+  }
+  public JalviewStructureDisplayI viewStructures(Viewer viewerType,AlignmentPanel ap,
+          PDBEntry[] pr, SequenceI[][] collateForPDB)
+  {
     JalviewStructureDisplayI sview = null;
-    switch (getViewerType())
-    {
-    case JMOL:
-
+    if (viewerType.equals(Viewer.JMOL)){
       sview = new AppJmol(ap, pr, ap.av.collateForPDB(pr));
-
-      break;
-    case CHIMERA:
-      break;
-    default:
+    } else
+    if (viewerType.equals(Viewer.CHIMERA)) {
+      sview = new ChimeraViewFrame(ap, pr, ap.av.collateForPDB(pr));
+    }else 
+    {
       Cache.log.error("Unknown structure viewer type "
               + getViewerType().toString());
     }