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

Timestamp:

2009-12-12T21:25:10+01:00 (14 years ago)

Author:

jttt

Message:

Fire primitivesAdded event after also after primitive was downloaded (incomplete set to false). Remove DataChangeListener from RelationListDialog (should not be necessary anymore, was there only for catching incomplete state changes)

File:

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

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

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 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;
@@ -66 +65 @@
  * objects are visible on the map and can be selected there. Relations are not.
  */
-public class RelationListDialog extends ToggleDialog implements MapView.LayerChangeListener, DataSetListener, DataChangeListener {
+public class RelationListDialog extends ToggleDialog implements DataSetListener {
     //private static final Logger logger = Logger.getLogger(RelationListDialog.class.getName());
 
@@ -143 +142 @@
 
     @Override public void showNotify() {
-        MapView.addLayerChangeListener(this);
         MapView.addLayerChangeListener(newAction);
         DatasetEventManager.getInstance().addDatasetListener(this, true);
-        dataChanged(Main.main.getEditLayer());
+        dataChanged(null);
     }
 
     @Override public void hideNotify() {
-        MapView.removeLayerChangeListener(this);
         MapView.removeLayerChangeListener(newAction);
         DatasetEventManager.getInstance().removeDatasetListener(this);
@@ -521 +518 @@
         }
 
+        public synchronized void sort() {
+            Collections.sort(
+                    relations,
+                    new Comparator<Relation>() {
+                        NameFormatter formatter = DefaultNameFormatter.getInstance();
+
+                        public int compare(Relation r1, Relation r2) {
+                            return r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter));
+                        }
+                    }
+            );
+        }
+
+        private boolean isValid(Relation r) {
+            return !r.isDeleted() && r.isVisible() && !r.isIncomplete();
+        }
+
         public synchronized void setRelations(Collection<Relation> relations) {
             List<Relation> sel =  getSelectedRelations();
@@ -531 +545 @@
             }
             for (Relation r: relations) {
-                if (! r.isDeleted() && r.isVisible() && !r.isIncomplete()) {
+                if (isValid(r)) {
                     this.relations.add(r);
                 }
@@ -538 +552 @@
             fireIntervalAdded(this, 0, getSize());
             setSelectedRelations(sel);
-        }
-
-        public synchronized void sort() {
-            Collections.sort(
-                    relations,
-                    new Comparator<Relation>() {
-                        NameFormatter formatter = DefaultNameFormatter.getInstance();
-
-                        public int compare(Relation r1, Relation r2) {
-                            return r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter));
-                        }
-                    }
-            );
         }
 
@@ -561 +562 @@
          */
         public synchronized void addRelations(Collection<? extends OsmPrimitive> addedPrimitives) {
-            if (addedPrimitives == null || addedPrimitives.isEmpty()) return;
             boolean added = false;
             for (OsmPrimitive p: addedPrimitives) {
@@ -567 +567 @@
                     continue;
                 }
-                if (relations.contains(p)) {
+
+                Relation r = (Relation)p;
+                if (relations.contains(r)) {
                     continue;
                 }
-                relations.add((Relation)p);
-                added = true;
+                if (isValid(r)) {
+                    relations.add(r);
+                    added = true;
+                }
             }
             if (added) {
@@ -695 +699 @@
 
     /* ---------------------------------------------------------------------------------- */
-    /* LayerChangeListener                                                                */
-    /* ---------------------------------------------------------------------------------- */
-    public void activeLayerChange(Layer a, Layer b) {
-        if (a != null && a instanceof OsmDataLayer) {
-            ((OsmDataLayer)a).listenerDataChanged.remove(this);
-        }
-        if (b != null && b instanceof OsmDataLayer) {
-            ((OsmDataLayer)b).listenerDataChanged.add(this);
-        }
-
-    }
-    public void layerRemoved(Layer a) {/* irrelevant in this context */}
-    public void layerAdded(Layer a) {/* irrelevant in this context */}
-
-    /* ---------------------------------------------------------------------------------- */
     /* DataSetListener                                                                    */
     /* ---------------------------------------------------------------------------------- */
@@ -751 +740 @@
         }
     }
-
-    /* ---------------------------------------------------------------------------------- */
-    /* DataSetListener                                                                    */
-    /* ---------------------------------------------------------------------------------- */
-    public void dataChanged(OsmDataLayer l) {
-        if (l != null && l == Main.main.getEditLayer()) {
-            initFromLayer(l);
-        }
-    }
 }