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

Timestamp:

2013-10-29T01:12:33+01:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] update to [josm6340]

Location:

applications/editors/josm/plugins/merge-overlap

Files:

• build.xml (modified) (1 diff)
• src/mergeoverlap/MyCombinePrimitiveResolverDialog.java (modified) (2 diffs)

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="6162"/>
+    <property name="plugin.main.version" value="6340"/>
     
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -70 +70 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
-import org.openstreetmap.josm.gui.JMultilineLabel;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.conflict.tags.MultiValueCellEditor;
@@ -83 +82 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;