Changeset 28017 in osm for applications/editors/josm/plugins/opendata/src/org/openstreetmap

Timestamp:

2012-03-09T00:50:20+01:00 (13 years ago)

Author:

donvip

Message:

Update to JOSM 5056

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• layers/OdDataLayer.java (modified) (1 diff)
• modules/ModuleInformation.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

@@ -65 +65 @@
         
     @Override public Icon getBaseIcon() {
-        return new ImageProvider(handler != null ? handler.getDataLayerIconName() : ICON_CORE_16).get(ModuleHandler.getResourceClassLoaders());
+        return new ImageProvider(handler != null ? handler.getDataLayerIconName() : ICON_CORE_16).setAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders()).get();
     }
 

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java

@@ -157 +157 @@
     }
     
-    private static final ImageIcon extractIcon(String iconPath, File jarFile, boolean warn) {
-        return new ImageProvider(iconPath).setArchive(jarFile).setMaxWidth(24).setMaxHeight(24).setOptional(true).get(warn);
+    private static final ImageIcon extractIcon(String iconPath, File jarFile, boolean suppressWarnings) {
+        return new ImageProvider(iconPath).setArchive(jarFile).setMaxWidth(24).setMaxHeight(24).setOptional(true).setSuppressWarnings(suppressWarnings).get();
     }
 
@@ -193 +193 @@
         if (iconPath != null && file != null) {
             // extract icon from the module jar file
-            icon = extractIcon(iconPath, file, false);
+            icon = extractIcon(iconPath, file, true);
             // if not found, extract icon from the plugin jar file
             if (icon == null) {