Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2009-08-30T19:07:24+02:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java
r1990 r2017 16 16 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 17 17 import org.openstreetmap.josm.gui.DefaultNameFormatter; 18 import org.openstreetmap.josm.gui.OptionPaneUtil;19 18 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 20 19 import org.openstreetmap.josm.tools.ImageProvider; … … 29 28 30 29 protected void warnBecauseOfDoubleConflict() { 31 OptionPaneUtil.showMessageDialog(30 JOptionPane.showMessageDialog( 32 31 Main.parent, 33 32 tr("<html>Layer ''{0}'' already has a conflict for primitive<br>" -
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r1936 r2017 2 2 package org.openstreetmap.josm.command; 3 3 4 import static org.openstreetmap.josm.tools.I18n.tr;5 4 import static org.openstreetmap.josm.tools.I18n.trn; 6 5 -
trunk/src/org/openstreetmap/josm/command/RotateCommand.java
r1936 r2017 1 1 package org.openstreetmap.josm.command; 2 2 3 import static org.openstreetmap.josm.tools.I18n.tr;4 3 import static org.openstreetmap.josm.tools.I18n.trn; 5 4 -
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r1989 r2017 2 2 package org.openstreetmap.josm.command; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 import static org.openstreetmap.josm.tools.I18n.marktr;6 6 7 7 import java.util.Collection; -
trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java
r1750 r2017 12 12 import javax.swing.tree.MutableTreeNode; 13 13 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.data.osm.OsmPrimitive; 16 import org.openstreetmap.josm.gui.layer.OsmDataLayer;17 15 import org.openstreetmap.josm.tools.ImageProvider; 18 16 -
trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
r1989 r2017 2 2 package org.openstreetmap.josm.command; 3 3 4 import static org.openstreetmap.josm.tools.I18n.marktr; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 import static org.openstreetmap.josm.tools.I18n.marktr;6 6 7 7 import java.util.Collection;
Note: See TracChangeset
for help on using the changeset viewer.