Changeset 30307 in osm for applications/editors/josm/plugins/turnrestrictions

Timestamp:

2014-02-26T23:49:03+01:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] update to JOSM 6887

Location:

applications/editors/josm/plugins/turnrestrictions

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java (modified) (1 diff)

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

@@ -4 +4 @@
     <property name="commit.message" value="Adapt to JOSM core change (DefaultNameFormatter)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6437"/>
+    <property name="plugin.main.version" value="6887"/>
 
     <property name="test.build.dir" value="test/build"/>

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

@@ -37 +37 @@
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.ConflictAddCommand;
+import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;