X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureViewer.java;h=8ff4c708657280acf375b3801d3308a6294bfb45;hb=cc6d26d2738c5854ef81ce6787d66564c2281220;hp=7d986c823dc9d0985f57aed21a335ac8c085f37c;hpb=0c5e8f8ba81b913c63b60d7670d66aca661ea4f5;p=jalview.git

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index 7d986c8..8ff4c70 100644
--- a/src/jalview/gui/StructureViewer.java
+++ b/src/jalview/gui/StructureViewer.java
@@ -24,7 +24,7 @@ import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.bin.Cache;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
-import jalview.gui.Jalview2XML.ViewerData;
+import jalview.datamodel.StructureViewerModel;
 import jalview.structure.StructureSelectionManager;
 
 import java.awt.Rectangle;
@@ -132,19 +132,19 @@ public class StructureViewer
    */
   public JalviewStructureDisplayI createView(ViewerType type,
           String[] pdbf, String[] id, SequenceI[][] sq,
-          AlignmentPanel alignPanel, ViewerData viewerData, String fileloc,
+          AlignmentPanel alignPanel, StructureViewerModel viewerData, String fileloc,
           Rectangle rect, String vid)
   {
-    final boolean useinViewerSuperpos = viewerData.alignWithPanel;
-    final boolean usetoColourbyseq = viewerData.colourWithAlignPanel;
-    final boolean viewerColouring = viewerData.colourByViewer;
+    final boolean useinViewerSuperpos = viewerData.isAlignWithPanel();
+    final boolean usetoColourbyseq = viewerData.isColourWithAlignPanel();
+    final boolean viewerColouring = viewerData.isColourByViewer();
 
     JalviewStructureDisplayI sview = null;
     switch (type)
     {
     case JMOL:
-      sview = new AppJmol(pdbf, id, sq, alignPanel, useinViewerSuperpos,
-              usetoColourbyseq, viewerColouring, fileloc, rect, vid);
+      sview = new AppJmol(pdbf, id, sq, alignPanel, usetoColourbyseq,
+              useinViewerSuperpos, viewerColouring, fileloc, rect, vid);
       break;
     case CHIMERA:
       Cache.log.error("Unsupported structure viewer type "