Changeset 33197 in osm for applications/editors/josm

Timestamp:

2017-03-24T23:18:22+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 11772

Location:

applications/editors/josm/plugins/opendata

Files:

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

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="11606"/>
+    <property name="plugin.main.version" value="11772"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

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

@@ -14 +14 @@
 import java.util.Set;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.CombineWayAction.NodeGraph;
 import org.openstreetmap.josm.command.Command;
@@ -131 +132 @@
         completeTagCollectionForEditing(tagsToEdit);
 
-        CombinePrimitiveResolverDialog dialog = CombinePrimitiveResolverDialog.getInstance();
+        CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(Main.parent);
         dialog.getTagConflictResolverModel().populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues());
         dialog.setTargetPrimitive(targetWay);