Changeset 13161 in josm

Timestamp:

2017-11-25T14:14:25+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #13153 - Should not warn to upload/save "modified" layers with 0 objects

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/APIDataSet.java (modified) (3 diffs)
• data/osm/DataSet.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -26 +26 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -40 +41 @@
 
     /**
+     * The type of operation we can perform with OSM API on a primitive.
+     * @since 13161
+     */
+    public enum APIOperation {
+        /** Add a new primitive */
+        ADD,
+        /** Update an existing primitive */
+        UPDATE,
+        /** Delete an existing primitive */
+        DELETE;
+
+        /**
+         * Determines the API operation to perform on a primitive.
+         * @param osm OSM primitive
+         * @return the API operation to perform on {@code osm}
+         */
+        public static APIOperation of(OsmPrimitive osm) {
+            if (osm.isNewOrUndeleted() && !osm.isDeleted()) {
+                return ADD;
+            } else if (osm.isModified() && !osm.isDeleted()) {
+                return UPDATE;
+            } else if (osm.isDeleted() && !osm.isNew() && osm.isModified() && osm.isVisible()) {
+                return DELETE;
+            }
+            return null;
+        }
+    }
+
+    /**
      * creates a new empty data set
      */
@@ -69 +99 @@
 
         for (OsmPrimitive osm :primitives) {
-            if (osm.isNewOrUndeleted() && !osm.isDeleted()) {
-                toAdd.add(osm);
-            } else if (osm.isModified() && !osm.isDeleted()) {
-                toUpdate.add(osm);
-            } else if (osm.isDeleted() && !osm.isNew() && osm.isModified() && osm.isVisible()) {
-                toDelete.add(osm);
+            switch (APIOperation.of(osm)) {
+                case ADD: toAdd.add(osm); break;
+                case UPDATE: toUpdate.add(osm); break;
+                case DELETE: toDelete.add(osm); break;
+                default: Logging.trace("Ignored primitive {0}", osm);
             }
         }

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

@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.APIDataSet.APIOperation;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Data;
@@ -1136 +1137 @@
 
     /**
+     * Replies true if there is at least one primitive in this dataset which requires to be uploaded to server.
+     * @return true if there is at least one primitive in this dataset which requires to be uploaded to server
+     * @since 13161
+     */
+    public boolean requiresUploadToServer() {
+        for (OsmPrimitive p: allPrimitives) {
+            if (APIOperation.of(p) != null)
+                return true;
+        }
+        return false;
+    }
+
+    /**
      * Adds a new data set listener.
      * @param dsl The data set listener to add

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

@@ -997 +997 @@
         invalidate();
         setRequiresSaveToFile(true);
-        setRequiresUploadToServer(true);
+        setRequiresUploadToServer(event.getDataset().requiresUploadToServer());
     }