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

Timestamp:

04.02.2010 21:04:02 (2 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/properties/PropertiesMerger.java (modified) (3 diffs)

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