Changeset 34530 in osm for applications/editors


Ignore:
Timestamp:
2018-08-18T18:48:33+02:00 (6 years ago)
Author:
donvip
Message:

update to JOSM 14153

Location:
applications/editors/josm/plugins/merge-overlap
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/merge-overlap/build.xml

    r33848 r34530  
    44    <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="12840"/>
     6    <property name="plugin.main.version" value="14153"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).
  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

    r34056 r34530  
    1919import java.util.Set;
    2020
    21 import org.openstreetmap.josm.Main;
    2221import org.openstreetmap.josm.actions.JosmAction;
    2322import org.openstreetmap.josm.command.ChangeCommand;
     
    2726import org.openstreetmap.josm.command.SplitWayCommand;
    2827import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
     28import org.openstreetmap.josm.data.UndoRedoHandler;
    2929import org.openstreetmap.josm.data.osm.Node;
    3030import org.openstreetmap.josm.data.osm.NodeGraph;
     
    229229
    230230        // Commit
    231         Main.main.undoRedo.add(new SequenceCommand(tr("Merge Overlap (combine)"), cmds));
     231        UndoRedoHandler.getInstance().add(new SequenceCommand(tr("Merge Overlap (combine)"), cmds));
    232232        getLayerManager().getEditDataSet().setSelected(sel);
    233233        MainApplication.getMap().repaint();
  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java

    r34056 r34530  
    88import java.util.Map;
    99
    10 import org.openstreetmap.josm.Main;
    1110import org.openstreetmap.josm.command.ChangePropertyCommand;
    1211import org.openstreetmap.josm.command.Command;
     
    1514import org.openstreetmap.josm.data.osm.TagCollection;
    1615import org.openstreetmap.josm.data.osm.Way;
     16import org.openstreetmap.josm.gui.MainApplication;
    1717import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
    1818import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel;
     
    6666    public static MyCombinePrimitiveResolverDialog getInstance() {
    6767        if (instance == null) {
    68             GuiHelper.runInEDTAndWait(() -> instance = new MyCombinePrimitiveResolverDialog(Main.parent));
     68            GuiHelper.runInEDTAndWait(() -> instance = new MyCombinePrimitiveResolverDialog(MainApplication.getMainFrame()));
    6969        }
    7070        return instance;
  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java

    r33154 r34530  
    77import java.util.Map;
    88
    9 import mergeoverlap.MergeOverlapAction;
    10 
    119import org.openstreetmap.josm.command.Command;
    1210import org.openstreetmap.josm.data.osm.OsmPrimitive;
     
    1614import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecision;
    1715import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolverModel;
     16
     17import mergeoverlap.MergeOverlapAction;
    1818
    1919/**
Note: See TracChangeset for help on using the changeset viewer.