Changeset 19587 in osm for applications/editors/josm

Timestamp:

2010-01-22T17:56:27+01:00 (15 years ago)

Author:

guggis

Message:

'Fixed NPE when icon is missing'

Location:

applications/editors/josm/plugins/tageditor

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java (modified) (2 diffs)

applications/editors/josm/plugins/tageditor/build.xml

@@ -28 +28 @@
 
 
-        <property name="commit.message" value="Uses new constructor for Plugin" />
+        <property name="commit.message" value="Fixed NPE when icon is missing" />
         <property name="plugin.main.version" value="2830" />
 

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Item.java

@@ -69 +69 @@
 
         public Icon getIcon() {
+                // FIXME: should also load icons from the image paths configured in the 
+                // preferences for presets
+                //
                 if (icon == null) {
                         // load the icon from the JOSM resources, use Main classloader
@@ -75 +78 @@
                         if (url == null) {
                                 logger.warning("failed to create URL for resource 'images/" + getIconName() + "'");
-                                icon = null;
+                                return null;
                         } else {
                                 icon =new ImageIcon(url);
-                        }
+                        }               
                         Image i = icon.getImage().getScaledInstance(16, 16, Image.SCALE_DEFAULT);
                         icon = new ImageIcon(i);