Changeset 21691 in osm

Timestamp:

2010-06-14T00:43:16+02:00 (14 years ago)

Author:

upliner

Message:

make reverter not to send delete requests for objects that was undeleted and deleted again by user

Location:

applications/editors/josm/plugins/reverter/src/reverter

Files:

• ChangesetReverter.java (modified) (6 diffs)
• PrimitiveIdVersion.java (added)
• RevertChangesetAction.java (modified) (1 diff)
• ReverterPlugin.java (modified) (1 diff)
• ReverterUploadHook.java (moved) (moved from applications/editors/josm/plugins/reverter/src/reverter/ModifiyUploadOrderHook.java ) (2 diffs)
• UndeletedObjectsStorage.java (added)

applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

@@ -43 +43 @@
  */
 public class ChangesetReverter {
+
+    public static enum RevertType {
+        FULL,
+        SELECTION,
+        SELECTION_WITH_UNDELETE
+    }
+
     public final int changesetId;
     public final Changeset changeset;
@@ -120 +127 @@
         
         // Build our own lists of created/updated/modified objects for better performance
-        Iterator<ChangesetDataSetEntry> iterator = cds.iterator();
-        while (iterator.hasNext()) {
-            ChangesetDataSetEntry entry = iterator.next();
+        for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
+            ChangesetDataSetEntry entry = it.next();
             if (entry.getModificationType() == ChangesetModificationType.CREATED) {
                 created.add(entry.getPrimitive());
@@ -191 +197 @@
                 p.setDeleted(true);
                 p.setModified(false);
+                ReverterPlugin.undeletedObjects.addPrimitive(ds,
+                        new PrimitiveIdVersion(p.getPrimitiveId(),(int)p.getVersion()));
             }
         }
@@ -280 +288 @@
         
         // Check objects versions
-        Iterator<ChangesetDataSetEntry> iterator = cds.iterator();
-        while (iterator.hasNext()) {
-            ChangesetDataSetEntry entry = iterator.next();
+        for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
+            ChangesetDataSetEntry entry = it.next();
             HistoryOsmPrimitive hp = entry.getPrimitive();
             OsmPrimitive dp = ds.getPrimitiveById(hp.getPrimitiveId());
@@ -306 +313 @@
          * isn't going to be deleted or modified, create a conflict.
          */
-        for (OsmPrimitive p : toDelete.toArray(new OsmPrimitive[0])) {
+        for (Iterator<OsmPrimitive> it = toDelete.iterator(); it.hasNext();) {
+            OsmPrimitive p = it.next();
             if (p.isDeleted()) {
-                toDelete.remove(p);
+                it.remove();
                 continue;
             }
@@ -321 +329 @@
                     conflicted.add(p);
                 }
-                toDelete.remove(p);
+                it.remove();
                 break;
             }

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java

@@ -75 +75 @@
                 rev.checkMissingDeleted();
                 // Don't ask user to download primitives going to be undeleted
-                rev.downloadMissingPrimitives(NullProgressMonitor.INSTANCE);
+                rev.downloadMissingPrimitives(progressMonitor.createSubTaskMonitor(0, false));
+                if (progressMonitor.isCancelled()) return;
                 rev.checkMissingCreated();
                 rev.checkMissingUpdated();

applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java

@@ -11 +11 @@
 import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
 public class ReverterPlugin extends Plugin {
+    static UndeletedObjectsStorage undeletedObjects = new UndeletedObjectsStorage();
     public ReverterPlugin(PluginInformation info) {
         super(info);
-        JMenu historyMenu = Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_R, Main.main.menu.defaultMenuPos,ht("/Plugin/Reverter"));
+        JMenu historyMenu = Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_R,
+                Main.main.menu.defaultMenuPos,ht("/Plugin/Reverter"));
         //MainMenu.add(historyMenu, new ObjectsHistoryAction());       
         MainMenu.add(historyMenu, new RevertChangesetAction());
-        UploadAction.registerUploadHook(new ModifiyUploadOrderHook());
-
-        //TODO: Download deleted objects
+        MapView.addLayerChangeListener(undeletedObjects);
+        UploadAction.registerUploadHook(new ReverterUploadHook(undeletedObjects));        
     }
 }

