Changeset 19106 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginClassLoader.java

Timestamp:

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

Author:

taylor.smock

Message:

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

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginClassLoader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginClassLoader.java

@@ -59 +59 @@
         Class<?> result = findLoadedClass(name);
         if (result == null) {
-            for (PluginClassLoader dep : dependencies) {
-                try {
-                    result = dep.loadClass(name, resolve);
-                    if (result != null) {
-                        return result;
-                    }
-                } catch (ClassNotFoundException e) {
-                    Logging.trace("Plugin class not found in dep {0}: {1}", dep, e.getMessage());
-                    Logging.trace(e);
-                }
-            }
+            result = findClassInDependencies(name, resolve);
             try {
                 // Will delegate to parent.loadClass(name, resolve) if needed
@@ -93 +83 @@
     }
 
+    /**
+     * Try to find the specified class in this classes dependencies
+     * @param name The name of the class to find
+     * @param resolve {@code true} to resolve the class
+     * @return the class, if found, otherwise {@code null}
+     */
+    @SuppressWarnings("PMD.CloseResource") // NOSONAR We do *not* want to close class loaders in this method...
+    private Class<?> findClassInDependencies(String name, boolean resolve) {
+        for (PluginClassLoader dep : dependencies) {
+            try {
+                Class<?> result = dep.loadClass(name, resolve);
+                if (result != null) {
+                    return result;
+                }
+            } catch (ClassNotFoundException e) {
+                Logging.trace("Plugin class not found in dep {0}: {1}", dep, e.getMessage());
+                Logging.trace(e);
+            }
+        }
+        return null;
+    }
+
     @Override
+    @SuppressWarnings("PMD.CloseResource") // NOSONAR We do *not* want to close class loaders in this method...
     public URL findResource(String name) {
         URL resource = super.findResource(name);