Changeset 1654 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2009-06-07T23:22:54+02:00 (15 years ago)

Author:

Gubaer

Message:

added merge support for coordinate conflicts
added merge support for conflicts due to different deleted states

Location:

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags

Files:

• TagMergeItemTest.java (modified) (1 diff)
• TagMergeModelTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java

@@ -4 +4 @@
 import org.junit.*;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.gui.conflict.tags.MergeDecisionType;
+import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
 

trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java

@@ -12 +12 @@
 import org.junit.Test;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
 
 public class TagMergeModelTest {