Changeset 1990 in josm for trunk/src/org/openstreetmap/josm/data/osm/Node.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/Node.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
+import java.util.Locale;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -50 +49 @@
     }
 
-    private static CoordinateFormat mCord;
 
-    static public CoordinateFormat getCoordinateFormat()
-    {
-        return mCord;
-    }
-
-    static public void setCoordinateFormat()
-    {
-        try {
-            mCord = LatLon.CoordinateFormat.valueOf(Main.pref.get("coordinates"));
-        } catch (IllegalArgumentException iae) {
-            mCord = LatLon.CoordinateFormat.DECIMAL_DEGREES;
-        }
-    }
-
-    static {
-        setCoordinateFormat();
-    }
 
     /**
@@ -127 +108 @@
 
     @Override
+    public String getDisplayName(NameFormatter formatter) {
+        return formatter.format(this);
+    }
+
+    @Override
     public String getName() {
-        String name;
-        if (incomplete) {
-            name = tr("incomplete");
-        } else {
-            name = get("name");
-            if (name == null) {
-                name = id == 0 ? tr("node") : ""+id;
-            }
-            name += " (" + coor.latToString(mCord) + ", " + coor.lonToString(mCord) + ")";
-        }
-        return name;
+        String name = super.getName();
+        if (name != null)
+            return name;
+        // no translation
+        return "node " + id;
+    }
+
+    @Override
+    public String getLocalName(){
+        String name = super.getLocalName();
+        if (name != null)
+            return name;
+        return tr("node {0}",id);
     }
 }