Changeset 4072 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation

Timestamp:

2011-05-04T07:09:56+02:00 (15 years ago)

Author:

jttt

Message:

Fix #6301 Check for null mandatory in TableCellRenderer.getTableCellRendererComponent

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java

@@ -8 +8 @@
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JTable;
@@ -165 +164 @@
         RelationMember member = (RelationMember)value;
         reset();
+        if (value == null)
+            return this;
+
         renderBackground(getModel(table), member, row, column, isSelected);
         renderForeground(getModel(table), member, row, column, isSelected);