applications/editors/josm/plugins/reverter/src/reverter/ReverterUploadHook.java

@@ -2 +2 @@
 package reverter;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map.Entry;
 
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -13 +24 @@
 import org.openstreetmap.josm.actions.upload.UploadHook;
 
-/**
- * Sort modified objects before uploading in order: nodes, ways, relations
- * It is needed because objects undeleted by reverter is marked as "modified",
- * but in fact they're re-added to JOSM. Without this the "precondition failed"
- * error appears when trying to upload objects undeleted by reverter.
- * 
- */
-public class ModifiyUploadOrderHook implements UploadHook {
+public class ReverterUploadHook implements UploadHook {
+    private UndeletedObjectsStorage undeletedStorage;
+    
+    public ReverterUploadHook(UndeletedObjectsStorage undeletedStorage) {
+        this.undeletedStorage = undeletedStorage;
+    }
+    
+    public boolean checkUpload(APIDataSet apiDataSet) {
+        // Determine DataSet associated with APIDataSet
+        DataSet ds = null;
+        if (!apiDataSet.getPrimitivesToAdd().isEmpty()) {
+            ds = apiDataSet.getPrimitivesToAdd().get(0).getDataSet();
+        } else if (!apiDataSet.getPrimitivesToUpdate().isEmpty()) {
+            ds = apiDataSet.getPrimitivesToUpdate().get(0).getDataSet();
+        } else if (!apiDataSet.getPrimitivesToDelete().isEmpty()) {
+            ds = apiDataSet.getPrimitivesToDelete().get(0).getDataSet();
+        }
+        if (ds == null) return true;
+        
+        /* Sort modified objects before uploading in order: nodes, ways, relations.
+         * It is needed because objects undeleted by reverter is marked as "modified", but they
+         * cannot be referenced as well as deleted objects. Without this the "precondition failed"
+         * error appears when trying to upload objects undeleted by reverter.
+         */
+        if (undeletedStorage.haveUndeletedObjects(ds)) {
+            Collections.sort(
+                    apiDataSet.getPrimitivesToUpdate(),
+                    new Comparator<OsmPrimitive>() {
+                        public int compare(OsmPrimitive o1, OsmPrimitive o2) {
+                            if (o1 instanceof Node && o2 instanceof Node)
+                                return 0;
+                            else if (o1 instanceof Node)
+                                return -1;
+                            else if (o2 instanceof Node)
+                                return 1;
+            
+                            if (o1 instanceof Way && o2 instanceof Way)
+                                return 0;
+                            else if (o1 instanceof Way && o2 instanceof Relation)
+                                return -1;
+                            else if (o2 instanceof Way && o1 instanceof Relation)
+                                return 1;
+            
+                            return 0;
+                        }
+                    }
+                    );
+        }
+        /* Remove primitives that was undeleted and deleted again from list of primitives
+         * to be deleted.
+         */
+        apiDataSet.getPrimitivesToDelete().removeAll(undeletedStorage.getUndeletedObjects(ds));
 
-    public boolean checkUpload(APIDataSet apiDataSet) {
-        Collections.sort(
-                apiDataSet.getPrimitivesToUpdate(),
-                new Comparator<OsmPrimitive>() {
-                    public int compare(OsmPrimitive o1, OsmPrimitive o2) {
-                        if (o1 instanceof Node && o2 instanceof Node)
-                            return 0;
-                        else if (o1 instanceof Node)
-                            return -1;
-                        else if (o2 instanceof Node)
-                            return 1;
-
-                        if (o1 instanceof Way && o2 instanceof Way)
-                            return 0;
-                        else if (o1 instanceof Way && o2 instanceof Relation)
-                            return -1;
-                        else if (o2 instanceof Way && o1 instanceof Relation)
-                            return 1;
-
-                        return 0;
-                    }
-                }
-                );
+        if (apiDataSet.isEmpty()) {
+            JOptionPane.showMessageDialog(
+                    Main.parent,
+                    tr("No changes to upload."),
+                    tr("Warning"),
+                    JOptionPane.INFORMATION_MESSAGE
+            );
+            return false;
+        }
         return true;
     }