Changeset 4417 in osm for applications

Timestamp:

2007-09-02T20:26:53+02:00 (17 years ago)

Author:

ulf

Message:

don't throw a NullPointerException, if an icon png wasn't found - put a warning on the console instead

File:

• applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java (modified) (1 diff)

applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java

@@ -114 +114 @@
                                                                                                         try {
                                                                                                                 URL path = getClass().getResource("/standard/icons/"+atts.getValue(count));
-                                                                                                                curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+                                                                                                                if(path == null) {
+                                                                                                                        /* icon not found, using default */
+                                                                                                                        System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
+                                                                                                                        path = getClass().getResource("/standard/icons/misc/no_icon.png");
+                                                                                                                        curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+                                                                                                                } else {
+                                                                                                                        curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+                                                                                                                }
                                                                                                         }
                                                                                                         catch (Exception e){
                                                                                                                 URL path = getClass().getResource("/standard/icons/amenity.png");
                                                                                                                 curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
-
                                                                                                         }
                                                                                                 }