Changeset 14135 in josm for trunk/src/org/openstreetmap/josm


Ignore:
Timestamp:
2018-08-11T23:50:31+02:00 (14 months ago)
Author:
Don-vip
Message:

see #15229 - fix deprecation warnings

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r14134 r14135  
    4141import org.openstreetmap.josm.data.osm.TagCollection;
    4242import org.openstreetmap.josm.data.osm.Way;
    43 import org.openstreetmap.josm.gui.MainApplication;
    4443import org.openstreetmap.josm.gui.Notification;
    4544import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
     
    16021601        cmds.clear();
    16031602        if (Main.main != null && addUndoRedo) {
    1604             UndoRedoHandler ur = MainApplication.undoRedo;
     1603            UndoRedoHandler ur = UndoRedoHandler.getInstance();
    16051604            int i = Math.max(ur.commands.size() - cmdsCount, 0);
    16061605            for (; i < ur.commands.size(); i++) {
  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r14134 r14135  
    251251            Layer layer = e.getRemovedLayer();
    252252            if (layer instanceof OsmDataLayer) {
    253                 undoRedo.clean(((OsmDataLayer) layer).getDataSet());
     253                UndoRedoHandler.getInstance().clean(((OsmDataLayer) layer).getDataSet());
    254254            }
    255255        }
     
    415415            new InitializationTask(tr("Building main menu"), this::initializeMainWindow),
    416416            new InitializationTask(tr("Updating user interface"), () -> {
    417                 undoRedo.addCommandQueueListener(redoUndoListener);
     417                UndoRedoHandler.getInstance().addCommandQueueListener(redoUndoListener);
    418418                // creating toolbar
    419419                GuiHelper.runInEDTAndWait(() -> contentPanePrivate.add(toolbar.control, BorderLayout.NORTH));
Note: See TracChangeset for help on using the changeset viewer.