Changeset 3995 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2011-03-20T01:29:48+01:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java
r3262 r3995 28 28 JOptionPane.showMessageDialog( 29 29 Main.parent, 30 tr("<html>Layer ''{0}'' already has a conflict for primitive<br>"30 tr("<html>Layer ''{0}'' already has a conflict for object<br>" 31 31 + "''{1}''.<br>" 32 32 + "This conflict cannot be added.</html>", … … 50 50 @Override public void undoCommand() { 51 51 if (! Main.map.mapView.hasLayer(getLayer())) { 52 System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for primitive''{1}''.",52 System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.", 53 53 getLayer().getName(), 54 54 conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) … … 65 65 @Override public JLabel getDescription() { 66 66 return new JLabel( 67 68 69 70 71 67 tr("Add conflict for ''{0}''", 68 conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) 69 ), 70 ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())), 71 JLabel.HORIZONTAL 72 72 ); 73 73 } -
trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java
r3362 r3995 63 63 @Override public JLabel getDescription() { 64 64 return new JLabel( 65 trn("Undelete {0} primitive", "Undelete {0} primitives", toUndelete.size(), toUndelete.size()),66 67 65 trn("Undelete {0} object", "Undelete {0} objects", toUndelete.size(), toUndelete.size()), 66 ImageProvider.get("data", "object"), 67 JLabel.HORIZONTAL 68 68 ); 69 69 }
Note: See TracChangeset
for help on using the changeset viewer.