Changeset 2686 in josm for trunk/src/org/openstreetmap/josm/data/osm/history

Timestamp:

2009-12-28T00:14:33+01:00 (14 years ago)

Author:

Gubaer

Message:

Partial commit due to issue described in #4137
Breaks the build

Location:

trunk/src/org/openstreetmap/josm/data/osm/history

Files:

• HistoryNameFormatter.java (added)
• HistoryNode.java (modified) (1 diff)
• HistoryOsmPrimitive.java (modified) (2 diffs)
• HistoryRelation.java (modified) (1 diff)
• HistoryWay.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

@@ -34 +34 @@
         this.coords = coords;
     }
+
+    @Override
+    public String getDisplayName(HistoryNameFormatter formatter) {
+        return formatter.format(this);
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -7 +7 @@
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
@@ -146 +147 @@
     }
 
+    /**
+     * Replies the name of this primitive. The default implementation replies the value
+     * of the tag <tt>name</tt> or null, if this tag is not present.
+     *
+     * @return the name of this primitive
+     */
+    public String getName() {
+        if (get("name") != null)
+            return get("name");
+        return null;
+    }
+
+    /**
+     * Replies the display name of a primitive formatted by <code>formatter</code>
+     *
+     * @return the display name
+     */
+    public abstract String getDisplayName(HistoryNameFormatter formatter);
+
+    /**
+     * Replies the a localized name for this primitive given by the value of the tags (in this order)
+     * <ul>
+     *   <li>name:lang_COUNTRY_Variant  of the current locale</li>
+     *   <li>name:lang_COUNTRY of the current locale</li>
+     *   <li>name:lang of the current locale</li>
+     *   <li>name of the current locale</li>
+     * </ul>
+     *
+     * null, if no such tag exists
+     *
+     * @return the name of this primitive
+     */
+    public String getLocalName() {
+        String key = "name:" + Locale.getDefault().toString();
+        if (get(key) != null)
+            return get(key);
+        key = "name:" + Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry();
+        if (get(key) != null)
+            return get(key);
+        key = "name:" + Locale.getDefault().getLanguage();
+        if (get(key) != null)
+            return get(key);
+        return getName();
+    }
+
+
+
     @Override
     public int hashCode() {

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -111 +111 @@
         members.add(member);
     }
+
+    @Override
+    public String getDisplayName(HistoryNameFormatter formatter) {
+        return formatter.format(this);
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -77 +77 @@
         nodeIds.add(ref);
     }
+
+    /**
+     * Replies true if this way is closed.
+     * 
+     * @return true if this way is closed.
+     */
+    public boolean isClosed() {
+        return getNumNodes() >= 3 && nodeIds.get(0) == nodeIds.get(nodeIds.size()-1);
+    }
+
+    @Override
+    public String getDisplayName(HistoryNameFormatter formatter) {
+        return formatter.format(this);
+    }
 }