Merge branch 'develop' into releases/Release_2_11_2_Branch

[jalview.git] / src / jalview / util / matcher / Matcher.java

diff --git a/src/jalview/util/matcher/Matcher.java b/src/jalview/util/matcher/Matcher.java
index bdf3aa7..cbd5458 100644 (file)
--- a/src/jalview/util/matcher/Matcher.java
+++ b/src/jalview/util/matcher/Matcher.java
@@ -1,5 +1,27 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.util.matcher;
 
+import java.util.Locale;
+
 import java.util.Objects;
 
 /**
@@ -82,7 +104,8 @@ public class Matcher implements MatcherI
       patternType = PatternType.String;
     }
 
-    uppercasePattern = pattern == null ? null : pattern.toUpperCase();
+    uppercasePattern = pattern == null ? null
+            : pattern.toUpperCase(Locale.ROOT);
 
     // if we add regex conditions (e.g. matchesPattern), then
     // pattern should hold the raw regex, and
@@ -152,8 +175,9 @@ public class Matcher implements MatcherI
   boolean matchesString(String compareTo)
   {
     boolean matched = false;
-    String upper = compareTo.toUpperCase().trim();
-    switch(condition) {
+    String upper = compareTo.toUpperCase(Locale.ROOT).trim();
+    switch (condition)
+    {
     case Matches:
       matched = upper.equals(uppercasePattern);
       break;
@@ -198,9 +222,10 @@ public class Matcher implements MatcherI
     {
       return false;
     }
-    
+
     boolean matched = false;
-    switch (condition) {
+    switch (condition)
+    {
     case LT:
       matched = f < compareTo;
       break;
@@ -315,9 +340,10 @@ public class Matcher implements MatcherI
        */
       return matchesFloat(compareTo, longValue);
     }
-    
+
     boolean matched = false;
-    switch (condition) {
+    switch (condition)
+    {
     case LT:
       matched = val < longValue;
       break;
@@ -339,7 +365,7 @@ public class Matcher implements MatcherI
     default:
       break;
     }
-  
+
     return matched;
   }