Changeset 13925 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2018-06-13T00:05:31+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #13467 - use DataSelectionListener everywhere. Deprecate SelectionChangedListener

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -42 +42 @@
 import org.openstreetmap.josm.actions.relation.EditRelationAction;
 import org.openstreetmap.josm.actions.relation.SelectInRelationListAction;
-import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -65 +65 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.PrimitiveRenderer;
-import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.datatransfer.PrimitiveTransferable;
@@ -165 +165 @@
     @Override
     public void showNotify() {
-        SelectionEventManager.getInstance().addSelectionListener(actShowHistory, FireMode.IN_EDT_CONSOLIDATED);
-        SelectionEventManager.getInstance().addSelectionListener(model, FireMode.IN_EDT_CONSOLIDATED);
+        SelectionEventManager.getInstance().addSelectionListenerForEdt(actShowHistory);
+        SelectionEventManager.getInstance().addSelectionListenerForEdt(model);
         DatasetEventManager.getInstance().addDatasetListener(model, FireMode.IN_EDT);
         MainApplication.getLayerManager().addActiveLayerChangeListener(actSearch);
@@ -339 +339 @@
      * The action for showing history information of the current history item.
      */
-    class ShowHistoryAction extends AbstractAction implements ListSelectionListener, SelectionChangedListener {
+    class ShowHistoryAction extends AbstractAction implements ListSelectionListener, DataSelectionListener {
         /**
          * Constructs a new {@code ShowHistoryAction}.
@@ -372 +372 @@
 
         @Override
-        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-            updateEnabledState(newSelection.size());
+        public void selectionChanged(SelectionChangeEvent event) {
+            updateEnabledState(event.getSelection().size());
         }
     }
@@ -461 +461 @@
      */
     static class SelectionListModel extends AbstractListModel<OsmPrimitive>
-    implements ActiveLayerChangeListener, SelectionChangedListener, DataSetListener {
+    implements ActiveLayerChangeListener, DataSelectionListener, DataSetListener {
 
         private static final int SELECTION_HISTORY_SIZE = 10;
@@ -673 +673 @@
 
         /* ------------------------------------------------------------------------ */
-        /* interface SelectionChangedListener                                       */
+        /* interface DataSelectionListener                                          */
         /* ------------------------------------------------------------------------ */
         @Override
-        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-            setJOSMSelection(newSelection);
+        public void selectionChanged(SelectionChangeEvent event) {
+            setJOSMSelection(event.getSelection());
         }