Changeset 684 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-07-07T02:00:28+02:00 (16 years ago)

Author:

framm

Message:

• update relation list after loading data. fixes #913.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (1 diff)
• dialogs/RelationListDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -153 +153 @@
                 for (Layer.LayerChangeListener l : Layer.listeners)
                         l.layerAdded(layer);
-
                 // autoselect the new layer
+                Layer old = activeLayer;
                 setActiveLayer(layer);
+                for (Layer.LayerChangeListener l : Layer.listeners)
+                        l.activeLayerChange(old, layer);
                 repaint();
         }

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

@@ -131 +131 @@
         
         public void activeLayerChange(Layer a, Layer b) {
-                if (a instanceof OsmDataLayer && b instanceof OsmDataLayer) {
-                        ((OsmDataLayer)a).listenerDataChanged.remove(this);
+                if ((a == null || a instanceof OsmDataLayer) && b instanceof OsmDataLayer) {
+                        if (a != null) ((OsmDataLayer)a).listenerDataChanged.remove(this);
                         ((OsmDataLayer)b).listenerDataChanged.add(this);
                         updateList();