Changeset 3206 in josm for trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

Timestamp:

2010-04-25T10:51:06+02:00 (16 years ago)

Author:

jttt

Message:

Remove obsoleted methods from Dataset, replace some calls of getNodes()/getWays()/getRelations() with allPrimitives()

File:

• trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

@@ -67 +67 @@
     protected Set<OsmPrimitive> getDeletedPrimitives(DataSet ds) {
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
-        for (OsmPrimitive p : ds.getNodes()) {
-            if (p.isDeleted() && !p.isNew() && p.isVisible() && p.isModified()) {
-                ret.add(p);
-            }
-        }
-        for (OsmPrimitive p : ds.getWays()) {
-            if (p.isDeleted() && !p.isNew() && p.isVisible() && p.isModified()) {
-                ret.add(p);
-            }
-        }
-        for (OsmPrimitive p : ds.getRelations()) {
+        for (OsmPrimitive p: ds.allPrimitives()) {
             if (p.isDeleted() && !p.isNew() && p.isVisible() && p.isModified()) {
                 ret.add(p);
@@ -136 +126 @@
      * Replies true if there is at least one non-new, deleted primitive in
      * <code>primitives</code>
-     * 
+     *
      * @param primitives the primitives to scan
      * @return true if there is at least one non-new, deleted primitive in