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

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

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.conflict.pair.nodes;
-
-import java.util.logging.Logger;
 
 import javax.swing.JScrollPane;
@@ -8 +6 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
 
@@ -14 +13 @@
  *
  */
-public class NodeListMerger extends ListMerger<Node> {
-    private static final Logger logger = Logger.getLogger(NodeListMerger.class.getName());
+public class NodeListMerger extends ListMerger<Node> implements IConflictResolver {
+    //private static final Logger logger = Logger.getLogger(NodeListMerger.class.getName());
 
     public NodeListMerger() {
@@ -66 +65 @@
         ((NodeListMergeModel)model).populate(my, their);
     }
+
+    public void deletePrimitive(boolean deleted) {
+        if (deleted) {
+            model.setFrozen(true);
+            model.clearMerged();
+        } else {
+            model.setFrozen(false);
+        }
+    }
 }