Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 1992)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 1997)
@@ -290,10 +290,10 @@
                     String as = h.get(a);
                     if (as == null) {
-                        as = a.getName();
+                        as = a.getName() != null ? a.getName() : Long.toString(a.id);
                         h.put(a, as);
                     }
                     String bs = h.get(b);
                     if (bs == null) {
-                        bs = b.getName();
+                        bs = b.getName() != null ? b.getName() : Long.toString(b.id);
                         h.put(b, bs);
                     }
Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 1992)
+++ trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 1997)
@@ -111,20 +111,3 @@
         return formatter.format(this);
     }
-
-    @Override
-    public String getName() {
-        String name = super.getName();
-        if (name != null)
-            return name;
-        // no translation
-        return "node " + id;
-    }
-
-    @Override
-    public String getLocalName(){
-        String name = super.getLocalName();
-        if (name != null)
-            return name;
-        return tr("node {0}",id);
-    }
 }
Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 1992)
+++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 1997)
@@ -193,21 +193,4 @@
 
     @Override
-    public String getName() {
-        String name = super.getName();
-        if (name != null)
-            return name;
-        // no translation
-        return "relation " + id;
-    }
-
-    @Override
-    public String getLocalName(){
-        String name = super.getLocalName();
-        if (name != null)
-            return name;
-        return tr("relation {0}",id);
-    }
-
-    @Override
     public String getDisplayName(NameFormatter formatter) {
         return formatter.format(this);
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 1992)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 1997)
@@ -237,21 +237,4 @@
 
     @Override
-    public String getName() {
-        String name = super.getName();
-        if (name != null)
-            return name;
-        // no translation
-        return "way " + id;
-    }
-
-    @Override
-    public String getLocalName(){
-        String name = super.getLocalName();
-        if (name != null)
-            return name;
-        return tr("way {0}",id);
-    }
-
-    @Override
     public String getDisplayName(NameFormatter formatter) {
         return formatter.format(this);
Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 1992)
+++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 1997)
@@ -167,4 +167,6 @@
                         nameTag = relation.getName();
                     }
+                } else {
+                    nameTag =  relation.get(n);
                 }
                 if (nameTag != null) {
@@ -172,5 +174,7 @@
                 }
             }
-            if (nameTag != null) {
+            if (nameTag == null) {
+                name += Long.toString(relation.id) + ", ";
+            } else {
                 name += "\"" + nameTag + "\", ";
             }