Changeset 2488 in josm

Timestamp:

Nov 21, 2009 1:44:33 PM (4 years ago)

Author:

Gubaer

Message:

fixed #3997: relation-list does not update
RelationListDialog now listening to dataChanged events too

File:

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

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

@@ -45 +45 @@
 import org.openstreetmap.josm.gui.dialogs.relation.GenericRelationEditor;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
+import org.openstreetmap.josm.gui.layer.DataChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -59 +60 @@
  * objects are visible on the map and can be selected there. Relations are not.
  */
-public class RelationListDialog extends ToggleDialog implements LayerChangeListener, DataSetListener {
+public class RelationListDialog extends ToggleDialog implements LayerChangeListener, DataSetListener, DataChangeListener {
     //private static final Logger logger = Logger.getLogger(RelationListDialog.class.getName());
 
@@ -522 +523 @@
 
         public synchronized void setRelations(Collection<Relation> relations) {
+            List<Relation> sel =  getSelectedRelations();
             if (relations == null) {
                 this.relations = null;
@@ -534 +536 @@
             sort();
             fireIntervalAdded(this, 0, getSize());
-            selectionModel.clearSelection();
+            setSelectedRelations(sel);
         }
 
@@ -631 +633 @@
         public List<Relation> getSelectedNonNewRelations() {
             ArrayList<Relation> ret = new ArrayList<Relation>();
+            if (relations == null) return ret;
             for (int i=0; i<getSize();i++) {
                 if (!selectionModel.isSelectedIndex(i)) {
@@ -651 +654 @@
         public List<Relation> getSelectedRelations() {
             ArrayList<Relation> ret = new ArrayList<Relation>();
+            if (relations == null) return ret;
             for (int i=0; i<getSize();i++) {
                 if (!selectionModel.isSelectedIndex(i)) {
@@ -706 +710 @@
         if (a != null && a instanceof OsmDataLayer) {
             ((OsmDataLayer)a).data.removeDataSetListener(this);
+            ((OsmDataLayer)a).listenerDataChanged.remove(this);
         }
         if (b != null && b instanceof OsmDataLayer) {
             ((OsmDataLayer)b).data.addDataSetListener(this);
+            ((OsmDataLayer)b).listenerDataChanged.add(this);
         }
 
@@ -786 +792 @@
         }
     }
+
+    /* ---------------------------------------------------------------------------------- */
+    /* DataSetListener                                                                    */
+    /* ---------------------------------------------------------------------------------- */
+    public void dataChanged(OsmDataLayer l) {
+        if (l != null && l == Main.main.getEditLayer()) {
+            initFromLayer(l);
+        }
+    }
 }