JAL-3490 revised layout and search algorithm (more tests to be added)

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

diff --git a/src/jalview/api/FinderI.java b/src/jalview/api/FinderI.java
index a1a3efd..d74d879 100644 (file)
--- a/src/jalview/api/FinderI.java
+++ b/src/jalview/api/FinderI.java
@@ -1,7 +1,6 @@
 package jalview.api;
 
 import jalview.datamodel.SearchResultsI;
-import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 
 import java.util.List;
@@ -15,36 +14,48 @@ public interface FinderI
   /**
    * Performs a find for the given search string (interpreted as a regular
    * expression). Search may optionally be case-sensitive, and may optionally
-   * including match in sequence description (sequence id is always searched).
-   * If <code>selection</code> is not null, then the find is restricted to the
-   * selection region. Sequences matched by id or description can be retrieved
-   * by getIdMatches(), and matched residue patterns by getSearchResults().
+   * including match in sequence description (sequence id is always searched). If
+   * the viewport has an active selection, then the find is restricted to the
+   * selection region. Sequences matched by id or description can be retrieved by
+   * getIdMatches(), and matched residue patterns by getSearchResults().
+   * <p>
+   * If {@code ignoreHidden} is true, then any residues in hidden columns are
+   * ignored (skipped) when matching, so for example pattern {@code KRT} would
+   * match sequence {@code KRqmT} (where {@code qm} are in hidden columns).
+   * <p>
+   * Matches of entirely hidden patterns are not returned. Matches that span
+   * hidden regions on one or both sides may be returned.
    * 
    * @param theSearchString
    * @param caseSensitive
    * @param searchDescription
+   * @param ignoreHidden
    * @return
    */
-  void findAll(String theSearchString, SequenceGroup selection,
-          boolean caseSensitive, boolean searchDescription);
+  void findAll(String theSearchString, boolean caseSensitive,
+          boolean searchDescription, boolean ignoreHidden);
 
   /**
    * Finds the next match for the given search string (interpreted as a regular
    * expression), starting from the position after the last match found. Search
    * may optionally be case-sensitive, and may optionally including match in
-   * sequence description (sequence id is always searched). If
-   * <code>selection</code> is not null, then the find is restricted to the
-   * selection region. Sequences matched by id or description can be retrieved
-   * by getIdMatches(), and matched residue patterns by getSearchResults().
+   * sequence description (sequence id is always searched). If the viewport has an
+   * active selection, then the find is restricted to the selection region.
+   * Sequences matched by id or description can be retrieved by getIdMatches(),
+   * and matched residue patterns by getSearchResults().
+   * <p>
+   * If {@code ignoreHidden} is true, any hidden residues are skipped (matches may
+   * span them). If false, they are included for matching purposes. In either
+   * cases, entirely hidden matches are not returned.
    * 
    * @param theSearchString
-   * @param selection
    * @param caseSensitive
    * @param searchDescription
+   * @param ignoreHidden
    * @return
    */
-  void findNext(String theSearchString, SequenceGroup selection,
-          boolean caseSensitive, boolean searchDescription);
+  void findNext(String theSearchString, boolean caseSensitive,
+          boolean searchDescription, boolean ignoreHidden);
 
   /**
    * Returns the (possibly empty) list of sequences matched on sequence name or