Changeset 31732 in osm for applications/editors/josm/plugins/merge-overlap

Timestamp:

2015-11-07T18:14:29+01:00 (9 years ago)

Author:

simon04

Message:

JOSM/merge-overlap: update due to core API change - see #josm12047

Location:

applications/editors/josm/plugins/merge-overlap

Files:

• build.xml (modified) (1 diff)
• src/mergeoverlap/MergeOverlapAction.java (modified) (1 diff)

applications/editors/josm/plugins/merge-overlap/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8919"/>
+    <property name="plugin.main.version" value="8974"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

@@ -559 +559 @@
         if (askForMergeTag(ways) || duplicateParentRelations(ways)) {
             dialog.setVisible(true);
-            if (dialog.isCanceled())
+            if (!dialog.isApplied())
                 throw new UserCancelException();
         }