Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

Timestamp:

23.06.2009 22:03:37 (3 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

• trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.swing.JLabel;
@@ -11 +13 @@
 import javax.swing.tree.MutableTreeNode;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -24 +27 @@
     /** the node to undelete */
     private ArrayList<OsmPrimitive> toUndelete;
+    private Map<OsmPrimitive,OsmPrimitive> resolvedConflicts;
 
+    protected UndeletePrimitivesCommand() {
+        toUndelete = new ArrayList<OsmPrimitive>();
+        resolvedConflicts = new HashMap<OsmPrimitive, OsmPrimitive>();
+    }
     /**
      * constructor
@@ -30 +38 @@
      */
     public UndeletePrimitivesCommand(OsmPrimitive node) {
-        toUndelete = new ArrayList<OsmPrimitive>();
+        this();
         toUndelete.add(node);
     }
@@ -39 +47 @@
      */
     public UndeletePrimitivesCommand(OsmPrimitive ... toUndelete) {
-        this.toUndelete = new ArrayList<OsmPrimitive>();
+        this();
         for (int i=0; i < toUndelete.length; i++) {
             this.toUndelete.add(toUndelete[i]);
@@ -50 +58 @@
      */
     public UndeletePrimitivesCommand(Collection<OsmPrimitive> toUndelete) {
-        this.toUndelete = new ArrayList<OsmPrimitive>();
+        this();
         this.toUndelete.addAll(toUndelete);
     }
@@ -70 +78 @@
         super.executeCommand();
         for(OsmPrimitive primitive: toUndelete) {
+            if (Main.map.conflictDialog.conflicts.containsKey(primitive)) {
+                resolvedConflicts.put(primitive, Main.map.conflictDialog.conflicts.get(primitive));
+                Main.map.conflictDialog.removeConflictForPrimitive(primitive);
+            }
             primitive.id = 0;
         }
@@ -80 +92 @@
         modified.addAll(toUndelete);
     }
+    @Override
+    public void undoCommand() {
+        super.undoCommand();
+
+        for (OsmPrimitive my: resolvedConflicts.keySet()) {
+            if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
+                Main.map.conflictDialog.addConflict(my, resolvedConflicts.get(my));
+            }
+        }
+    }
 }