Changeset 348 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

Timestamp:

2007-10-07T19:36:54+02:00 (19 years ago)

Author:

framm

Message:

• bugfix refresh relation list
• bugfix NPE on clicking "select" in relation editors with no members selected

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (4 diffs)

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.layer.DataChangeListener;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -42 +46 @@
  * @author Frederik Ramm <frederik@remote.org>
  */
-public class RelationListDialog extends ToggleDialog {
+public class RelationListDialog extends ToggleDialog implements LayerChangeListener, DataChangeListener {
 
         /**
@@ -95 +99 @@
                         }
                 }));
-                
+                Layer.listeners.add(this);
                 add(buttonPanel, BorderLayout.SOUTH);
-                
-                /*
-                DataSet.dataListeners.add(new DataChangedListener() {
-                        public void dataChanged() {
-                                updateList();
-                                repaint();
-                        }
-                });
-                */
         }
 
@@ -133 +128 @@
         }
         
+        public void activeLayerChange(Layer a, Layer b) {
+                if (a instanceof OsmDataLayer && b instanceof OsmDataLayer) {
+                        ((OsmDataLayer)a).listenerDataChanged.remove(this);
+                        ((OsmDataLayer)b).listenerDataChanged.add(this);
+                        updateList();
+                        repaint();
+                }
+        }
+        
+        public void layerRemoved(Layer a) {
+                if (a instanceof OsmDataLayer) {
+                        ((OsmDataLayer)a).listenerDataChanged.remove(this);
+                }
+        }
+        public void layerAdded(Layer a) {
+                if (a instanceof OsmDataLayer) {
+                        ((OsmDataLayer)a).listenerDataChanged.add(this);
+                }
+        }       
+        public void dataChanged(OsmDataLayer l) {
+                updateList();
+                repaint();
+        }
+        
 }