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

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

Files:

• pair/nodes/NodeListTableCellRenderer.java (modified) (1 diff)
• pair/relation/RelationMemberTableCellRenderer.java (modified) (2 diffs)
• pair/tags/TagMergeTableCellRenderer.java (modified) (1 diff)
• tags/MultiValueCellRenderer.java (modified) (3 diffs)
• tags/PasteTagsConflictResolverDialog.java (modified) (1 diff)
• tags/RelationMemberConflictDecisionRenderer.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) {

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java

@@ -44 +44 @@
         } else{
             switch(decision.getDecisionType()) {
-                case UNDECIDED:
-                    setForeground(UIManager.getColor("Table.foreground"));
-                    setBackground(BGCOLOR_UNDECIDED);
-                    break;
-                case KEEP_NONE:
-                    setForeground(UIManager.getColor("Panel.foreground"));
-                    setBackground(UIManager.getColor("Panel.background"));
-                    break;
-                default:
-                    setForeground(UIManager.getColor("Table.foreground"));
-                    setBackground(UIManager.getColor("Table.background"));
-                    break;
+            case UNDECIDED:
+                setForeground(UIManager.getColor("Table.foreground"));
+                setBackground(BGCOLOR_UNDECIDED);
+                break;
+            case KEEP_NONE:
+                setForeground(UIManager.getColor("Panel.foreground"));
+                setBackground(UIManager.getColor("Panel.background"));
+                break;
+            default:
+                setForeground(UIManager.getColor("Table.foreground"));
+                setBackground(UIManager.getColor("Table.background"));
+                break;
             }
         }
@@ -63 +63 @@
         model.removeAllElements();
         switch(decision.getDecisionType()) {
-            case UNDECIDED:
-                model.addElement(tr("Choose a value"));
-                setFont(getFont().deriveFont(Font.ITALIC));
-                setToolTipText(tr("Please decide which values to keep"));
-                cbDecisionRenderer.setSelectedIndex(0);
-                break;
-            case KEEP_ONE:
-                model.addElement(decision.getChosenValue());
-                setToolTipText(tr("Value ''{0}'' is going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey()));
-                cbDecisionRenderer.setSelectedIndex(0);
-                break;
-            case KEEP_NONE:
-                model.addElement(tr("deleted"));
-                setFont(getFont().deriveFont(Font.ITALIC));
-                setToolTipText(tr("The key ''{0}'' and all its values are going to be removed", decision.getKey()));
-                cbDecisionRenderer.setSelectedIndex(0);
-                break;
-            case KEEP_ALL:
-                model.addElement(decision.getChosenValue());
-                setToolTipText(tr("All values joined as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey()));
-                cbDecisionRenderer.setSelectedIndex(0);
-                break;
+        case UNDECIDED:
+            model.addElement(tr("Choose a value"));
+            setFont(getFont().deriveFont(Font.ITALIC));
+            setToolTipText(tr("Please decide which values to keep"));
+            cbDecisionRenderer.setSelectedIndex(0);
+            break;
+        case KEEP_ONE:
+            model.addElement(decision.getChosenValue());
+            setToolTipText(tr("Value ''{0}'' is going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey()));
+            cbDecisionRenderer.setSelectedIndex(0);
+            break;
+        case KEEP_NONE:
+            model.addElement(tr("deleted"));
+            setFont(getFont().deriveFont(Font.ITALIC));
+            setToolTipText(tr("The key ''{0}'' and all its values are going to be removed", decision.getKey()));
+            cbDecisionRenderer.setSelectedIndex(0);
+            break;
+        case KEEP_ALL:
+            model.addElement(decision.getChosenValue());
+            setToolTipText(tr("All values joined as ''{0}'' are going to be applied for key ''{1}''", decision.getChosenValue(), decision.getKey()));
+            cbDecisionRenderer.setSelectedIndex(0);
+            break;
         }
     }
@@ -98 +98 @@
 
         reset();
+        if (value == null)
+            return this;
+
         MultiValueResolutionDecision decision = (MultiValueResolutionDecision)value;
         renderColors(decision,isSelected);
         switch(column) {
-            case 0:
-                if (decision.isDecided()) {
-                    setIcon(iconDecided);
-                } else {
-                    setIcon(iconUndecided);
-                }
-                return this;
+        case 0:
+            if (decision.isDecided()) {
+                setIcon(iconDecided);
+            } else {
+                setIcon(iconUndecided);
+            }
+            return this;
 
-            case 1:
-                setText(decision.getKey());
-                return this;
+        case 1:
+            setText(decision.getKey());
+            return this;
 
-            case 2:
-                renderValue(decision);
-                return cbDecisionRenderer;
+        case 2:
+            renderValue(decision);
+            return cbDecisionRenderer;
         }
         return this;

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -478 +478 @@
                 boolean hasFocus, int row, int column) {
             reset();
+            if (value == null)
+                return this;
+
             if (row == 0) {
                 setFont(getFont().deriveFont(Font.BOLD));

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java

@@ -47 +47 @@
             int row, int column) {
         resetTableRenderer();
+        if (value == null)
+            return this;
+
         if (isSelected) {
             setBackground(UIManager.getColor("Table.selectionBackground"));