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

Timestamp:

2017-05-10T23:24:52+02:00 (8 years ago)

Author:

michael2402

Message:

Fix #14765: Don't use runAndWait for table updates.

UserListDialog now does all table updates in EDT, this should make it thread safe. There was a bug where changes of the active layer were not registered when showing the dialog. This is fixed, too.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified) (10 diffs)

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

@@ -31 +31 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AbstractInfoAction;
-import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -51 +51 @@
  *
  */
-public class UserListDialog extends ToggleDialog implements SelectionChangedListener, ActiveLayerChangeListener {
+public class UserListDialog extends ToggleDialog implements DataSelectionListener, ActiveLayerChangeListener {
 
     /**
@@ -71 +71 @@
     @Override
     public void showNotify() {
-        DataSet.addSelectionListener(this);
+        SelectionEventManager.getInstance().addSelectionListenerForEdt(this);
         Main.getLayerManager().addActiveLayerChangeListener(this);
     }
@@ -78 +78 @@
     public void hideNotify() {
         Main.getLayerManager().removeActiveLayerChangeListener(this);
-        DataSet.removeSelectionListener(this);
+        SelectionEventManager.getInstance().removeSelectionListener(this);
     }
 
@@ -103 +103 @@
     }
 
-    /**
-     * Called when the selection in the dataset changed.
-     * @param newSelection The new selection array.
-     */
-    @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        refresh(newSelection);
+    @Override
+    public void selectionChanged(SelectionChangeEvent event) {
+        refresh(event.getSelection());
     }
 
@@ -115 +111 @@
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
         Layer activeLayer = e.getSource().getActiveLayer();
+        refreshForActiveLayer(activeLayer);
+    }
+
+    private void refreshForActiveLayer(Layer activeLayer) {
         if (activeLayer instanceof OsmDataLayer) {
             refresh(((OsmDataLayer) activeLayer).data.getAllSelected());
@@ -127 +127 @@
      */
     public void refresh(Collection<? extends OsmPrimitive> fromPrimitives) {
-        model.populate(fromPrimitives);
         GuiHelper.runInEDT(() -> {
+            model.populate(fromPrimitives);
             if (model.getRowCount() != 0) {
                 setTitle(trn("{0} Author", "{0} Authors", model.getRowCount(), model.getRowCount()));
@@ -140 +140 @@
     public void showDialog() {
         super.showDialog();
-        Layer layer = Main.getLayerManager().getActiveLayer();
-        if (layer instanceof OsmDataLayer) {
-            refresh(((OsmDataLayer) layer).data.getAllSelected());
-        }
+        refreshForActiveLayer(Main.getLayerManager().getActiveLayer());
     }
 
@@ -308 +305 @@
 
         public void populate(Collection<? extends OsmPrimitive> primitives) {
+            GuiHelper.assertCallFromEdt();
             Map<User, Integer> statistics = computeStatistics(primitives);
             data.clear();
@@ -316 +314 @@
             }
             Collections.sort(data);
-            GuiHelper.runInEDTAndWait(this::fireTableDataChanged);
+            this.fireTableDataChanged();
         }