Changeset 15416 in josm for trunk/src/org/openstreetmap/josm/io/CachedFile.java

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (4 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);