Changeset 19106 in josm for trunk/src/org/openstreetmap/josm/gui/animation

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/src/org/openstreetmap/josm/gui/animation/DropImage.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/animation/DropImage.java

@@ -9 +9 @@
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -71 +72 @@
             String path = "images/presets/";
             URL url = DropImage.class.getClassLoader().getResource(path);
-            if (url != null && url.getProtocol().equals("file")) {
+            if (url != null && "file".equals(url.getProtocol())) {
                 ArrayList<File> dirs = new ArrayList<>();
                 dirs.add(new File(url.toURI()));
@@ -87 +88 @@
                 } while (!dirs.isEmpty());
                 name = result.get(seed.nextInt(result.size()));
-            } else if (url != null && url.getProtocol().equals("jar")) {
-                String jarPath = url.getPath().substring(5, url.getPath().indexOf("!"));
-                try (JarFile jar = new JarFile(URLDecoder.decode(jarPath, "UTF-8"))) {
+            } else if (url != null && "jar".equals(url.getProtocol())) {
+                String jarPath = url.getPath().substring(5, url.getPath().indexOf('!'));
+                try (JarFile jar = new JarFile(URLDecoder.decode(jarPath, StandardCharsets.UTF_8))) {
                     Enumeration<JarEntry> entries = jar.entries();
                     while (entries.hasMoreElements()) {