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

Timestamp:

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

Author:

donvip

Message:

[josm_opendata] Update to JOSM 5132

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/build.xml

@@ -28 +28 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5124"/>
+    <property name="plugin.main.version" value="5132"/>
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
@@ -177 +177 @@
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/OpenData"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+                <attribute name="Plugin-Requires" value="jts"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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,