Changeset 3034 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2010-02-23T08:58:12+01:00 (14 years ago)

Author:

jttt

Message:

Fix #4467 Don't silently drop locally deleted member primitives from downloaded ways and relation (fix the issue when deleted primitive is referenced)

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• ConflictResolver.java (modified) (8 diffs)
• IConflictResolver.java (modified) (2 diffs)
• nodes/NodeListMergeModel.java (modified) (2 diffs)
• nodes/NodeListMerger.java (modified) (2 diffs)
• properties/PropertiesMergeModel.java (modified) (5 diffs)
• properties/PropertiesMerger.java (modified) (2 diffs)
• relation/RelationMemberMerger.java (modified) (2 diffs)
• tags/TagMergeModel.java (modified) (2 diffs)
• tags/TagMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -19 +19 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.command.VersionConflictResolveCommand;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -77 +78 @@
     private OsmPrimitive my;
     private OsmPrimitive their;
+    private Conflict<? extends OsmPrimitive> conflict;
 
     private ImageIcon mergeComplete;
@@ -228 +230 @@
      *
      */
-    public void populate(OsmPrimitive my, OsmPrimitive their) {
-        setMy(my);
-        setTheir(their);
-        propertiesMerger.populate(my, their);
+    public void populate(Conflict<? extends OsmPrimitive> conflict) {
+        setMy(conflict.getMy());
+        setTheir(conflict.getTheir());
+        this.conflict = conflict;
+        propertiesMerger.populate(conflict);
         if (propertiesMerger.getModel().hasVisibleStateConflict()) {
             tabbedPane.setEnabledAt(1, false);
@@ -239 +242 @@
         }
         tabbedPane.setEnabledAt(0, true);
-        tagMerger.populate(my, their);
+        tagMerger.populate(conflict);
         tabbedPane.setEnabledAt(1, true);
 
@@ -246 +249 @@
             tabbedPane.setEnabledAt(3,false);
         } else if (my instanceof Way) {
-            nodeListMerger.populate(my, their);
+            nodeListMerger.populate(conflict);
             tabbedPane.setEnabledAt(2, true);
             tabbedPane.setEnabledAt(3, false);
@@ -252 +255 @@
             tabbedPane.setIconAt(3, null);
         } else if (my instanceof Relation) {
-            relationMemberMerger.populate(my, their);
+            relationMemberMerger.populate(conflict);
             tabbedPane.setEnabledAt(2, false);
             tabbedPane.setTitleAt(2,tr("Nodes"));
@@ -271 +274 @@
         if (propertiesMerger.getModel().hasVisibleStateConflict()) {
             if (propertiesMerger.getModel().isDecidedVisibleState()) {
-                commands.addAll(propertiesMerger.getModel().buildResolveCommand(my, their));
+                commands.addAll(propertiesMerger.getModel().buildResolveCommand(conflict));
             }
         } else {
             if (tagMerger.getModel().getNumResolvedConflicts() > 0) {
-                commands.add(tagMerger.getModel().buildResolveCommand(my, their));
-            }
-            commands.addAll(propertiesMerger.getModel().buildResolveCommand(my, their));
+                commands.add(tagMerger.getModel().buildResolveCommand(conflict));
+            }
+            commands.addAll(propertiesMerger.getModel().buildResolveCommand(conflict));
             if (my instanceof Way && nodeListMerger.getModel().isFrozen()) {
                 NodeListMergeModel model  =(NodeListMergeModel)nodeListMerger.getModel();
-                commands.add(model.buildResolveCommand((Way)my, (Way)their));
+                commands.add(model.buildResolveCommand(conflict));
             } else if (my instanceof Relation && relationMemberMerger.getModel().isFrozen()) {
                 RelationMemberListMergeModel model  =(RelationMemberListMergeModel)relationMemberMerger.getModel();
@@ -286 +289 @@
             }
             if (isResolvedCompletely()) {
-                commands.add(new VersionConflictResolveCommand(my, their));
-                commands.add(new ModifiedConflictResolveCommand(my, their));
+                commands.add(new VersionConflictResolveCommand(conflict));
+                commands.add(new ModifiedConflictResolveCommand(conflict));
             }
         }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.conflict.pair;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
@@ -7 +8 @@
 
     void deletePrimitive(boolean deleted);
-    void populate(OsmPrimitive my, OsmPrimitive their);
+    void populate(Conflict<? extends OsmPrimitive> conflict);
 
 }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.command.WayNodesConflictResolverCommand;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -61 +62 @@
      * @param their  their way. Must not be null
      * @return the command
