Changeset 14247 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2018-09-12T00:54:12+02:00 (6 years ago)

Author:

Don-vip

Message:

remove stuff deprecated in June. RIP SelectionChangedListener

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.DataSource;
 import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -48 +47 @@
 import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
 import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
-import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
@@ -178 +176 @@
         // the listener, projection change listeners are managed as WeakReferences.
         ProjectionRegistry.addProjectionChangeListener(this);
-        addSelectionListener((DataSelectionListener) e -> fireSelectionChange(e.getSelection()));
     }
 
@@ -541 +538 @@
     public void removeSelectionListener(DataSelectionListener listener) {
         selectionListeners.removeListener(listener);
-    }
-
-    /*---------------------------------------------------
-     *   OLD SELECTION HANDLING
-     *---------------------------------------------------*/
-
-    /**
-     * A list of listeners to selection changed events. The list is static, as listeners register
-     * themselves for any dataset selection changes that occur, regardless of the current active
-     * dataset. (However, the selection does only change in the active layer)
-     * @deprecated to be removed
-     */
-    @Deprecated
-    private static final Collection<SelectionChangedListener> selListeners = new CopyOnWriteArrayList<>();
-
-    /**
-     * Adds a new selection listener.
-     * @param listener The selection listener to add
-     * @see #addSelectionListener(DataSelectionListener)
-     * @see SelectionEventManager#removeSelectionListener(SelectionChangedListener)
-     * @deprecated Use {@link SelectionEventManager#addSelectionListener(DataSelectionListener)} instead
-     */
-    @Deprecated
-    public static void addSelectionListener(SelectionChangedListener listener) {
-        ((CopyOnWriteArrayList<SelectionChangedListener>) selListeners).addIfAbsent(listener);
-    }
-
-    /**
-     * Removes a selection listener.
-     * @param listener The selection listener to remove
-     * @see #removeSelectionListener(DataSelectionListener)
-     * @see SelectionEventManager#removeSelectionListener(SelectionChangedListener)
-     * @deprecated Use {@link SelectionEventManager#removeSelectionListener(DataSelectionListener)} instead
-     */
-    @Deprecated
-    public static void removeSelectionListener(SelectionChangedListener listener) {
-        selListeners.remove(listener);
-    }
-
-    /**
-     * @deprecated to be removed
-     * @param currentSelection current selection
-     */
-    @Deprecated
-    private static void fireSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
-        for (SelectionChangedListener l : selListeners) {
-            l.selectionChanged(currentSelection);
-        }
     }