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

Timestamp:

2009-08-23T22:37:39+02:00 (15 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/nodes/NodeListTableCellRenderer.java (modified) (3 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -130 +131 @@
             }
         }
-        setText(node.getName());
+        setText(node.getDisplayName(DefaultNameFormatter.getInstance()));
         setToolTipText(buildToolTipText(node));
     }
@@ -167 +168 @@
         reset();
         switch(column) {
-            case 0:
-                renderRowId(getModel(table),row, isSelected);
-                break;
-            case 1:
-                if (node == null) {
-                    renderEmptyRow();
-                } else {
-                    renderNode(getModel(table), node, row, isSelected);
-                }
-                break;
-            default:
-                // should not happen
-                throw new RuntimeException(tr("unexpected column index. Got {0}", column));
+        case 0:
+            renderRowId(getModel(table),row, isSelected);
+            break;
+        case 1:
+            if (node == null) {
+                renderEmptyRow();
+            } else {
+                renderNode(getModel(table), node, row, isSelected);
+            }
+            break;
+        default:
+            // should not happen
+            throw new RuntimeException(tr("unexpected column index. Got {0}", column));
         }
         return this;