Changeset 13912 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-06-11T00:03:29+02:00 (6 years ago)

Author:

Don-vip

Message:

move get*Name() implementations from AbstractPrimitive to IPrimitive

Location:

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

Files:

• AbstractPrimitive.java (modified) (2 diffs)
• IPrimitive.java (modified) (2 diffs)

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

@@ -20 +20 @@
 
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -725 +724 @@
      */
     protected abstract void keysChangedImpl(Map<String, String> originalKeys);
-
-    @Override
-    public String getName() {
-        return get("name");
-    }
-
-    @Override
-    public String getLocalName() {
-        for (String s : LanguageInfo.getLanguageCodes(null)) {
-            String val = get("name:" + s);
-            if (val != null)
-                return val;
-        }
-
-        return getName();
-    }
 
     /*-------------------------------------

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

@@ -324 +324 @@
      * @return the name of this primitive
      */
-    String getName();
+    default String getName() {
+        return get("name");
+    }
 
     /**
@@ -333 +335 @@
      * @see LanguageInfo#getLanguageCodes
      */
-    String getLocalName();
+    default String getLocalName() {
+        for (String s : LanguageInfo.getLanguageCodes(null)) {
+            String val = get("name:" + s);
+            if (val != null)
+                return val;
+        }
+
+        return getName();
+    }
 
     /**