Changeset 14234 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-09-09T18:47:15+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16047, see #16682 - make PluginClassLoader extend DynamicURLClassLoader so that plugins can add URLs to it

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• DynamicURLClassLoader.java (added)
• PluginClassLoader.java (modified) (2 diffs)
• PluginHandler.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18 +17 @@
  * @since 12322
  */
-public class PluginClassLoader extends URLClassLoader {
+public class PluginClassLoader extends DynamicURLClassLoader {
 
     private final Collection<PluginClassLoader> dependencies;

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

@@ -18 +18 @@
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -249 +248 @@
 
     /**
-     * ClassLoader that makes the addURL method of URLClassLoader public.
-     *
-     * Like URLClassLoader, but allows to add more URLs after construction.
-     */
-    public static class DynamicURLClassLoader extends URLClassLoader {
-
-        /**
-         * Constructs a new {@code DynamicURLClassLoader}.
-         * @param urls the URLs from which to load classes and resources
-         * @param parent the parent class loader for delegation
-         */
-        public DynamicURLClassLoader(URL[] urls, ClassLoader parent) {
-            super(urls, parent);
-        }
-
-        @Override
-        public void addURL(URL url) {
-            super.addURL(url);
-        }
-    }
-
-    /**
      * List of unmaintained plugins. Not really up-to-date as the vast majority of plugins are not maintained after a few months, sadly...
      */