Changeset 5299 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-06-24T21:15:57+02:00 (12 years ago)

Author:

Don-vip

Message:

conflict dialog: better display of empty rows in members tab, like previous work on nodes tab, plus fix Junit test

Location:

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

Files:

• nodes/NodeListTableCellRenderer.java (modified) (1 diff)
• relation/RelationMemberTableCellRenderer.java (modified) (1 diff)

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

@@ -93 +93 @@
         setBackground(ConflictColors.BGCOLOR.get());
         setForeground(ConflictColors.FGCOLOR.get());
+        setBorder(null);
+        setIcon(null);
         setToolTipText(null);
     }

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

@@ -153 +153 @@
         RelationMember member = (RelationMember)value;
         reset();
-        if (value == null)
-            return this;
-
-        renderBackground(getModel(table), member, row, column, isSelected);
-        renderForeground(getModel(table), member, row, column, isSelected);
-        switch(column) {
-        case 0:
-            renderRowId(row);
-            break;
-        case 1:
-            if (member == null) {
-                renderEmptyRow();
-            } else {
+        if (member == null) {
+            renderEmptyRow();
+        } else {
+            renderBackground(getModel(table), member, row, column, isSelected);
+            renderForeground(getModel(table), member, row, column, isSelected);
+            switch(column) {
+            case 0:
+                renderRowId(row);
+                break;
+            case 1:
                 renderRole(member);
+                break;
+            case 2:
+                renderPrimitive(member);
+                break;
+            default:
+                // should not happen
             }
-            break;
-        case 2:
-            if (member == null) {
-                renderEmptyRow();
-            } else {
-                renderPrimitive(member);
-            }
-            break;
-        default:
-            // should not happen
         }
         return this;