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

Timestamp:

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

Author:

jttt

Message:

Fix #6301 Check for null mandatory in TableCellRenderer.getTableCellRendererComponent

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• nodes/NodeListTableCellRenderer.java (modified) (1 diff)
• relation/RelationMemberTableCellRenderer.java (modified) (2 diffs)
• tags/TagMergeTableCellRenderer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

@@ -164 +164 @@
         Node node = (Node)value;
         reset();
+        if (value == null)
+            return this;
         switch(column) {
         case 0:

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);

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java

@@ -26 +26 @@
 
         reset();
+        if (value == null)
+            return this;
+
         TagMergeItem item = (TagMergeItem)value;
         switch(col) {