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
Merge branch 'develop' into patch/JAL-4110_stdout_for_tests
[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
a5efe5d
..
eae3664
100644
(file)
--- a/
src/jalview/datamodel/features/FeatureMatcherSet.java
+++ b/
src/jalview/datamodel/features/FeatureMatcherSet.java
@@
-93,7
+93,7
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
if (spacePos == -1)
{
// trailing junk after a match condition
if (spacePos == -1)
{
// trailing junk after a match condition
- System.err.println(invalid);
+ jalview.bin.Console.errPrintln(invalid);
return null;
}
String conjunction = leftToParse.substring(0, spacePos);
return null;
}
String conjunction = leftToParse.substring(0, spacePos);
@@
-109,7
+109,7
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
else
{
// not an AND or an OR - invalid
else
{
// not an AND or an OR - invalid
- System.err.println(invalid);
+ jalview.bin.Console.errPrintln(invalid);
return null;
}
}
return null;
}
}
@@
-123,7
+123,7
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
int closePos = leftToParse.indexOf(CLOSE_BRACKET);
if (closePos == -1)
{
int closePos = leftToParse.indexOf(CLOSE_BRACKET);
if (closePos == -1)
{
- System.err.println(invalid);
+ jalview.bin.Console.errPrintln(invalid);
return null;
}
nextCondition = leftToParse.substring(1, closePos);
return null;
}
nextCondition = leftToParse.substring(1, closePos);
@@
-137,7
+137,7
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
FeatureMatcher fm = FeatureMatcher.fromString(nextCondition);
if (fm == null)
{
FeatureMatcher fm = FeatureMatcher.fromString(nextCondition);
if (fm == null)
{
- System.err.println(invalid);
+ jalview.bin.Console.errPrintln(invalid);
return null;
}
try
return null;
}
try
@@
-154,7
+154,7
@@
public class FeatureMatcherSet implements FeatureMatcherSetI
} catch (IllegalStateException e)
{
// thrown if OR and AND are mixed
} catch (IllegalStateException e)
{
// thrown if OR and AND are mixed
- System.err.println(invalid);
+ jalview.bin.Console.errPrintln(invalid);
return null;
}
return null;
}