JAL-2808 refine FeatureMatcher interface and matcher toString methods

[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 64ae61b..eb55387 100644 (file)
--- a/src/jalview/datamodel/features/FeatureMatcherSet.java
+++ b/src/jalview/datamodel/features/FeatureMatcherSet.java
@@ -1,12 +1,19 @@
 package jalview.datamodel.features;
 
 import jalview.datamodel.SequenceFeature;
+import jalview.util.MessageManager;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class FeatureMatcherSet implements FeatureMatcherSetI
 {
+  private static final String OR_I18N = MessageManager
+          .getString("label.or");
+
+  private static final String AND_18N = MessageManager
+          .getString("label.and");
+
   List<FeatureMatcherI> matchConditions;
 
   boolean andConditions;
@@ -105,7 +112,8 @@ public class FeatureMatcherSet implements FeatureMatcherSetI
     {
       if (!first)
       {
-        sb.append(andConditions ? " AND " : " OR ");
+        String joiner = andConditions ? AND_18N : OR_I18N;
+        sb.append(" ").append(joiner.toLowerCase()).append(" ");
       }
       first = false;
       sb.append("(").append(matcher.toString()).append(")");