Changeset 28172 in osm for applications/editors/josm/plugins/opendata/src

Timestamp:

2012-03-31T23:23:15+02:00 (13 years ago)

Author:

donvip

Message:

[josm_opendata] Update to JOSM 5132

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java

@@ -28 +28 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.actions.CombineWayAction;
 import org.openstreetmap.josm.actions.CombineWayAction.NodeGraph;
 import org.openstreetmap.josm.command.Command;
@@ -34 +33 @@
 import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.TagCollection;
@@ -148 +148 @@
         dialog.getTagConflictResolverModel().populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues());
         dialog.setTargetPrimitive(targetWay);
-        Set<Relation> parentRelations = CombineWayAction.getParentRelations(ways);
+        Set<Relation> parentRelations = OsmPrimitive.getParentRelations(ways);
         dialog.getRelationMemberConflictResolverModel().populate(
                 parentRelations,