X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2Ffeatures%2FFeatureMatcher.java;h=124909c2e94b50d457dadc7aed9ba3da8aadffa7;hb=a0bd24f90375fc1d4be619bf65746a912dfcfc89;hp=69f80f2fb091b9eeee05de48102288735aaf4356;hpb=9d2408483e451285fd555c3cd6e0273977acbaa7;p=jalview.git diff --git a/src/jalview/datamodel/features/FeatureMatcher.java b/src/jalview/datamodel/features/FeatureMatcher.java index 69f80f2..124909c 100644 --- a/src/jalview/datamodel/features/FeatureMatcher.java +++ b/src/jalview/datamodel/features/FeatureMatcher.java @@ -147,7 +147,7 @@ public class FeatureMatcher implements FeatureMatcherI int nextQuotePos = descriptor.indexOf(QUOTE, 1); if (nextQuotePos == -1) { - System.err.println(invalidFormat); + jalview.bin.Console.errPrintln(invalidFormat); return null; } firstField = descriptor.substring(1, nextQuotePos); @@ -159,7 +159,7 @@ public class FeatureMatcher implements FeatureMatcherI int nextSpacePos = descriptor.indexOf(SPACE); if (nextSpacePos == -1) { - System.err.println(invalidFormat); + jalview.bin.Console.errPrintln(invalidFormat); return null; } firstField = descriptor.substring(0, nextSpacePos); @@ -193,7 +193,7 @@ public class FeatureMatcher implements FeatureMatcherI cond = Condition.fromString(leftToParse); if (cond == null || cond.needsAPattern()) { - System.err.println(invalidFormat); + jalview.bin.Console.errPrintln(invalidFormat); return null; } } @@ -214,7 +214,7 @@ public class FeatureMatcher implements FeatureMatcherI else { // unbalanced quote - System.err.println(invalidFormat); + jalview.bin.Console.errPrintln(invalidFormat); return null; } } @@ -310,6 +310,7 @@ public class FeatureMatcher implements FeatureMatcherI byLabel = forLabel; byScore = forScore; } + @Override public boolean matches(SequenceFeature feature) { @@ -332,8 +333,8 @@ public class FeatureMatcher implements FeatureMatcherI } /** - * Answers a string description of this matcher, suitable for display, debugging - * or logging. The format may change in future. + * Answers a string description of this matcher, suitable for display, + * debugging or logging. The format may change in future. */ @Override public String toString() @@ -415,7 +416,7 @@ public class FeatureMatcher implements FeatureMatcherI sb.append(displayName); } } - + Condition condition = matcher.getCondition(); sb.append(SPACE).append(condition.getStableName()); String pattern = matcher.getPattern(); @@ -433,7 +434,7 @@ public class FeatureMatcher implements FeatureMatcherI sb.append(SPACE).append(pattern); } } - + return sb.toString(); } }