Changeset 4072 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

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/dialogs/properties/PropertiesDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -563 +563 @@
                     boolean isSelected, boolean hasFocus, int row, int column) {
                 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
+                if (value == null)
+                    return this;
                 if (c instanceof JLabel) {
                     String str = null;
@@ -610 +612 @@
                     boolean isSelected, boolean hasFocus, int row, int column) {
                 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
+                if (value == null)
+                    return this;
                 if (c instanceof JLabel) {
                     JLabel label = (JLabel)c;
@@ -625 +629 @@
             @Override public Component getTableCellRendererComponent(JTable table, Object value,
                     boolean isSelected, boolean hasFocus, int row, int column) {
+                if (value == null)
+                    return this;
                 Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
                 boolean isDisabledAndHidden = (((Relation)table.getValueAt(row, 0))).isDisabledAndHidden();