Index: trunk/src/org/openstreetmap/josm/command/AddCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/AddCommand.java	(revision 5076)
+++ trunk/src/org/openstreetmap/josm/command/AddCommand.java	(revision 5077)
@@ -74,5 +74,5 @@
     @Override
     public Icon getDescriptionIcon() {
-        return ImageProvider.get(OsmPrimitiveType.from(osm));
+        return ImageProvider.get(osm.getDisplayType());
     }
 
Index: trunk/src/org/openstreetmap/josm/command/ChangeCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ChangeCommand.java	(revision 5076)
+++ trunk/src/org/openstreetmap/josm/command/ChangeCommand.java	(revision 5077)
@@ -6,4 +6,5 @@
 
 import java.util.Collection;
+
 import javax.swing.Icon;
 
@@ -62,5 +63,5 @@
     @Override
     public Icon getDescriptionIcon() {
-        return ImageProvider.get(OsmPrimitiveType.from(osm));
+        return ImageProvider.get(osm.getDisplayType());
     }
 }
Index: trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java	(revision 5076)
+++ trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java	(revision 5077)
@@ -14,4 +14,5 @@
 import java.util.List;
 import java.util.Map;
+
 import javax.swing.Icon;
 
@@ -181,5 +182,5 @@
                 }
             }
-            
+
             if (allnull) {
                 text = tr("Deleted {0} properties for {1} objects", tags.size(), objects.size());
@@ -206,5 +207,5 @@
 
                 @Override public Icon getDescriptionIcon() {
-                    return ImageProvider.get(OsmPrimitiveType.from(osm));
+                    return ImageProvider.get(osm.getDisplayType());
                 }
 
Index: trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java	(revision 5076)
+++ trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java	(revision 5077)
@@ -7,4 +7,5 @@
 
 import javax.swing.Icon;
+
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -40,7 +41,6 @@
 
     @Override public boolean executeCommand() {
-        if (position < 0 || position >= relation.getMembersCount()) {
+        if (position < 0 || position >= relation.getMembersCount())
             return false;
-        }
 
         oldRole = relation.getMember(position).getRole();
@@ -71,5 +71,5 @@
     @Override
     public Icon getDescriptionIcon() {
-        return ImageProvider.get(OsmPrimitiveType.from(relation));
+        return ImageProvider.get(relation.getDisplayType());
     }
 }
Index: trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java	(revision 5076)
+++ trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java	(revision 5077)
@@ -5,4 +5,5 @@
 
 import java.util.Collection;
+
 import javax.swing.Icon;
 import javax.swing.JOptionPane;
@@ -11,5 +12,4 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -70,5 +70,5 @@
     @Override
     public Icon getDescriptionIcon() {
-        return ImageProvider.get(OsmPrimitiveType.from(conflict.getMy()));
+        return ImageProvider.get(conflict.getMy().getDisplayType());
     }
 }
Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 5076)
+++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 5077)
@@ -2,10 +2,10 @@
 package org.openstreetmap.josm.command;
 
-import java.awt.GridBagLayout;
-import java.awt.geom.Area;
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.GridBagLayout;
+import java.awt.geom.Area;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -19,10 +19,10 @@
 import java.util.Set;
 import java.util.Map.Entry;
+
 import javax.swing.Icon;
-
 import javax.swing.JLabel;
-
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.SplitWayAction;
@@ -160,5 +160,5 @@
     @Override
     public String getDescriptionText() {
-           if (toDelete.size() == 1) {
+        if (toDelete.size() == 1) {
             OsmPrimitive primitive = toDelete.iterator().next();
             String msg = "";
@@ -189,13 +189,11 @@
     @Override
     public Icon getDescriptionIcon() {
-        if (toDelete.size() == 1) {
-            return ImageProvider.get(OsmPrimitiveType.from(toDelete.iterator().next()));
-        }
+        if (toDelete.size() == 1)
+            return ImageProvider.get(toDelete.iterator().next().getDisplayType());
         Set<OsmPrimitiveType> typesToDelete = getTypesToDelete();
-        if (typesToDelete.size() > 1) {
+        if (typesToDelete.size() > 1)
             return ImageProvider.get("data", "object");
-        } else {
+        else
             return ImageProvider.get(typesToDelete.iterator().next());
-        }
     }
 
@@ -213,5 +211,5 @@
 
                     @Override public Icon getDescriptionIcon() {
-                        return ImageProvider.get(OsmPrimitiveType.from(osm));
+                        return ImageProvider.get(osm.getDisplayType());
                     }
 
@@ -345,7 +343,6 @@
 
         Collection<Relation> relationsToDelete = Utils.filteredCollection(primitivesToDelete, Relation.class);
-        if(!relationsToDelete.isEmpty() && !silent && !confirmRelationDeletion(relationsToDelete)) {
-            return null;
-        }
+        if(!relationsToDelete.isEmpty() && !silent && !confirmRelationDeletion(relationsToDelete))
+            return null;
 
         Collection<Way> waysToBeChanged = new HashSet<Way>();
Index: trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java	(revision 5076)
+++ trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java	(revision 5077)
@@ -26,5 +26,4 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -89,5 +88,5 @@
                 final JLabel primitiveLabel = new JLabel(
                         primitive.getDisplayName(DefaultNameFormatter.getInstance()) + ":",
-                        ImageProvider.get(OsmPrimitiveType.from(primitive)),
+                        ImageProvider.get(primitive.getDisplayType()),
                         JLabel.LEFT
                 );
@@ -116,5 +115,5 @@
                 final JLabel primitiveLabel = new JLabel(
                         primitive.getDisplayName(DefaultNameFormatter.getInstance()),
-                        ImageProvider.get(OsmPrimitiveType.from(primitive)),
+                        ImageProvider.get(primitive.getDisplayType()),
                         JLabel.LEFT
                 );