JAL-3518 basic refactoring / pull up of superposeStructures; to tidy!

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

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index c8012a6..79d3836 100644 (file)
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -160,12 +160,16 @@ public class StructureViewer
     {
       sview = new AppJmol(ap, superposeAdded, pdbsForFile, theSeqs);
     }
-    else if (viewerType.equals(ViewerType.CHIMERA)
-            || viewerType.equals(ViewerType.CHIMERAX))
+    else if (viewerType.equals(ViewerType.CHIMERA))
     {
       sview = new ChimeraViewFrame(pdbsForFile, superposeAdded, theSeqs,
               ap);
     }
+    else if (viewerType.equals(ViewerType.CHIMERAX))
+    {
+      sview = new ChimeraXViewFrame(pdbsForFile, superposeAdded, theSeqs,
+              ap);
+    }
     else
     {
       Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());
@@ -302,11 +306,14 @@ public class StructureViewer
     {
       sview = new AppJmol(pdb, seqsForPdb, null, ap);
     }
-    else if (viewerType.equals(ViewerType.CHIMERA)
-            || viewerType.equals(ViewerType.CHIMERAX))
+    else if (viewerType.equals(ViewerType.CHIMERA))
     {
       sview = new ChimeraViewFrame(pdb, seqsForPdb, null, ap);
     }
+    else if (viewerType.equals(ViewerType.CHIMERAX))
+    {
+      sview = new ChimeraXViewFrame(pdb, seqsForPdb, null, ap);
+    }
     else
     {
       Cache.log.error(UNKNOWN_VIEWER_TYPE + getViewerType().toString());