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

Timestamp:

2009-08-23T22:37:39+02:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3261: Use the "name:$CURRENT_LOCALE" name in the JOSM UI instead of "name" when it exists
new: new checkbox in LAF preferences for enabling/disabling localized names for primitives

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java (modified) (3 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -156 +157 @@
 
     protected void renderPrimitive(RelationMember member) {
-        String displayName = member.getMember().getName();
+        String displayName = member.getMember().getDisplayName(DefaultNameFormatter.getInstance());
         setText(displayName);
         setToolTipText(buildToolTipText(member.getMember()));
@@ -196 +197 @@
         renderForeground(getModel(table), member, row, column, isSelected);
         switch(column) {
-            case 0:
-                renderRowId(row);
-                break;
-            case 1:
-                if (member == null) {
-                    renderEmptyRow();
-                } else {
-                    renderRole(member);
-                }
-                break;
-            case 2:
-                if (member == null) {
-                    renderEmptyRow();
-                } else {
-                    renderPrimitive(member);
-                }
-                break;
-            default:
-                // should not happen
+        case 0:
+            renderRowId(row);
+            break;
+        case 1:
+            if (member == null) {
+                renderEmptyRow();
+            } else {
+                renderRole(member);
+            }
+            break;
+        case 2:
+            if (member == null) {
+                renderEmptyRow();
+            } else {
+                renderPrimitive(member);
+            }
+            break;
+        default:
+            // should not happen
         }
         return this;