Changeset 1954 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

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/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• . (added)
• relation (moved) (moved from trunk/src/org/openstreetmap/josm/gui/conflict/relation )
• relation/RelationMemberListMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.conflict.relation;
+package org.openstreetmap.josm.gui.conflict.pair.relation;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.conflict.ListMergeModel;
-import org.openstreetmap.josm.gui.conflict.ListRole;
+import org.openstreetmap.josm.gui.conflict.pair.ListMergeModel;
+import org.openstreetmap.josm.gui.conflict.pair.ListRole;
 /**
  * The model for merging two lists of relation members