Changeset 6821 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-02-07T00:18:58+01:00 (10 years ago)

Author:

bastiK

Message:

see #8902 - Small performance enhancements / coding style (patch by shinigami)

primitives.diff: few optimizations around osm primitives

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import org.openstreetmap.josm.tools.Utils;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -701 +703 @@
     @Override
     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);
+        final Locale locale = Locale.getDefault();
+        String key = "name:" + locale.toString();
+        String val = get(key);
+        if (val != null)
+            return val;
+
+        final String language = locale.getLanguage();
+        key = "name:" + language + "_" + locale.getCountry();
+        val = get(key);
+        if (val != null)
+            return val;
+
+        key = "name:" + language;
+        val = get(key);
+        if (val != null)
+            return val;
+
         return getName();
+    }
+
+    /**
+     * Tests whether this primitive contains a tag consisting of {@code key} and {@code values}.
+     * @param key the key forming the tag.
+     * @param value value forming the tag.
+     * @return true iff primitive contains a tag consisting of {@code key} and {@code value}.
+     */
+    public boolean hasTag(String key, String value) {
+        return Utils.equal(value, get(key));
     }