Changeset 14247 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm

Timestamp:

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

Author:

Don-vip

Message:

remove stuff deprecated in June. RIP SelectionChangedListener

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/event/SelectionEventManagerTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/event/SelectionEventManagerTest.java

@@ -12 +12 @@
 import org.junit.Test;
 import org.openstreetmap.josm.command.CommandTest.CommandTestDataWithRelation;
-import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -27 +25 @@
  * @since 12048
  */
-@SuppressWarnings("deprecation")
 public class SelectionEventManagerTest {
-    private final class SelectionListener implements SelectionChangedListener, DataSelectionListener {
+    private final class SelectionListener implements DataSelectionListener {
         private Collection<? extends OsmPrimitive> newSelection;
         private final String name;
@@ -35 +32 @@
         SelectionListener(String name) {
             this.name = name;
-        }
-
-        @Override
-        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-            this.newSelection = newSelection;
         }
 
@@ -65 +57 @@
         assertEquals(testData1.layer, MainApplication.getLayerManager().getEditLayer());
 
-        SelectionListener listener1 = new SelectionListener("IMMEDIATELY");
-        SelectionListener listener2 = new SelectionListener("IN_EDT_CONSOLIDATED");
         SelectionListener listener3 = new SelectionListener("normal");
         SelectionListener listener4 = new SelectionListener("edt");
         SelectionEventManager instance = SelectionEventManager.getInstance();
-        instance.addSelectionListener(listener1, FireMode.IMMEDIATELY);
-        instance.addSelectionListener(listener2, FireMode.IN_EDT_CONSOLIDATED);
         instance.addSelectionListener(listener3);
         instance.addSelectionListenerForEdt(listener4);
-        List<SelectionListener> listeners = Arrays.asList(listener1, listener2, listener3, listener4);
+        List<SelectionListener> listeners = Arrays.asList(listener3, listener4);
         assertSelectionEquals(listeners, null);
 
@@ -99 +87 @@
 
         // removal
-        instance.removeSelectionListener((SelectionChangedListener) listener1);
-        instance.removeSelectionListener((SelectionChangedListener) listener2);
-        instance.removeSelectionListener((DataSelectionListener) listener3);
-        instance.removeSelectionListener((DataSelectionListener) listener4);
+        instance.removeSelectionListener(listener3);
+        instance.removeSelectionListener(listener4);
 
         // no event triggered now