Changeset 29359 in osm for applications
- Timestamp:
- 2013-03-13T22:01:18+01:00 (11 years ago)
- Location:
- applications/editors/josm/plugins/reverter
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/reverter/build.xml
r29353 r29359 4 4 <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/> 5 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 6 <property name="plugin.main.version" value="57 65"/>6 <property name="plugin.main.version" value="5775"/> 7 7 8 8 <!-- Configure these properties (replace "..." accordingly). -
applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java
r29347 r29359 9 9 import org.openstreetmap.josm.Main; 10 10 import org.openstreetmap.josm.command.Command; 11 import org.openstreetmap.josm.command.ConflictAddCommand; 11 12 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 12 13 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; … … 87 88 final Command cmd = new RevertChangesetCommand(tr(revertType == RevertType.FULL ? "Revert changeset #{0}" : 88 89 "Partially revert changeset #{0}",changesetId),cmds); 90 int n = 0; 91 for (Command c : cmds) { 92 if (c instanceof ConflictAddCommand) { 93 n++; 94 } 95 } 96 final int newConflicts = n; 89 97 GuiHelper.runInEDT(new Runnable() { 90 98 @Override 91 99 public void run() { 92 100 Main.main.undoRedo.add(cmd); 101 if (newConflicts > 0) { 102 Main.map.conflictDialog.warnNumNewConflicts(newConflicts); 103 } 93 104 } 94 105 });
Note:
See TracChangeset
for help on using the changeset viewer.