X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructure%2FStructureCommandsI.java;h=fc8b8283c4ff42f2b78dd0c38919e8334a65e5c3;hb=a3f65dbb5ba8bd470a31ba2af72db6d8ddf60546;hp=734f275c774eaefc39fc6612c00bba08a9ca722d;hpb=0b6e9403e96ee9f0d41211b2f90130ff850c4e98;p=jalview.git

diff --git a/src/jalview/structure/StructureCommandsI.java b/src/jalview/structure/StructureCommandsI.java
index 734f275..fc8b828 100644
--- a/src/jalview/structure/StructureCommandsI.java
+++ b/src/jalview/structure/StructureCommandsI.java
@@ -1,6 +1,27 @@
+/*
+ * 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.structure;
 
 import java.awt.Color;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -86,12 +107,12 @@ public interface StructureCommandsI
    * 
    * @param refAtoms
    * @param atomSpec
-   * @param isNucleotide TODO
-   * @param nucleotide - when true, superposition is based on phoshpate backbone, not peptide
+   * @param backbone
+   *          - superpose based on which kind of atomType
    * @return
    */
   List<StructureCommandI> superposeStructures(AtomSpecModel refAtoms,
-          AtomSpecModel atomSpec, boolean isNucleotide);
+          AtomSpecModel atomSpec, AtomSpecType backbone);
 
   /**
    * Returns a command to open a file of commands at the given path
@@ -110,16 +131,21 @@ public interface StructureCommandsI
    */
   StructureCommandI saveSession(String filepath);
 
+  enum AtomSpecType
+  {
+    RESIDUE_ONLY, ALPHA, PHOSPHATE
+  };
+
   /**
    * Returns a representation of the atom set represented by the model, in
    * viewer syntax format. If {@code alphaOnly} is true, this is restricted to
    * Alpha Carbon (peptide) or Phosphorous (rna) only
    * 
    * @param model
-   * @param alphaOnly
+   * @param specType
    * @return
    */
-  String getAtomSpec(AtomSpecModel model, boolean alphaOnly);
+  String getAtomSpec(AtomSpecModel model, AtomSpecType specType);
 
   /**
    * Returns the lowest model number used by the structure viewer (likely 0 or
@@ -170,6 +196,15 @@ public interface StructureCommandsI
   StructureCommandI openSession(String filepath);
 
   /**
+   * Returns command to restore a previously saved version of an existing
+   * structure viewer session file. Default implementation calls 'openSession'
+   * 
+   * @param filePath
+   * @return
+   */
+  StructureCommandI restoreSession(String filePath);
+
+  /**
    * Returns a command to ask the viewer to close down
    * 
    * @return
@@ -218,4 +253,11 @@ public interface StructureCommandsI
    * @return
    */
   StructureCommandI getResidueAttributes(String attName);
+
+  List<StructureCommandI> centerViewOn(List<AtomSpecModel> residues);
+
+  default List<StructureCommandI> showHetatms(List<String> toShow)
+  {
+    return Collections.EMPTY_LIST;
+  }
 }