Changeset 3262 in josm for trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
- Timestamp:
- 2010-05-18T23:43:52+02:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r3083 r3262 10 10 11 11 import javax.swing.JLabel; 12 import javax.swing.tree.DefaultMutableTreeNode;13 import javax.swing.tree.MutableTreeNode;14 12 15 13 import org.openstreetmap.josm.data.conflict.Conflict; … … 61 59 } 62 60 63 @Override 64 public MutableTreeNode description() { 61 @Override public JLabel getDescription() { 65 62 String msg = ""; 66 63 switch(OsmPrimitiveType.from(conflict.getMy())) { … … 69 66 case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break; 70 67 } 71 return new DefaultMutableTreeNode( 72 new JLabel( 68 return new JLabel( 73 69 tr(msg,getNumDecidedConflicts(), conflict.getMy().getId()), 74 70 ImageProvider.get("data", "object"), 75 71 JLabel.HORIZONTAL 76 )77 72 ); 78 73 }
Note:
See TracChangeset
for help on using the changeset viewer.