Changeset 4918 in josm for trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
- Timestamp:
- 2012-02-11T18:56:53+01:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r4191 r4918 7 7 import java.util.Collection; 8 8 import java.util.List; 9 import javax.swing.Icon; 9 10 10 import javax.swing.JLabel;11 11 12 12 import org.openstreetmap.josm.data.conflict.Conflict; … … 55 55 } 56 56 57 @Override public JLabel getDescription() { 57 @Override 58 public String getDescriptionText() { 58 59 String msg = ""; 59 60 switch(OsmPrimitiveType.from(conflict.getMy())) { … … 62 63 case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break; 63 64 } 64 return new JLabel( 65 tr(msg,getNumDecidedConflicts(), conflict.getMy().getId()), 66 ImageProvider.get("data", "object"), 67 JLabel.HORIZONTAL 68 ); 65 return tr(msg,getNumDecidedConflicts(), conflict.getMy().getId()); 66 } 67 68 @Override 69 public Icon getDescriptionIcon() { 70 return ImageProvider.get("data", "object"); 69 71 } 70 72
Note:
See TracChangeset
for help on using the changeset viewer.