Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java

@@ -23 +23 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -1139 +1140 @@
                     value = Normalizer.normalize(value, Normalizer.Form.NFC);
 
-                    final var keyMatcher = searchRegex.matcher(key);
-                    final var valMatcher = searchRegex.matcher(value);
+                    final Matcher keyMatcher = searchRegex.matcher(key);
+                    final Matcher valMatcher = searchRegex.matcher(value);
 
                     boolean keyMatchFound = keyMatcher.find();
@@ -1817 +1818 @@
             if (!(osm instanceof Way))
                 return null;
-            final var way = (Way) osm;
+            final Way way = (Way) osm;
             return (long) way.getLength();
         }
@@ -1970 +1971 @@
 
             try {
-                final var groupSuffix = name.substring(0, name.length() - 2); // try to remove '/*'
+                String groupSuffix = name.substring(0, name.length() - 2); // try to remove '/*'
                 TaggingPresetMenu group = preset.group;
 
@@ -2178 +2179 @@
             } else if (tokenizer.readIfEqual(Token.COLON)) {
                 // see if we have a Match that takes a data parameter
-                final var factory = simpleMatchFactoryMap.get(key);
+                SimpleMatchFactory factory = simpleMatchFactoryMap.get(key);
                 if (factory != null)
                     return factory.get(key, caseSensitive, regexSearch, tokenizer);
 
-                final var unaryFactory = unaryMatchFactoryMap.get(key);
+                UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
                 if (unaryFactory != null)
                     return getValidate(unaryFactory, key, tokenizer);
@@ -2195 +2196 @@
                 return new BooleanMatch(key, false);
             else {
-                final var factory = simpleMatchFactoryMap.get(key);
+                SimpleMatchFactory factory = simpleMatchFactoryMap.get(key);
                 if (factory != null)
                     return factory.get(key, caseSensitive, regexSearch, null).validate();
 
-                final var unaryFactory = unaryMatchFactoryMap.get(key);
+                UnaryMatchFactory unaryFactory = unaryMatchFactoryMap.get(key);
                 if (unaryFactory != null)
                     return getValidate(unaryFactory, key, null);
@@ -2221 +2222 @@
 
     private static int regexFlags(boolean caseSensitive) {
-        var searchFlags = 0;
+        int searchFlags = 0;
 
         // Enables canonical Unicode equivalence so that e.g. the two