-     * @exception IllegalArgumentException thrown, if my is null or not a {@see Way}
-     * @exception IllegalArgumentException thrown, if their is null or not a {@see Way}
      * @exception IllegalStateException thrown, if the merge is not yet frozen
      */
-    public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) {
-        CheckParameterUtil.ensureParameterNotNull(my, "my");
-        CheckParameterUtil.ensureParameterNotNull(their, "their");
+    public WayNodesConflictResolverCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
         if (! isFrozen())
             throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Cannot build resolution command."));
-        return new WayNodesConflictResolverCommand(my, their, getMergedEntries());
+        return new WayNodesConflictResolverCommand(conflict, getMergedEntries());
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

@@ -4 +4 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -63 +64 @@
     }
 
-    public void populate(OsmPrimitive my, OsmPrimitive their) {
-        ((NodeListMergeModel)model).populate((Way)my, (Way)their);
+    public void populate(Conflict<? extends OsmPrimitive> conflict) {
+        ((NodeListMergeModel)model).populate((Way)conflict.getMy(), (Way)conflict.getTheir());
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -21 +21 @@
 import org.openstreetmap.josm.command.PurgePrimitivesCommand;
 import org.openstreetmap.josm.command.UndeletePrimitivesCommand;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -161 +162 @@
      * @param their their version of the primitive
      */
-    public void populate(OsmPrimitive my, OsmPrimitive their) {
-        this.my = my;
+    public void populate(Conflict<? extends OsmPrimitive> conflict) {
+        this.my = conflict.getMy();
+        OsmPrimitive their = conflict.getTheir();
         if (my instanceof Node) {
             myCoords = ((Node)my).getCoor();
@@ -171 +173 @@
         }
 
-        myDeletedState = my.isDeleted();
+        myDeletedState =  conflict.isMyDeleted() || my.isDeleted();
         theirDeletedState = their.isDeleted();
 
@@ -418 +420 @@
      * @return the list of commands
      */
-    public List<Command> buildResolveCommand(OsmPrimitive my, OsmPrimitive their) throws OperationCancelledException{
-        ArrayList<Command> cmds = new ArrayList<Command>();
+    public List<Command> buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) throws OperationCancelledException{
+        OsmPrimitive my = conflict.getMy();
+        List<Command> cmds = new ArrayList<Command>();
         if (hasVisibleStateConflict() && isDecidedVisibleState()) {
             if (isVisibleStateDecision(MergeDecisionType.KEEP_MINE)) {
@@ -436 +439 @@
         }
         if (hasCoordConflict() && isDecidedCoord()) {
-            cmds.add(new CoordinateConflictResolveCommand((Node)my, (Node)their, coordMergeDecision));
+            cmds.add(new CoordinateConflictResolveCommand(conflict, coordMergeDecision));
         }
         if (hasDeletedStateConflict() && isDecidedDeletedState()) {
-            cmds.add(new DeletedStateConflictResolveCommand(my, their, deletedMergeDecision));
+            cmds.add(new DeletedStateConflictResolveCommand(conflict, deletedMergeDecision));
         }
         return cmds;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -22 +22 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -718 +719 @@
     }
 
-    public void populate(OsmPrimitive my, OsmPrimitive their) {
-        model.populate(my, their);
+    public void populate(Conflict<? extends OsmPrimitive> conflict) {
+        model.populate(conflict);
     }
 }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

@@ -5 +5 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -54 +55 @@
     }
 
-    public void populate(OsmPrimitive my, OsmPrimitive their) {
+    public void populate(Conflict<? extends OsmPrimitive> conflict) {
         RelationMemberListMergeModel model = (RelationMemberListMergeModel)getModel();
-        model.populate((Relation)my, (Relation)their);
+        model.populate((Relation)conflict.getMy(), (Relation)conflict.getTheir());
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.command.TagConflictResolveCommand;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
@@ -189 +190 @@
     }
 
-    public TagConflictResolveCommand buildResolveCommand(OsmPrimitive my, OsmPrimitive their) {
-        return new TagConflictResolveCommand(my,  their, tagMergeItems);
+    public TagConflictResolveCommand buildResolveCommand(Conflict<? extends OsmPrimitive> conflict) {
+        return new TagConflictResolveCommand(conflict, tagMergeItems);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -26 +26 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
@@ -421 +422 @@
     }
 
-    public void populate(OsmPrimitive my, OsmPrimitive their) {
-        model.populate(my, their);
+    public void populate(Conflict<? extends OsmPrimitive> conflict) {
+        model.populate(conflict.getMy(), conflict.getTheir());
         mineTable.getSelectionModel().setSelectionInterval(0, 0);
         theirTable.getSelectionModel().setSelectionInterval(0, 0);