Changeset 17673 in josm

Timestamp:

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

Author:

simon04

Message:

see #20673 - Simplify DefaultNameFormatter.format(IPrimitive)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java (modified) (1 diff)

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

@@ -160 +160 @@
      */
     public String format(IPrimitive osm) {
-        if (osm instanceof INode) {
-            return format((INode) osm);
-        } else if (osm instanceof IWay) {
-            return format((IWay<?>) osm);
-        } else if (osm instanceof IRelation) {
-            return format((IRelation<?>) osm);
-        }
-        return null;
+        return osm.getDisplayName(this);
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java

@@ -134 +134 @@
 
     static String getFormattedRelationName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Relation) OsmUtils.createPrimitive("relation " + tagsString));
+        return DefaultNameFormatter.getInstance().format(OsmUtils.createPrimitive("relation " + tagsString));
     }
 
     static String getFormattedWayName(String tagsString) {
-        return DefaultNameFormatter.getInstance().format((Way) OsmUtils.createPrimitive("way " + tagsString));
+        return DefaultNameFormatter.getInstance().format(OsmUtils.createPrimitive("way " + tagsString));
     }