Changeset 2434 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2009-11-10T22:05:37+01:00 (14 years ago)

Author:

Gubaer

Message:

Improved detection of modified state in OsmDataLayer.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (3 diffs)

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

@@ -49 +49 @@
 import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DataSource;
-import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -484 +484 @@
 
     /**
-     * @return The number of not-deleted primitives in the list.
+     * @return The number of not-deleted and visible primitives in the list.
      */
     private int undeletedSize(final Collection<? extends OsmPrimitive> list) {
         int size = 0;
         for (final OsmPrimitive osm : list)
-            if (!osm.isDeleted()) {
+            if (!osm.isDeleted() && osm.isVisible()) {
                 size++;
             }
@@ -692 +692 @@
     }
 
+    public void onPostDownloadFromServer() {
+        setRequiresSaveToFile(true);
+        setRequiresUploadToServer(data.isModified());
+    }
+
     /**
      * Initializes the layer after a successful save of OSM data to a file