Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties

Timestamp:

2010-02-04T21:04:02+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4408 confict manager: do not have to solve tag- and element-conficts when deleting

Location:

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

Files:

• PropertiesMergeModel.java (modified) (5 diffs)
• PropertiesMerger.java (modified) (3 diffs)

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

@@ -53 +53 @@
 
     static public final String RESOLVED_COMPLETELY_PROP = PropertiesMergeModel.class.getName() + ".resolvedCompletely";
+    static public final String DELETE_PRIMITIVE_PROP = PropertiesMergeModel.class.getName() + ".deletePrimitive";
 
     private OsmPrimitive my;
@@ -287 +288 @@
     }
 
+    private boolean getMergedDeletedState(MergeDecisionType decision) {
+        switch (decision) {
+        case KEEP_MINE:
+            return myDeletedState;
+        case KEEP_THEIR:
+            return theirDeletedState;
+        default:
+            return false;
+        }
+    }
+
     /**
      * decides the conflict between two deleted states
@@ -295 +307 @@
     public void decideDeletedStateConflict(MergeDecisionType decision) throws IllegalArgumentException{
         CheckParameterUtil.ensureParameterNotNull(decision, "decision");
+
+        boolean oldMergedDeletedState = getMergedDeletedState(this.deletedMergeDecision);
+        boolean newMergedDeletedState = getMergedDeletedState(decision);
+
         this.deletedMergeDecision = decision;
         setChanged();
         notifyObservers();
         fireCompletelyResolved();
+
+        if (oldMergedDeletedState != newMergedDeletedState) {
+            support.firePropertyChange(DELETE_PRIMITIVE_PROP, oldMergedDeletedState, newMergedDeletedState);
+        }
     }
 
@@ -478 +498 @@
                         dependent.size(), dependent.size(), way.getId())
                         + "</html>",
-                tr("Undelete additional nodes?"),
-                JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE,
-                null,
-                options,
-                options[0]
+                        tr("Undelete additional nodes?"),
+                        JOptionPane.YES_NO_OPTION,
+                        JOptionPane.QUESTION_MESSAGE,
+                        null,
+                        options,
+                        options[0]
         );
 
@@ -512 +532 @@
                         dependent.size(), dependent.size(), r.getId())
                         + "</html>",
-                tr("Undelete dependent primitives?"),
-                JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE,
-                null,
-                options,
-                options[0]
+                        tr("Undelete dependent primitives?"),
+                        JOptionPane.YES_NO_OPTION,
+                        JOptionPane.QUESTION_MESSAGE,
+                        null,
+                        options,
+                        options[0]
         );
 

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

@@ -22 +22 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -30 +31 @@
  *
  */
-public class PropertiesMerger extends JPanel implements Observer {
+public class PropertiesMerger extends JPanel implements Observer, IConflictResolver {
     private static DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
 
@@ -650 +651 @@
         }
     }
+
+    public void deletePrimitive(boolean deleted) {
+        // Do nothing
+    }
 }