X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2Ffeatures%2FFeatureMatcherSetI.java;h=90c2986a74d9f97c23c824ffda1cb25de67ca9d3;hb=383bcec2f07e63081a697118554154100d599079;hp=8a9d67594dc096a7387969fb7b2dcae29057ae81;hpb=ec44bf310ff6aaa0438f486dadc65f2af385d99d;p=jalview.git diff --git a/src/jalview/datamodel/features/FeatureMatcherSetI.java b/src/jalview/datamodel/features/FeatureMatcherSetI.java index 8a9d675..90c2986 100644 --- a/src/jalview/datamodel/features/FeatureMatcherSetI.java +++ b/src/jalview/datamodel/features/FeatureMatcherSetI.java @@ -20,14 +20,13 @@ public interface FeatureMatcherSetI boolean matches(SequenceFeature feature); /** - * Answers a new object that matches the logical AND of this and m + * Adds (ANDs) match condition m to this object's matcher set * * @param m - * @return * @throws IllegalStateException * if an attempt is made to AND to existing OR-ed conditions */ - FeatureMatcherSetI and(FeatureMatcherI m); + void and(FeatureMatcherI m); /** * Answers true if any second condition is AND-ed with this one, false if it @@ -38,14 +37,13 @@ public interface FeatureMatcherSetI boolean isAnded(); /** - * Answers a new object that matches the logical OR of this and m + * Adds (ORs) the given condition to this object's match conditions * * @param m - * @return * @throws IllegalStateException * if an attempt is made to OR to existing AND-ed conditions */ - FeatureMatcherSetI or(FeatureMatcherI m); + void or(FeatureMatcherI m); /** * Answers an iterator over the combined match conditions @@ -63,8 +61,8 @@ public interface FeatureMatcherSetI /** * Answers a string representation of this object suitable for use when - * persisting data, in a format that should not change so can be reliably read - * back. + * persisting data, in a format that can be reliably read back. Any changes to + * the format should be backwards compatible. */ String toStableString(); }