Changeset 4918 in josm for trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java

Timestamp:

2012-02-11T18:56:53+01:00 (13 years ago)

Author:

simon04

Message:

fix #7370 - Refactor Command.getDescription

File:

• trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java

@@ -6 +6 @@
 
 import java.util.Collection;
+import javax.swing.Icon;
 
 import javax.swing.JLabel;
@@ -33 +34 @@
     }
 
-    @Override public JLabel getDescription() {
+    @Override
+    public String getDescriptionText() {
         String msg = "";
         switch(OsmPrimitiveType.from(conflict.getMy())) {
@@ -40 +42 @@
         case RELATION: msg = marktr("Set the ''modified'' flag for relation {0}"); break;
         }
-        return new JLabel(
-                        tr(msg,conflict.getMy().getId()),
-                        ImageProvider.get("data", "object"),
-                        JLabel.HORIZONTAL
-        );
+        return tr(msg,conflict.getMy().getId());
+    }
+
+    @Override
+    public Icon getDescriptionIcon() {
+        return ImageProvider.get("data", "object");
     }