Changeset 2658 in josm for trunk

Timestamp:

2009-12-19T14:06:51+01:00 (15 years ago)

Author:

jttt

Message:

Do not update properties and selection dialogs when hidden

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/event/DatasetEventManager.java (modified) (3 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (5 diffs)
• gui/dialogs/properties/ListOfUsedTags.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm.event;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Queue;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -32 +31 @@
 
     private final Queue<AbstractDatasetChangedEvent> eventsInEDT = new LinkedBlockingQueue<AbstractDatasetChangedEvent>();
-    private final List<DataSetListener> inEDTListeners = new ArrayList<DataSetListener>();
-    private final List<DataSetListener> normalListeners = new ArrayList<DataSetListener>();
+    private final CopyOnWriteArrayList<DataSetListener> inEDTListeners = new CopyOnWriteArrayList<DataSetListener>();
+    private final CopyOnWriteArrayList<DataSetListener> normalListeners = new CopyOnWriteArrayList<DataSetListener>();
     private final DataSetListener myListener = new DataSetListenerAdapter(this);
 
@@ -48 +47 @@
     public void addDatasetListener(DataSetListener listener, boolean fireInEDT) {
         if (fireInEDT) {
-            inEDTListeners.add(listener);
+            inEDTListeners.addIfAbsent(listener);
         } else {
-            normalListeners.add(listener);
+            normalListeners.addIfAbsent(listener);
         }
     }

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

@@ -18 +18 @@
 import java.util.Collections;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.NoSuchElementException;
 
@@ -46 +45 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -57 +55 @@
  * @author imi
  */
-public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener, MapView.LayerChangeListener {
+public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener, MapView.EditLayerChangeListener {
 
     private static final int SELECTION_HISTORY_SIZE = 10;
@@ -162 +160 @@
         }
 
-        DataSet.selListeners.add(this);
-        MapView.addLayerChangeListener(this);
+        MapView.addEditLayerChangeListener(this);
     }
 
     @Override
     public void tearDown() {
-        MapView.removeLayerChangeListener(this);
+        MapView.removeEditLayerChangeListener(this);
+    }
+
+    @Override
+    public void showNotify() {
+        DataSet.selListeners.add(this);
+        updateSelection();
+    }
+
+    @Override
+    public void hideNotify() {
         DataSet.selListeners.remove(this);
     }
@@ -370 +377 @@
     }
 
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        if (newLayer instanceof OsmDataLayer) {
-            OsmDataLayer dataLayer = (OsmDataLayer)newLayer;
-            selectionChanged(dataLayer.data.getSelected());
+    private void updateSelection() {
+        if (Main.main.getCurrentDataSet() == null) {
+            selectionChanged(Collections.<OsmPrimitive>emptyList());
         } else {
-            List<OsmPrimitive> selection = Collections.emptyList();
-            selectionChanged(selection);
-        }
-    }
-
-    public void layerAdded(Layer newLayer) {
-        // do nothing
-    }
-
-    public void layerRemoved(Layer oldLayer) {
-        // do nothing
+            selectionChanged(Main.main.getCurrentDataSet().getSelected());
+        }
+    }
+
+    public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
+        updateSelection();
     }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/ListOfUsedTags.java

@@ -47 +47 @@
         else
             return values;
+    }
+
+    public void rebuildNecessary() {
+        dirty = true;
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -71 +71 @@
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
@@ -97 +96 @@
  * @author imi
  */
-public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView.LayerChangeListener {
+public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView.EditLayerChangeListener {
     /**
      * Watches for double clicks and from editing or new property, depending on the
@@ -145 +144 @@
     public void showNotify() {
         DatasetEventManager.getInstance().addDatasetListener(listOfUsedTags, false);
+        listOfUsedTags.rebuildNecessary();
+        DataSet.selListeners.add(this);
+        updateSelection();
     }
 
@@ -150 +152 @@
     public void hideNotify() {
         DatasetEventManager.getInstance().removeDatasetListener(listOfUsedTags);
+        DataSet.selListeners.remove(this);
     }
 
@@ -568 +571 @@
         add(buttonPanel, BorderLayout.SOUTH);
 
-        DataSet.selListeners.add(this);
-        MapView.addLayerChangeListener(this);
+        MapView.addEditLayerChangeListener(this);
     }
 
     @Override
     public void tearDown() {
-        MapView.removeLayerChangeListener(this);
+        MapView.removeEditLayerChangeListener(this);
     }
 
@@ -776 +778 @@
     }
 
+    private void updateSelection() {
+        if (Main.main.getCurrentDataSet() == null) {
+            selectionChanged(Collections.<OsmPrimitive>emptyList());
+        } else {
+            selectionChanged(Main.main.getCurrentDataSet().getSelected());
+        }
+    }
+
     /* ---------------------------------------------------------------------------------- */
-    /* LayerChangeListener                                                                */
+    /* EditLayerChangeListener                                                                */
     /* ---------------------------------------------------------------------------------- */
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        if (newLayer instanceof OsmDataLayer) {
-            OsmDataLayer dataLayer = (OsmDataLayer)newLayer;
-            selectionChanged(dataLayer.data.getSelected());
-        } else {
-            List<OsmPrimitive> selection = Collections.emptyList();
-            selectionChanged(selection);
-        }
-    }
-
-    public void layerAdded(Layer newLayer) {
-        // do nothing
-    }
-
-    public void layerRemoved(Layer oldLayer) {
-        // do nothing
+    public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
+        updateSelection();
     }