Changeset 19106 in josm for trunk/scripts

Timestamp:

2024-06-13T21:18:45+02:00 (9 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x (followup of r19101)

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (6 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -108 +108 @@
     private static String optionEncoding;
     private static boolean optionNoEli;
-    private Map<String, String> skip = new HashMap<>();
-    private Map<String, String> skipStart = new HashMap<>();
+    private final Map<String, String> skip = new HashMap<>();
+    private final Map<String, String> skipStart = new HashMap<>();
 
     /**
@@ -238 +238 @@
 
     void loadSkip() throws IOException {
-        final Pattern pattern = Pattern.compile("^\\|\\| *(ELI|Ignore) *\\|\\| *\\{\\{\\{(.+)\\}\\}\\} *\\|\\|");
+        final Pattern pattern = Pattern.compile("^\\|\\| *(ELI|Ignore) *\\|\\| *\\{\\{\\{(.+)}}} *\\|\\|");
         try (BufferedReader fr = Files.newBufferedReader(Paths.get(ignoreInputFile), UTF_8)) {
             String line;
@@ -479 +479 @@
                     shapes += sep + "</shape>\n";
                 }
-            } catch (IllegalArgumentException ignored) {
-                Logging.trace(ignored);
+            } catch (IllegalArgumentException illegalArgumentException) {
+                Logging.trace(illegalArgumentException);
             }
             if (!shapes.isEmpty()) {
@@ -776 +776 @@
             if (m.matches()) {
                 Calendar cal = Calendar.getInstance();
-                cal.set(Integer.valueOf(m.group(2)),
-                        m.group(4) == null ? 0 : Integer.valueOf(m.group(4))-1,
-                        m.group(6) == null ? 1 : Integer.valueOf(m.group(6)));
+                cal.set(Integer.parseInt(m.group(2)),
+                        m.group(4) == null ? 0 : Integer.parseInt(m.group(4))-1,
+                        m.group(6) == null ? 1 : Integer.parseInt(m.group(6)));
                 cal.add(Calendar.DAY_OF_MONTH, -1);
                 ed2 = m.group(1) + cal.get(Calendar.YEAR);
@@ -1230 +1230 @@
                 } else {
                     try {
-                        URL jurl = new URL(u.replaceAll("\\{switch:[^\\}]*\\}", "x"));
+                        URL jurl = new URL(u.replaceAll("\\{switch:[^}]*}", "x"));
                         String domain = jurl.getHost();
                         int port = jurl.getPort();
@@ -1375 +1375 @@
         List<String> r = new ArrayList<>();
         List<String> u = getProjectionsUnstripped(e);
-        if (u != null) {
-            for (String p : u) {
-                if (!oldproj.containsKey(p) && !("CRS:84".equals(p) && !(getUrlStripped(e).matches("(?i)version=1\\.3")))) {
-                    r.add(p);
-                }
+        for (String p : u) {
+            if (!oldproj.containsKey(p) && !("CRS:84".equals(p) && !(getUrlStripped(e).matches("(?i)version=1\\.3")))) {
+                r.add(p);
             }
         }