Changeset 7654 in josm for trunk/src/org

Timestamp:

2014-10-27T14:58:17+01:00 (10 years ago)

Author:

stoecker

Message:

support data: style URL's for icon in plugin list, see #10581

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• ReadLocalPluginInformationTask.java (modified) (1 diff)
• ReadRemotePluginInformationTask.java (modified) (1 diff)

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

@@ -114 +114 @@
             for (PluginInformation pi : availablePlugins.values()) {
                 if (pi.icon == null && pi.iconPath != null) {
-                    pi.icon = new ImageProvider(pi.name+".jar/"+pi.iconPath)
+                    String path = pi.iconPath;
+                    if(!path.startsWith("data:")) {
+                        path = pi.name+".jar/"+path;
+                    }
+                    pi.icon = new ImageProvider(path)
                                     .setArchive(f)
                                     .setMaxWidth(24)

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

@@ -302 +302 @@
         for (PluginInformation pi : availablePlugins) {
             if (pi.icon == null && pi.iconPath != null) {
-                pi.icon = new ImageProvider(pi.name+".jar/"+pi.iconPath)
+                String path = pi.iconPath;
+                if(!path.startsWith("data:")) {
+                    path = pi.name+".jar/"+path;
+                }
+                pi.icon = new ImageProvider(path)
                                 .setArchive(destFile)
                                 .setMaxWidth(24)