Index: /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 17672)
+++ /trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 17673)
@@ -160,12 +160,5 @@
      */
     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);
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java	(revision 17672)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java	(revision 17673)
@@ -134,9 +134,9 @@
 
     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));
     }