Changeset 4721 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2011-12-27T16:11:03+01:00 (13 years ago)

Author:

bastiK

Message:

use builder pattern for ImageProvider (see #7192)

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

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

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

@@ -191 +191 @@
         if (iconPath != null && file != null) {
             // extract icon from the plugin jar file
-            icon = ImageProvider.getIfAvailable(null, null, null, iconPath, file);
+            icon = new ImageProvider(iconPath).setArchive(file).setMaxWidth(24).setMaxHeight(24).setOptional(true).get();
         }
         if(oldcheck && mainversion > Version.getInstance().getVersion())

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

@@ -121 +121 @@
             for (PluginInformation pi : availablePlugins.values()) {
                 if (pi.icon == null && pi.iconPath != null) {
-                    pi.icon = ImageProvider.getIfAvailable(null, null, null, pi.name+".jar/"+pi.iconPath, f);
+                    pi.icon = new ImageProvider(pi.name+".jar/"+pi.iconPath)
+                                    .setArchive(f)
+                                    .setMaxWidth(24)
+                                    .setMaxHeight(24)
+                                    .setOptional(true).get();
                 }
             }

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

@@ -244 +244 @@
         for (PluginInformation pi : availablePlugins) {
             if (pi.icon == null && pi.iconPath != null) {
-                pi.icon = ImageProvider.getIfAvailable(null, null, null, pi.name+".jar/"+pi.iconPath, destFile);
+                pi.icon = new ImageProvider(pi.name+".jar/"+pi.iconPath)
+                                .setArchive(destFile)
+                                .setMaxWidth(24)
+                                .setMaxHeight(24)
+                                .setOptional(true).get();
             }
         }