Merge branch 'develop' into features/JAL-1541_BioJsMSAViewer-export-option

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

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index ccb3c18..ad7b675 100644 (file)
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -20,15 +20,14 @@
  */
 package jalview.gui;
 
-import java.awt.Rectangle;
-
 import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.bin.Cache;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
-import jalview.gui.StructureViewer.Viewer;
 import jalview.structure.StructureSelectionManager;
 
+import java.awt.Rectangle;
+
 /**
  * proxy for handling structure viewers.
  * 
@@ -49,13 +48,14 @@ public class StructureViewer
 
   public Viewer getViewerType()
   {
-    String viewType = Cache.getDefault("STRUCTURE_DISPLAY", "JMOL");
+    String viewType = Cache.getDefault(Preferences.STRUCTURE_DISPLAY,
+            Viewer.JMOL.name());
     return Viewer.valueOf(viewType);
   }
 
   public void setViewerType(Viewer type)
   {
-    Cache.setProperty("STRUCTURE_DISPLAY", type.toString());
+    Cache.setProperty(Preferences.STRUCTURE_DISPLAY, type.name());
   }
 
   public StructureViewer(StructureSelectionManager structureSelectionManager)