Changeset 5296 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2012-06-24T12:56:56+02:00 (12 years ago)

Author:

Don-vip

Message:

conflict dialog, nodes tab: better display of empty rows (display a real empty row instead of the same content as a the previous row)

File:

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

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

@@ -93 +93 @@
         setBackground(ConflictColors.BGCOLOR.get());
         setForeground(ConflictColors.FGCOLOR.get());
+        setToolTipText(null);
     }
 
@@ -153 +154 @@
         Node node = (Node)value;
         reset();
-        if (value == null)
-            return this;
-        switch(column) {
-        case 0:
-            renderRowId(getModel(table),row, isSelected);
-            break;
-        case 1:
-            if (node == null) {
-                renderEmptyRow();
-            } else {
+        if (node == null) {
+            renderEmptyRow();
+        } else {
+            switch(column) {
+            case 0:
+                renderRowId(getModel(table),row, isSelected);
+                break;
+            case 1:
                 renderNode(getModel(table), node, row, isSelected);
+                break;
+            default:
+                // should not happen
+                throw new RuntimeException(MessageFormat.format("Unexpected column index. Got {0}.", column));
             }
-            break;
-        default:
-            // should not happen
-            throw new RuntimeException(MessageFormat.format("Unexpected column index. Got {0}.", column));
         }
         return this;