Merge branch 'features/JAL-1605_html-svg-export' into develop

[jalview.git] / src / jalview / datamodel / AnnotatedCollectionI.java

diff --git a/src/jalview/datamodel/AnnotatedCollectionI.java b/src/jalview/datamodel/AnnotatedCollectionI.java
index 6bd4ab9..6814b7e 100644 (file)
--- a/src/jalview/datamodel/AnnotatedCollectionI.java
+++ b/src/jalview/datamodel/AnnotatedCollectionI.java
@@ -33,6 +33,9 @@ public interface AnnotatedCollectionI extends SequenceCollectionI
 
   Iterable<AlignmentAnnotation> findAnnotation(String calcId);
 
+  Iterable<AlignmentAnnotation> findAnnotations(SequenceI seq,
+          String calcId, String label);
+
   /**
    * context for this annotated collection
    * 
@@ -40,21 +43,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);
 }