X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FChimeraXViewFrame.java;h=ac4f0c298ea53cc21981c49d7bf14fea6dfe8a59;hb=3380595c6eb44d914e9a25958bc09c4e292e1c32;hp=d0353f31439a022ca9d56834944e8438e85456bc;hpb=0fef78440888c7cf6980fe1349661512e3f1b62d;p=jalview.git

diff --git a/src/jalview/gui/ChimeraXViewFrame.java b/src/jalview/gui/ChimeraXViewFrame.java
index d0353f3..ac4f0c2 100644
--- a/src/jalview/gui/ChimeraXViewFrame.java
+++ b/src/jalview/gui/ChimeraXViewFrame.java
@@ -1,7 +1,28 @@
+/*
+ * 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.gui;
 
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
+import jalview.datamodel.StructureViewerModel;
 import jalview.gui.StructureViewer.ViewerType;
 
 /**
@@ -30,21 +51,15 @@ public class ChimeraXViewFrame extends ChimeraViewFrame
   /**
    * Constructor given a session file to be loaded
    * 
-   * @param chimeraSessionFile
+   * @param viewerData
    * @param alignPanel
-   * @param pdbArray
-   * @param seqsArray
-   * @param colourByChimera
-   * @param colourBySequence
-   * @param newViewId
+   * @param sessionFile
+   * @param vid
    */
-  public ChimeraXViewFrame(String chimeraSessionFile,
-          AlignmentPanel alignPanel, PDBEntry[] pdbArray,
-          SequenceI[][] seqsArray, boolean colourByChimera,
-          boolean colourBySequence, String newViewId)
+  public ChimeraXViewFrame(StructureViewerModel viewerData,
+          AlignmentPanel alignPanel, String sessionFile, String vid)
   {
-    super(chimeraSessionFile, alignPanel, pdbArray, seqsArray,
-            colourByChimera, colourBySequence, newViewId);
+    super(viewerData, alignPanel, sessionFile, vid);
   }
 
   @Override
@@ -66,13 +81,4 @@ public class ChimeraXViewFrame extends ChimeraViewFrame
     return new JalviewChimeraXBindingModel(this,
             ap.getStructureSelectionManager(), pdbentrys, seqs, null);
   }
-
-  @Override
-  protected void initMenus()
-  {
-    super.initMenus();
-
-    viewerActionMenu.setText("ChimeraX");
-  }
-
 }