Changeset 30712 in osm for applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

Timestamp:

2014-10-12T12:10:09+02:00 (11 years ago)

Author:

donvip

Message:

[josm_mege_overlap] move duplicated code to "hack" package and move inner classes into separate files + code alignment of MyTagConflictResolver* to latest version of JOSM classes

File:

• applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (modified) (1 diff)

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

@@ -22 +22 @@
 
 import javax.swing.JOptionPane;
+
+import mergeoverlap.hack.MyCombinePrimitiveResolverDialog;
 
 import org.openstreetmap.josm.Main;