git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3178 include non-positional features in their group on export
[jalview.git]
/
src
/
jalview
/
datamodel
/
features
/
FeatureMatcherSet.java
diff --git
a/src/jalview/datamodel/features/FeatureMatcherSet.java
b/src/jalview/datamodel/features/FeatureMatcherSet.java
index
3d28def
..
b51f2f0
100644
(file)
--- a/
src/jalview/datamodel/features/FeatureMatcherSet.java
+++ b/
src/jalview/datamodel/features/FeatureMatcherSet.java
@@
-6,6
+6,12
@@
import jalview.util.MessageManager;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
+/**
+ * A class that models one or more match conditions, which may be combined with
+ * AND or OR (but not a mixture)
+ *
+ * @author gmcarstairs
+ */
public class FeatureMatcherSet implements FeatureMatcherSetI
{
private static final String OR = "OR";
public class FeatureMatcherSet implements FeatureMatcherSetI
{
private static final String OR = "OR";
@@
-182,7
+188,7
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
}
@Override
}
@Override
- public FeatureMatcherSetI and(FeatureMatcherI m)
+ public void and(FeatureMatcherI m)
{
if (!andConditions && matchConditions.size() > 1)
{
{
if (!andConditions && matchConditions.size() > 1)
{
@@
-190,12
+196,10
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
}
matchConditions.add(m);
andConditions = true;
}
matchConditions.add(m);
andConditions = true;
-
- return this;
}
@Override
}
@Override
- public FeatureMatcherSetI or(FeatureMatcherI m)
+ public void or(FeatureMatcherI m)
{
if (andConditions && matchConditions.size() > 1)
{
{
if (andConditions && matchConditions.size() > 1)
{
@@
-203,8
+207,6
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
}
matchConditions.add(m);
andConditions = false;
}
matchConditions.add(m);
andConditions = false;
-
- return this;
}
@Override
}
@Override