X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FAnnotatedCollectionI.java;h=3f6c515bd9f79975919a618cdc7c12d2ceef81fe;hb=4bf0e53de60bc7473aeb79de1029d665d40882c1;hp=6bd4ab97fa6087b81fe7da53c15557dde496d9f5;hpb=fe6b3fb39308b5c045849db2be75ba07824be776;p=jalview.git

diff --git a/src/jalview/datamodel/AnnotatedCollectionI.java b/src/jalview/datamodel/AnnotatedCollectionI.java
index 6bd4ab9..3f6c515 100644
--- a/src/jalview/datamodel/AnnotatedCollectionI.java
+++ b/src/jalview/datamodel/AnnotatedCollectionI.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.
  * 
@@ -31,8 +31,18 @@ public interface AnnotatedCollectionI extends SequenceCollectionI
    */
   AlignmentAnnotation[] getAlignmentAnnotation();
 
+  /**
+   * Returns a list of annotations matching the given calc id, or an empty list
+   * if calcId is null
+   * 
+   * @param calcId
+   * @return
+   */
   Iterable<AlignmentAnnotation> findAnnotation(String calcId);
 
+  Iterable<AlignmentAnnotation> findAnnotations(SequenceI seq,
+          String calcId, String label);
+
   /**
    * context for this annotated collection
    * 
@@ -40,21 +50,4 @@ public interface AnnotatedCollectionI extends SequenceCollectionI
    *         alignment, parent group).
    */
   AnnotatedCollectionI getContext();
-
-  /**
-   * Return an iterable set of any annotations in the collection that match the
-   * provided criteria, i.e.
-   * <ul>
-   * <li>reference the same sequence datasequence</li>
-   * <li>have the same calcId (source of annotation)</li>
-   * <li>have the same label (type of annotation)</li>
-   * </ul>
-   * 
-   * @param datasequence
-   * @param calcId
-   * @param label
-   * @return
-   */
-  Iterable<AlignmentAnnotation> findAnnotation(SequenceI datasequence,
-          String calcId, String label);
 }