Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / src / jalview / datamodel / StructureViewerModel.java

diff --git a/src/jalview/datamodel/StructureViewerModel.java b/src/jalview/datamodel/StructureViewerModel.java
index 098372b..1b78948 100644 (file)
--- a/src/jalview/datamodel/StructureViewerModel.java
+++ b/src/jalview/datamodel/StructureViewerModel.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.datamodel;
 
 import java.io.File;
@@ -27,6 +47,11 @@ public class StructureViewerModel
 
   private String stateData = "";
 
+  private String viewId;
+
+  // CHIMERA or JMOL (for projects from Jalview 2.9 on)
+  private String type;
+
   private Map<File, StructureData> fileData = new HashMap<File, StructureData>();
 
   public class StructureData
@@ -85,7 +110,7 @@ public class StructureViewerModel
 
   public StructureViewerModel(int x, int y, int width, int height,
           boolean alignWithPanel, boolean colourWithAlignPanel,
-          boolean colourByViewer)
+          boolean colourByViewer, String viewId, String type)
   {
     this.x = x;
     this.y = y;
@@ -94,6 +119,8 @@ public class StructureViewerModel
     this.alignWithPanel = alignWithPanel;
     this.colourWithAlignPanel = colourWithAlignPanel;
     this.colourByViewer = colourByViewer;
+    this.viewId = viewId;
+    this.type = type;
   }
 
   public int getX()
@@ -186,4 +213,13 @@ public class StructureViewerModel
     this.fileData = fileData;
   }
 
+  public String getViewId()
+  {
+    return this.viewId;
+  }
+
+  public String getType()
+  {
+    return this.type;
+  }
 }