Changeset 3874 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2011-02-09T09:53:35+01:00 (13 years ago)

Author:

bastiK

Message:

use classloader to find projections from plugins

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -24 +24 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipEntry;
@@ -36 +34 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.io.MirroredInputStream;
+import org.openstreetmap.josm.plugins.PluginHandler;
 
 /**
@@ -68 +67 @@
      */
     private static Map<String, ImageWrapper> cache = new HashMap<String, ImageWrapper>();
-
-    /**
-     * Add here all ClassLoader whose resource should be searched. Plugin's class loaders are added
-     * by main.
-     */
-    public static final List<ClassLoader> sources = new LinkedList<ClassLoader>();
 
     /**
@@ -234 +227 @@
         if (path.startsWith("resource://")) {
             String p = path.substring("resource://".length());
-            for (ClassLoader source : sources) {
+            for (ClassLoader source : PluginHandler.getResourceClassLoaders()) {
                 URL res;
                 if ((res = source.getResource(p + name)) != null)
@@ -355 +348 @@
     }
 
-    static {
-        try {
-            sources.add(ClassLoader.getSystemClassLoader());
-            sources.add(org.openstreetmap.josm.gui.MainApplication.class.getClassLoader());
-        } catch (SecurityException ex) {
-            sources.add(ImageProvider.class.getClassLoader());
-        }
-    }
-
     /*
      * from: http://www.jidesoft.com/blog/2008/02/29/rotate-an-icon-in-java/ License: