Changeset 5862 in josm for trunk/src

Timestamp:

2013-04-14T19:39:16+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8380 - NPE in OsmPrimitivRenderer

File:

• trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java

@@ -5 +5 @@
 
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JList;
@@ -12 +13 @@
 import javax.swing.table.TableCellRenderer;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -68 +70 @@
         if (def != null && value != null && def instanceof JLabel) {
             ((JLabel)def).setText(getComponentText(value));
-            ((JLabel)def).setIcon(ImageProvider.get(value.getDisplayType()));
+            ImageIcon icon = ImageProvider.get(value.getDisplayType());
+            if (icon != null) {
+                ((JLabel)def).setIcon(icon);
+            } else {
+                Main.warn("Null icon for "+value.getDisplayType());
+            }
             ((JLabel)def).setToolTipText(getComponentToolTipText(value));
         }