Changeset 9941 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-03-06T22:37:41+01:00 (9 years ago)

Author:

simon04

Message:

fix #12457 - Filter "modified" not updating after uploading changes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (2 diffs)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/event/AbstractDatasetChangedEvent.java (modified) (1 diff)
• data/osm/event/PrimitiveFlagsChangedEvent.java (added)
• gui/dialogs/FilterDialog.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

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

@@ -35 +35 @@
 import org.openstreetmap.josm.data.osm.event.DataSetListener;
 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitiveFlagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
 import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
@@ -1224 +1225 @@
     }
 
+    void firePrimitiveFlagsChanged(OsmPrimitive primitive) {
+        fireEvent(new PrimitiveFlagsChangedEvent(this, primitive));
+    }
+
     void fireHighlightingChanged() {
         highlightUpdateCount++;

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

@@ -568 +568 @@
         try {
             super.setModified(modified);
+            if (dataSet != null) {
+                dataSet.firePrimitiveFlagsChanged(this);
+            }
             clearCachedStyle();
         } finally {

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

@@ -17 +17 @@
         TAGS_CHANGED,
         WAY_NODES_CHANGED,
-        CHANGESET_ID_CHANGED
+        CHANGESET_ID_CHANGED,
+        PRIMITIVE_FLAGS_CHANGED,
     }
 

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

@@ -329 +329 @@
     @Override
     public void nodeMoved(NodeMovedEvent event) {
-        // Do nothing
+        filterModel.executeFilters();
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -524 +524 @@
         // if uploaded, clean the modified flags as well
         data.cleanupDeletedPrimitives();
-        for (OsmPrimitive p: data.allPrimitives()) {
-            if (processed.contains(p)) {
-                p.setModified(false);
-            }
+        data.beginUpdate();
+        try {
+            for (OsmPrimitive p: data.allPrimitives()) {
+                if (processed.contains(p)) {
+                    p.setModified(false);
+                }
+            }
+        } finally {
+            data.endUpdate();
         }
     }