Changeset 3262 in josm for trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

Timestamp:

2010-05-18T23:43:52+02:00 (14 years ago)

Author:

bastiK

Message:

extended command list dialog; added inspection panel

File:

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

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

@@ -8 +8 @@
 
 import javax.swing.JLabel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
 
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -35 +33 @@
     }
 
-    @Override
-    public MutableTreeNode description() {
+    @Override public JLabel getDescription() {
         String msg = "";
         switch(OsmPrimitiveType.from(conflict.getMy())) {
@@ -43 +40 @@
         case RELATION: msg = marktr("Resolve version conflict for relation {0}"); break;
         }
-        return new DefaultMutableTreeNode(
-                new JLabel(
+        return new JLabel(
                         tr(msg,conflict.getMy().getId()),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
-                )
         );
     }