Changeset 114 in josm

Timestamp:

2006-07-17T13:16:38+02:00 (18 years ago)

Author:

imi

Message:

fixed wrongly named primitive.png (should be object.png)

Files:

• images/data/object.png (moved) (moved from images/data/primitive.png )
• src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) (1 diff)

src/org/openstreetmap/josm/command/ConflictResolveCommand.java

@@ -75 +75 @@
                         if (c.resolution != null)
                                 i++;
-                return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "primitive"), JLabel.HORIZONTAL));
+                return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "object"), JLabel.HORIZONTAL));
     }
 }