Changeset 15416 in josm

Timestamp:

2019-10-05T00:50:17+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18190 - Handle "resource:" identical for CachedFile and images

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/CachedFile.java (modified) (4 diffs)
• plugins/PluginHandler.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (6 diffs)
• tools/ResourceProvider.java (added)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -24 +24 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -35 +36 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.PlatformManager;
+import org.openstreetmap.josm.tools.ResourceProvider;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -41 +43 @@
  *
  * Supports URLs, local files, and a custom scheme (<code>resource:</code>) to get
- * resources from the current *.jar file. (Local caching is only done for URLs.)
+ * resources from the current JOSM *.jar file as well as plugins *.jar files.
+ * (Local caching is only done for URLs.)
  * <p>
  * The mirrored file is only downloaded if it has been more than 7 days since
@@ -225 +228 @@
         if (file == null) {
             if (name != null && name.startsWith("resource://")) {
-                String resourceName = name.substring("resource:/".length());
-                InputStream is = Utils.getResourceAsStream(getClass(), resourceName);
-                if (is == null) {
-                    throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
-                }
-                return is;
+                return Optional.ofNullable(ResourceProvider.getResourceAsStream(name.substring("resource:/".length())))
+                        .orElseThrow(() -> new IOException(tr("Failed to open input stream for resource ''{0}''", name)));
             } else {
                 throw new IOException("No file found for: "+name);

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

@@ -73 +73 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.ResourceProvider;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -886 +887 @@
 
             extendJoinedPluginResourceCL(toLoad);
-            ImageProvider.addAdditionalClassLoaders(getResourceClassLoaders());
+            ResourceProvider.addAdditionalClassLoaders(getResourceClassLoaders());
             monitor.setTicksCount(toLoad.size());
             for (PluginInformation info : toLoad) {

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

@@ -35 +35 @@
 import java.util.Base64;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -45 +43 @@
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.CompletableFuture;
@@ -263 +260 @@
     public static final String PROP_TRANSPARENCY_COLOR = "josm.transparency.color";
 
-    /** set of class loaders to take images from */
-    private static final Set<ClassLoader> classLoaders = Collections.synchronizedSet(new HashSet<>());
-    static {
-        try {
-            classLoaders.add(ClassLoader.getSystemClassLoader());
-        } catch (SecurityException e) {
-            Logging.log(Logging.LEVEL_ERROR, "Unable to get system classloader", e);
-        }
-        try {
-            classLoaders.add(ImageProvider.class.getClassLoader());
-        } catch (SecurityException e) {
-            Logging.log(Logging.LEVEL_ERROR, "Unable to get application classloader", e);
-        }
-    }
-
     /** directories in which images are searched */
     protected Collection<String> dirs;
@@ -617 +599 @@
      * @return {@code true} if the set changed as a result of the call
      * @since 12870
-     */
+     * @deprecated Use ResourceProvider#addAdditionalClassLoader
+     */
+    @Deprecated
     public static boolean addAdditionalClassLoader(ClassLoader additionalClassLoader) {
-        return classLoaders.add(additionalClassLoader);
+        return ResourceProvider.addAdditionalClassLoader(additionalClassLoader);
     }
 
@@ -627 +611 @@
      * @return {@code true} if the set changed as a result of the call
      * @since 12870
-     */
+     * @deprecated Use ResourceProvider#addAdditionalClassLoaders
+     */
+    @Deprecated
     public static boolean addAdditionalClassLoaders(Collection<ClassLoader> additionalClassLoaders) {
-        return classLoaders.addAll(additionalClassLoaders);
+        return ResourceProvider.addAdditionalClassLoaders(additionalClassLoaders);
     }
 
@@ -1212 +1198 @@
     private static URL getImageUrl(String path, String name) {
         if (path != null && path.startsWith("resource://")) {
-            String p = path.substring("resource://".length());
-            synchronized (classLoaders) {
-                for (ClassLoader source : classLoaders) {
-                    URL res;
-                    if ((res = source.getResource(p + name)) != null)
-                        return res;
-                }
-            }
+            return ResourceProvider.getResource(path.substring("resource://".length()) + name);
         } else {
             File f = new File(path, name);

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

@@ -1883 +1883 @@
     /**
      * Finds a resource with a given name, with robustness to known JDK bugs.
-     * @param klass class on which {@link Class#getResourceAsStream} will be called
+     * @param klass class on which {@link ClassLoader#getResourceAsStream} will be called
      * @param path name of the desired resource
      * @return  A {@link java.io.InputStream} object or {@code null} if no resource with this name is found
@@ -1889 +1889 @@
      */
     public static InputStream getResourceAsStream(Class<?> klass, String path) {
+        return getResourceAsStream(klass.getClassLoader(), path);
+    }
+
+    /**
+     * Finds a resource with a given name, with robustness to known JDK bugs.
+     * @param cl classloader on which {@link ClassLoader#getResourceAsStream} will be called
+     * @param path name of the desired resource
+     * @return  A {@link java.io.InputStream} object or {@code null} if no resource with this name is found
+     * @since 15416
+     */
+    public static InputStream getResourceAsStream(ClassLoader cl, String path) {
         try {
-            return klass.getResourceAsStream(path);
+            if (path != null && path.startsWith("/")) {
+                path = path.substring(1); // See Class#resolveName
+            }
+            return cl.getResourceAsStream(path);
         } catch (InvalidPathException e) {
             Logging.error("Cannot open {0}: {1}", path, e.getMessage());
             Logging.trace(e);
             try {
-                URL betterUrl = betterJarUrl(klass.getResource(path));
+                URL betterUrl = betterJarUrl(cl.getResource(path));
                 if (betterUrl != null) {
                     return betterUrl.openStream();