Changeset 2623 in josm

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)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (3 diffs)
• data/osm/OsmPrimitive.java (modified) (3 diffs)
• data/osm/Relation.java (modified) (1 diff)
• data/osm/event/PrimitivesAddedEvent.java (modified) (2 diffs)
• data/osm/event/PrimitivesRemovedEvent.java (modified) (2 diffs)
• gui/dialogs/RelationListDialog.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -203 +203 @@
         allPrimitives.add(primitive);
         primitive.setDataset(this);
-        firePrimitivesAdded(Collections.singletonList(primitive));
+        firePrimitivesAdded(Collections.singletonList(primitive), false);
     }
 
@@ -246 +246 @@
         primitive.setDataset(null);
         errors.remove(primitive);
-        firePrimitivesRemoved(Collections.singletonList(primitive));
+        firePrimitivesRemoved(Collections.singletonList(primitive), false);
     }
 
@@ -837 +837 @@
     }
 
-    void firePrimitivesAdded(Collection<? extends OsmPrimitive> added) {
-        fireEvent(new PrimitivesAddedEvent(this, added));
-    }
-
-    void firePrimitivesRemoved(Collection<? extends OsmPrimitive> removed) {
-        fireEvent(new PrimitivesRemovedEvent(this, removed));
+    void firePrimitivesAdded(Collection<? extends OsmPrimitive> added, boolean wasIncomplete) {
+        fireEvent(new PrimitivesAddedEvent(this, added, wasIncomplete));
+    }
+
+    void firePrimitivesRemoved(Collection<? extends OsmPrimitive> removed, boolean wasComplete) {
+        fireEvent(new PrimitivesRemovedEvent(this, removed, wasComplete));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -564 +564 @@
         if (dataSet != null) {
             if (deleted) {
-                dataSet.firePrimitivesRemoved(Collections.singleton(this));
+                dataSet.firePrimitivesRemoved(Collections.singleton(this), false);
             } else {
-                dataSet.firePrimitivesAdded(Collections.singleton(this));
+                dataSet.firePrimitivesAdded(Collections.singleton(this), false);
             }
         }
@@ -956 +956 @@
      */
     public void cloneFrom(OsmPrimitive other) {
+        if (id != other.id && dataSet != null)
+            throw new DataIntegrityProblemException("Osm id cannot be changed after primitive was added to the dataset");
         setKeys(other.getKeys());
         id = other.id;
@@ -1210 +1212 @@
 
     private void setIncomplete(boolean incomplete) {
+        if (dataSet != null && incomplete != this.incomplete) {
+            if (incomplete) {
+                dataSet.firePrimitivesRemoved(Collections.singletonList(this), true);
+            } else {
+                dataSet.firePrimitivesAdded(Collections.singletonList(this), true);
+            }
+        }
         this.incomplete = incomplete;
     }

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -217 +217 @@
         result.append(" version=");
         result.append(getVersion());
+        result.append(" ");
+        result.append(getFlagsAsString());
         result.append(" [");
         for (RelationMember rm:getMembers()) {

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

@@ -13 +13 @@
 
     private final List<? extends OsmPrimitive> primitives;
+    private final boolean wasIncomplete;
 
-    public PrimitivesAddedEvent(DataSet dataSet, Collection<? extends OsmPrimitive> primitives) {
+    public PrimitivesAddedEvent(DataSet dataSet, Collection<? extends OsmPrimitive> primitives, boolean wasIncomplete) {
         super(dataSet);
         this.primitives = Collections.unmodifiableList(new ArrayList<OsmPrimitive>(primitives));
+        this.wasIncomplete = wasIncomplete;
     }
 
@@ -24 +26 @@
     }
 
+    @Override
     public List<? extends OsmPrimitive> getPrimitives() {
         return primitives;
     }
 
+    /**
+     * 
+     * @return True if primitive was in dataset before (so it's not really added), but it was incomplete
+     */
+    public boolean wasIncomplete() {
+        return wasIncomplete;
+    }
+
 }

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

@@ -13 +13 @@
 
     private final List<? extends OsmPrimitive> primitives;
+    private final boolean wasComplete;
 
-    public PrimitivesRemovedEvent(DataSet dataSet, Collection<? extends OsmPrimitive> primitives) {
+    public PrimitivesRemovedEvent(DataSet dataSet, Collection<? extends OsmPrimitive> primitives, boolean wasComplete) {
         super(dataSet);
         this.primitives = Collections.unmodifiableList(new ArrayList<OsmPrimitive>(primitives));
+        this.wasComplete = wasComplete;
     }
 
@@ -24 +26 @@
     }
 
+    @Override
     public List<? extends OsmPrimitive> getPrimitives() {
         return primitives;
     }
 
+    /**
+     * 
+     * @return True if primitive wasn't really removed from the dataset, it only become incomplete again
+     */
+    public boolean wasComplete() {
+        return wasComplete;
+    }
+
 }

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);
-        }
-    }
 }