Changeset 2188 in josm

Timestamp:

Sep 26, 2009 9:43:40 AM (4 years ago)

Author:

Gubaer

Message:

fixed #3570: uploated deletions create conflicts at next upload

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• APIDataSet.java (modified) (4 diffs)
• osm/OsmPrimitive.java (modified) (4 diffs)

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

@@ -28 +28 @@
  * The collection is derived from the modified primitives of an {@see DataSet}.
  * 
- * 
  */
 public class APIDataSet {
@@ -45 +44 @@
 
     /**
-     * initializes the API data set with the modified primitives in <code>ds</ds>
-     * 
-     * @param ds the data set. Ignore, if null.
+     * initializes the API data set with the modified primitives in <code>ds</code>
+     * 
+     * @param ds the data set. Ignored, if null.
      */
     public void init(DataSet ds) {
@@ -63 +62 @@
             } else if (osm.isModified() && !osm.isDeleted()) {
                 toUpdate.addLast(osm);
-            } else if (osm.isDeleted() && osm.getId() != 0) {
+            } else if (osm.isDeleted() && osm.getId() != 0 && osm.isModified()) {
                 toDelete.addFirst(osm);
             }
@@ -70 +69 @@
 
     /**
-     * initializes the API data set with the modified primitives in <code>ds</ds>
-     * 
-     * @param ds the data set. Ignore, if null.
+     * initializes the API data set with the modified primitives in <code>ds</code>
+     * 
+     * @param ds the data set. Ignored, if null.
      */
     public APIDataSet(DataSet ds) {

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

@@ -35 +35 @@
 abstract public class OsmPrimitive implements Comparable<OsmPrimitive>, Tagged {
 
+    /**
+     * Replies the sub-collection of {@see OsmPrimitive}s of type <code>type</code> present in
+     * another collection of {@see OsmPrimitive}s. The result collection is a list.
+     * 
+     * If <code>list</code> is null, replies an empty list.
+     * 
+     * @param <T>
+     * @param list  the original list
+     * @param type the type to filter for
+     * @return the sub-list of OSM primitives of type <code>type</code>
+     */
     static public <T extends OsmPrimitive>  List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) {
-        if (list == null) return null;
+        if (list == null) return Collections.emptyList();
         List<T> ret = new LinkedList<T>();
         for(OsmPrimitive p: list) {
@@ -46 +57 @@
     }
 
+    /**
+     * Replies the sub-collection of {@see OsmPrimitive}s of type <code>type</code> present in
+     * another collection of {@see OsmPrimitive}s. The result collection is a set.
+     * 
+     * If <code>list</code> is null, replies an empty set.
+     * 
+     * @param <T>
+     * @param list  the original collection
+     * @param type the type to filter for
+     * @return the sub-set of OSM primitives of type <code>type</code>
+     */
     static public <T extends OsmPrimitive>  Set<T> getFilteredSet(Collection<OsmPrimitive> set, Class<T> type) {
-        if (set == null) return null;
+        if (set == null) return Collections.emptySet();
         HashSet<T> ret = new HashSet<T>();
         for(OsmPrimitive p: set) {
@@ -91 +113 @@
      * An id of 0 means an unknown id. The object has not been uploaded yet to
      * know what id it will get.
-     *
-     * Do not write to this attribute except you know exactly what you are doing.
-     * More specific, it is not good to set this to 0 and think the object is now
-     * new to the server! To create a new object, call the default constructor of
-     * the respective class.
      *
      */
@@ -742 +759 @@
      */
     public abstract String getDisplayName(NameFormatter formatter);
-
 }
-
-