Changeset 1990 in josm for trunk/src/org/openstreetmap/josm/data/osm/Way.java

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/data/osm/Way.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -180 +180 @@
     }
 
-    @Override
-    public String getName() {
-        String name;
-        if (incomplete) {
-            name = tr("incomplete");
-        } else {
-            name = get("name");
-            if (name == null) {
-                name = get("ref");
-            }
-            if (name == null) {
-                name =
-                    (get("highway") != null) ? tr("highway") :
-                        (get("railway") != null) ? tr("railway") :
-                            (get("waterway") != null) ? tr("waterway") :
-                                (get("landuse") != null) ? tr("landuse") : "";
-            }
-
-            int nodesNo = new HashSet<Node>(nodes).size();
-            String nodes = trn("{0} node", "{0} nodes", nodesNo, nodesNo);
-            name += (name.length() > 0) ? " ("+nodes+")" : nodes;
-            if(errors != null) {
-                name = "*"+name;
-            }
-        }
-        return name;
-    }
-
     public void removeNode(Node n) {
         if (incomplete) return;
@@ -263 +235 @@
         return n == firstNode() || n == lastNode();
     }
+
+    @Override
+    public String getName() {
+        String name = super.getName();
+        if (name != null)
+            return name;
+        // no translation
+        return "way " + id;
+    }
+
+    @Override
+    public String getLocalName(){
+        String name = super.getLocalName();
+        if (name != null)
+            return name;
+        return tr("way {0}",id);
+    }
+
+    @Override
+    public String getDisplayName(NameFormatter formatter) {
+        return formatter.format(this);
+    }
 }