Changeset 1690 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-06-23T22:03:37+02:00 (14 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

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• DeletedStateConflictResolveCommand.java (modified) (1 diff)
• PurgePrimitivesCommand.java (modified) (8 diffs)
• UndeletePrimitivesCommand.java (modified) (8 diffs)
• VersionConflictResolveCommand.java (modified) (1 diff)

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

@@ -66 +66 @@
 
         if (decision.equals(MergeDecisionType.KEEP_MINE)) {
-            // do nothing
+            if (my.deleted) {
+                // because my was involved in a conflict it my still be referred
+                // to from a way or a relation. Fix this now.
+                //
+                Main.main.editLayer().data.unlinkReferencesToPrimitive(my);
+            }
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
-            my.deleted = their.deleted;
+            if (their.deleted) {
+                Main.main.editLayer().data.unlinkReferencesToPrimitive(my);
+                my.delete(true);
+            } else {
+                my.deleted = their.deleted;
+            }
         } else
             // should not happen

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));
         }
 

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));
+            }
+        }
+    }
 }

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

@@ -11 +11 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.ImageProvider;