Changeset 1954 in josm for trunk/test/functional

Timestamp:

2009-08-11T13:23:06+02:00 (15 years ago)

Author:

Gubaer

Message:

Moved package org.openstreetmap.josm.gui.conflict to org.openstreetmap.josm.gui.conflict.pair

Location:

trunk/test/functional/org/openstreetmap/josm/gui/conflict

Files:

• nodes/NodeListMergerTest.java (modified) (1 diff)
• properties/PropertiesMergerTest.java (modified) (1 diff)
• relation/RelationMemberMergerTest.java (modified) (1 diff)
• tags/TagMergerTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergerTest.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMerger;
 
 public class NodeListMergerTest extends JFrame {

trunk/test/functional/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergerTest.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.projection.Epsg4326;
+import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
 
 public class PropertiesMergerTest extends JFrame{

trunk/test/functional/org/openstreetmap/josm/gui/conflict/relation/RelationMemberMergerTest.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberMerger;
 
 public class RelationMemberMergerTest extends JFrame {

trunk/test/functional/org/openstreetmap/josm/gui/conflict/tags/TagMergerTest.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
-import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
-import org.openstreetmap.josm.gui.conflict.tags.TagMerger;
+import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
+import org.openstreetmap.josm.gui.conflict.pair.tags.TagMerger;
 
 public class TagMergerTest extends JFrame {