Changeset 30307 in osm for applications/editors/josm


Ignore:
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
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/reverter/build.xml

    r30258 r30307  
    44    <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="6798"/>
     6    <property name="plugin.main.version" value="6887"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

    r30031 r30307  
    1313import org.openstreetmap.josm.Main;
    1414import org.openstreetmap.josm.command.Command;
    15 import org.openstreetmap.josm.command.ConflictAddCommand;
    1615import org.openstreetmap.josm.command.DeleteCommand;
     16import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
    1717import org.openstreetmap.josm.data.conflict.Conflict;
    1818import org.openstreetmap.josm.data.coor.LatLon;

  • applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetTask.java

    r30031 r30307  
    99import org.openstreetmap.josm.Main;
    1010import org.openstreetmap.josm.command.Command;
    11 import org.openstreetmap.josm.command.ConflictAddCommand;
     11import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
    1212import org.openstreetmap.josm.gui.Notification;
    1313import org.openstreetmap.josm.gui.PleaseWaitRunnable;

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

    r30110 r30307  
    44    <property name="commit.message" value="Adapt to JOSM core change (DefaultNameFormatter)"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="6437"/>
     6    <property name="plugin.main.version" value="6887"/>
    77
    88    <property name="test.build.dir" value="test/build"/>

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

    r30237 r30307  
    3737import org.openstreetmap.josm.command.AddCommand;
    3838import org.openstreetmap.josm.command.ChangeCommand;
    39 import org.openstreetmap.josm.command.ConflictAddCommand;
     39import org.openstreetmap.josm.command.conflict.ConflictAddCommand;
    4040import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
    4141import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
Note: See TracChangeset for help on using the changeset viewer.