Changeset 17672 in josm

Timestamp:

2021-03-26T22:41:28+01:00 (4 years ago)

Author:

simon04

Message:

see #20673 - Extract DefaultNameFormatter.formatLocalName to fix code duplication

File:

• trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java (modified) (7 diffs)

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

@@ -178 +178 @@
             TaggingPreset preset = TaggingPresetNameTemplateList.getInstance().findPresetTemplate(node);
             if (preset == null || !(node instanceof TemplateEngineDataProvider)) {
-                String n;
-                if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
-                    n = node.getLocalName();
-                } else {
-                    n = node.getName();
-                }
+                String n = formatLocalName(node);
                 if (n == null) {
                     n = formatAddress(node);
@@ -239 +234 @@
             if (preset == null || !(way instanceof TemplateEngineDataProvider)) {
                 String n;
-                if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
-                    n = way.getLocalName();
-                } else {
-                    n = way.getName();
-                }
+                n = formatLocalName(way);
                 if (n == null) {
                     n = way.get("ref");
@@ -283 +274 @@
                 .findFirst().orElse(result);
 
+    }
+
+    private static String formatLocalName(IPrimitive osm) {
+        if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
+            return osm.getLocalName();
+        } else {
+            return osm.getName();
+        }
+    }
+
+    private static String formatLocalName(HistoryOsmPrimitive osm) {
+        if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
+            return osm.getLocalName();
+        } else {
+            return osm.getName();
+        }
     }
 
@@ -440 +447 @@
     private static String getNameTagValue(IRelation<?> relation, String nameTag) {
         if ("name".equals(nameTag)) {
-            if (Config.getPref().getBoolean("osm-primitives.localize-name", true))
-                return relation.getLocalName();
-            else
-                return relation.getName();
+            return formatLocalName(relation);
         } else if (":LocationCode".equals(nameTag)) {
             return relation.keys()
@@ -534 +538 @@
     public String format(HistoryNode node) {
         StringBuilder sb = new StringBuilder();
-        String name;
-        if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
-            name = node.getLocalName();
-        } else {
-            name = node.getName();
-        }
+        String name = formatLocalName(node);
         if (name == null) {
             sb.append(node.getId());
@@ -560 +559 @@
     public String format(HistoryWay way) {
         StringBuilder sb = new StringBuilder();
-        String name;
-        if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
-            name = way.getLocalName();
-        } else {
-            name = way.getName();
-        }
+        String name = formatLocalName(way);
         if (name != null) {
             sb.append(name);
@@ -608 +602 @@
             // #3328: "note " and " note" are name tags too
             if (namingTags.contains(n.trim())) {
-                if (Config.getPref().getBoolean("osm-primitives.localize-name", true)) {
-                    nameTag = relation.getLocalName();
-                } else {
-                    nameTag = relation.getName();
-                }
+                nameTag = formatLocalName(relation);
                 if (nameTag == null) {
                     nameTag = relation.get(n);