JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / api / AlignViewControllerI.java

diff --git a/src/jalview/api/AlignViewControllerI.java b/src/jalview/api/AlignViewControllerI.java
index 235a656..26966ba 100644 (file)
--- a/src/jalview/api/AlignViewControllerI.java
+++ b/src/jalview/api/AlignViewControllerI.java
@@ -20,6 +20,8 @@
  */
 package jalview.api;
 
+import java.util.List;
+
 /**
  * prototype abstract controller for a Jalview alignment view
  * 
@@ -62,18 +64,37 @@ public interface AlignViewControllerI
    * @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
+   * 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(String[] typ);
+  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
+   * 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);
+
+  /**
+   * add a features file of some kind to the current view
+   * 
+   * @param file
+   * @param protocol
+   * @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 sortAlignmentByFeatureDensity(String[] typ);
+  public boolean parseFeaturesFile(String file, String protocol,
+          boolean relaxedIdMatching);
 
 }