Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.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/PurgePrimitivesCommand.java (modified) (8 diffs)

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

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.JLabel;
@@ -33 +35 @@
  */
 public class PurgePrimitivesCommand extends Command{
+
 
     /**
@@ -141 +144 @@
     private ArrayList<OsmParentChildPair> pairs;
 
+    private Map<OsmPrimitive, OsmPrimitive> resolvedConflicts;
+
     /**
      * constructor
@@ -149 +154 @@
         purgedPrimitives = new ArrayList<OsmPrimitive>();
         pairs = new ArrayList<OsmParentChildPair>();
+        resolvedConflicts = new HashMap<OsmPrimitive, OsmPrimitive>();
     }
 
@@ -180 +186 @@
             if (pair.getParent() instanceof Way) {
                 Way w = (Way)pair.getParent();
-                System.out.println("removing reference from way " + w.id);
+                System.out.println(tr("removing reference from way {0}",w.id));
                 w.nodes.remove(primitive);
                 // if a way ends up with less than two node we
@@ -194 +200 @@
             } else if (pair.getParent() instanceof Relation) {
                 Relation r = (Relation)pair.getParent();
-                System.out.println("removing reference from relation " + r.id);
+                System.out.println(tr("removing reference from relation {0}",r.id));
                 r.removeMembersFor(primitive);
             }
@@ -220 +226 @@
             }
             purgedPrimitives.add(toPurge);
+            if (Main.map.conflictDialog.conflicts.containsKey(toPurge)) {
+                resolvedConflicts.put(toPurge, Main.map.conflictDialog.conflicts.get(toPurge));
+                Main.map.conflictDialog.removeConflictForPrimitive(toPurge);
+            }
         }
         return super.executeCommand();
@@ -236 +246 @@
     @Override
     public void undoCommand() {
+
+        // restore purged primitives
+        //
         for (OsmPrimitive purged : purgedPrimitives) {
             Main.ds.addPrimitive(purged);
+        }
+
+        // restore conflicts
+        //
+        for (OsmPrimitive primitive : resolvedConflicts.keySet()) {
+            Main.map.conflictDialog.addConflict(primitive, resolvedConflicts.get(primitive));
         }