Changeset 1583 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2009-05-07T20:00:43+02:00 (15 years ago)

Author:

stoecker

Message:

close #2535 - patch by podolsir - NPE for missing icon, update translations, added et, nb, gl

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java

@@ -2 +2 @@
 
 import java.awt.Color;
+
+import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -170 +172 @@
             else if (qName.equals("icon"))
             {
-                hadIcon = inIcon = true;
+                inIcon = true;
                 for (int count=0; count<atts.getLength(); count++)
                 {
-                    if (atts.getQName(count).equals("src"))
-                        rule.icon.icon = MapPaintStyles.getIcon(atts.getValue(count), styleName);
-                    else if (atts.getQName(count).equals("annotate"))
+                    if (atts.getQName(count).equals("src")) {
+                        ImageIcon icon = MapPaintStyles.getIcon(atts.getValue(count), styleName);
+                        hadIcon = (icon != null);
+                        rule.icon.icon = icon;
+                    } else if (atts.getQName(count).equals("annotate"))
                         rule.icon.annotate = Boolean.parseBoolean (atts.getValue(count));
                     else if(atts.getQName(count).equals("priority"))