JAL-1588 refactoring to StructureViewerBase and related

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

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index 22f12ea..c204fec 100644 (file)
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -41,19 +41,19 @@ public class StructureViewer
 {
   StructureSelectionManager ssm;
 
-  public enum Viewer
+  public enum ViewerType
   {
     JMOL, CHIMERA
   };
 
-  public Viewer getViewerType()
+  public ViewerType getViewerType()
   {
     String viewType = Cache.getDefault(Preferences.STRUCTURE_DISPLAY,
-            Viewer.JMOL.name());
-    return Viewer.valueOf(viewType);
+            ViewerType.JMOL.name());
+    return ViewerType.valueOf(viewType);
   }
 
-  public void setViewerType(Viewer type)
+  public void setViewerType(ViewerType type)
   {
     Cache.setProperty(Preferences.STRUCTURE_DISPLAY, type.name());
   }
@@ -69,15 +69,15 @@ public class StructureViewer
     return viewStructures(getViewerType(), ap, pr, collateForPDB);
   }
 
-  public JalviewStructureDisplayI viewStructures(Viewer viewerType,
+  public JalviewStructureDisplayI viewStructures(ViewerType viewerType,
           AlignmentPanel ap, PDBEntry[] pr, SequenceI[][] collateForPDB)
   {
     JalviewStructureDisplayI sview = null;
-    if (viewerType.equals(Viewer.JMOL))
+    if (viewerType.equals(ViewerType.JMOL))
     {
       sview = new AppJmol(ap, pr, ap.av.collateForPDB(pr));
     }
-    else if (viewerType.equals(Viewer.CHIMERA))
+    else if (viewerType.equals(ViewerType.CHIMERA))
     {
       sview = new ChimeraViewFrame(ap, pr, ap.av.collateForPDB(pr));
     }
@@ -89,15 +89,15 @@ public class StructureViewer
     return sview;
   }
 
-  public JalviewStructureDisplayI viewStructures(Viewer viewerType,
+  public JalviewStructureDisplayI viewStructures(ViewerType viewerType,
           AlignmentPanel ap, PDBEntry pr, SequenceI[] collateForPDB)
   {
     JalviewStructureDisplayI sview = null;
-    if (viewerType.equals(Viewer.JMOL))
+    if (viewerType.equals(ViewerType.JMOL))
     {
       sview = new AppJmol(pr, collateForPDB, null, ap);
     }
-    else if (viewerType.equals(Viewer.CHIMERA))
+    else if (viewerType.equals(ViewerType.CHIMERA))
     {
       sview = new ChimeraViewFrame(pr, collateForPDB, null, ap);
     }
@@ -115,13 +115,14 @@ public class StructureViewer
     return viewStructures(getViewerType(), ap, pdb, sequenceIs);
   }
 
-  public JalviewStructureDisplayI createView(Viewer viewer, String[] pdbf,
+  public JalviewStructureDisplayI createView(ViewerType type,
+          String[] pdbf,
           String[] id, SequenceI[][] sq, AlignmentPanel alignPanel,
           boolean useinJmolsuperpos, boolean usetoColourbyseq,
           boolean jmolColouring, String fileloc, Rectangle rect, String vid)
   {
     JalviewStructureDisplayI sview = null;
-    switch (viewer)
+    switch (type)
     {
     case JMOL:
       sview = new AppJmol(pdbf, id, sq, alignPanel, useinJmolsuperpos,
@@ -129,10 +130,10 @@ public class StructureViewer
       break;
     case CHIMERA:
       Cache.log.error("Unsupported structure viewer type "
-              + viewer.toString());
+              + type.toString());
       break;
     default:
-      Cache.log.error("Unknown structure viewer type " + viewer.toString());
+      Cache.log.error("Unknown structure viewer type " + type.toString());
     }
     return sview;
   }