Changeset 13010 in josm for trunk/src/org

Timestamp:

2017-10-17T11:20:34+02:00 (7 years ago)

Author:

bastiK

Message:

see #14120 - fix use of deprecated API (selection handling)

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data;
 
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.Optional;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -93 +90 @@
      */
     public synchronized void add(final Command c) {
-        DataSet ds = Optional.ofNullable(c.getAffectedDataSet()).orElseGet(() -> Main.main.getEditDataSet());
-        Collection<? extends OsmPrimitive> oldSelection = null;
-        if (ds != null) {
-            oldSelection = ds.getSelected();
-        }
         addNoRedraw(c);
         afterAdd();
-
-        // the command may have changed the selection so tell the listeners about the current situation
-        if (ds != null) {
-            fireIfSelectionChanged(ds, oldSelection);
-        }
     }
 
@@ -122 +109 @@
             return;
         DataSet ds = Main.main.getEditDataSet();
-        Collection<? extends OsmPrimitive> oldSelection = null;
         if (ds != null) {
-            oldSelection = ds.getSelected();
             ds.beginUpdate();
         }
@@ -142 +127 @@
         }
         fireCommandsChanged();
-        if (ds != null) {
-            fireIfSelectionChanged(ds, oldSelection);
-        }
     }
 
@@ -161 +143 @@
         if (redoCommands.isEmpty())
             return;
-        DataSet ds = Main.main.getEditDataSet();
-        Collection<? extends OsmPrimitive> oldSelection = ds.getSelected();
         for (int i = 0; i < num; ++i) {
             final Command c = redoCommands.removeFirst();
@@ -172 +152 @@
         }
         fireCommandsChanged();
-        fireIfSelectionChanged(ds, oldSelection);
-    }
-
-    private static void fireIfSelectionChanged(DataSet ds, Collection<? extends OsmPrimitive> oldSelection) {
-        Collection<? extends OsmPrimitive> newSelection = ds.getSelected();
-        if (!oldSelection.equals(newSelection)) {
-            ds.fireSelectionChanged();
-        }
     }