X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fapi%2FAlignViewControllerI.java;h=58a58e9552ca3286f885bc686539a4b3a24a8f88;hb=e1dbbc5edc07f65706eeb1dda9f4c9bcdee9d3a5;hp=090a8b50ed87597452bd0ef60305faf5a5952b64;hpb=770a6a7d91b1f46a7d0372b987f859b35f286ad8;p=jalview.git

diff --git a/src/jalview/api/AlignViewControllerI.java b/src/jalview/api/AlignViewControllerI.java
index 090a8b5..58a58e9 100644
--- a/src/jalview/api/AlignViewControllerI.java
+++ b/src/jalview/api/AlignViewControllerI.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,6 +20,10 @@
  */
 package jalview.api;
 
+import jalview.io.DataSourceType;
+
+import java.util.List;
+
 /**
  * prototype abstract controller for a Jalview alignment view
  * 
@@ -27,10 +31,13 @@ package jalview.api;
  * 
  *         All operations should return true if the view has changed as a result
  *         of the operation
- * @param <ViewportI>
+ * 
+ *         The controller holds methods that operate on an alignment view,
+ *         modifying its state in some way that may result in side effects
+ *         reflected in an associated GUI
  * 
  */
-public interface AlignViewControllerI<ViewportI>
+public interface AlignViewControllerI
 {
 
   public boolean makeGroupsFromSelection();
@@ -59,18 +66,49 @@ public interface AlignViewControllerI<ViewportI>
    * @return true if operation affected state
    */
   boolean markColumnsContainingFeatures(boolean invert,
-          boolean extendCurrent, boolean clearColumns, String featureType);
+          boolean extendCurrent, boolean toggle, String featureType);
+
+  /**
+   * sort the alignment or current selection by average score over the given set
+   * of features
+   * 
+   * @param typ
+   *          list of feature names or null to use currently displayed features
+   */
+  void sortAlignmentByFeatureScore(List<String> typ);
+
+  /**
+   * sort the alignment or current selection by distribution of the given set of
+   * features
+   * 
+   * @param typ
+   *          list of feature names or null to use currently displayed features
+   */
+  void sortAlignmentByFeatureDensity(List<String> typ);
 
   /**
-   * sort the alignment or current selection by average score over the given set of features
-   * @param typ list of feature names or null to use currently displayed features
+   * add a features file of some kind to the current view
+   * 
+   * @param file
+   * @param sourceType
+   * @param relaxedIdMatching
+   *          if true, try harder to match up IDs with local sequence data
+   * @return true if parsing resulted in something being imported to the view or
+   *         dataset
    */
-  void sortAlignmentByFeatureScore(String[] typ);
+  public boolean parseFeaturesFile(Object file, DataSourceType sourceType,
+          boolean relaxedIdMatching);
 
   /**
-   * sort the alignment or current selection by distribution of the given set of features
-   * @param typ list of feature names or null to use currently displayed features
+   * mark columns containing highlighted regions (e.g. from search, structure
+   * highlight, or a mouse over event in another viewer)
+   * 
+   * @param invert
+   * @param extendCurrent
+   * @param toggle
+   * @return
    */
-  void sortAlignmentByFeatureDensity(String[] typ);
+  boolean markHighlightedColumns(boolean invert, boolean extendCurrent,
+          boolean toggle);
 
 }