JAL-845 handling eXpand/Gather split frame views

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

diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java
index 7d986c8..8ff4c70 100644 (file)
--- 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 "