Changeset 3206 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

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

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/ChangesetDialog.java (modified) (1 diff)
• dialogs/changeset/ChangesetDetailPanel.java (modified) (2 diffs)
• dialogs/changeset/ChangesetListModel.java (modified) (1 diff)
• layer/OsmDataLayer.java (modified) (4 diffs)

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

@@ -307 +307 @@
                 return;
             Set<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
-            for (OsmPrimitive p: ds.getNodes()) {
-                if (ids.contains(p.getChangesetId())) {
-                    sel.add(p);
-                }
-            }
-            for (OsmPrimitive p: ds.getWays()) {
-                if (ids.contains(p.getChangesetId())) {
-                    sel.add(p);
-                }
-            }
-            for (OsmPrimitive p: ds.getRelations()) {
+            for (OsmPrimitive p: ds.allPrimitives()) {
                 if (ids.contains(p.getChangesetId())) {
                     sel.add(p);

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

@@ -380 +380 @@
             OsmDataLayer layer = Main.main.getEditLayer();
             Set<OsmPrimitive> target = new HashSet<OsmPrimitive>();
-            for (OsmPrimitive p: layer.data.getNodes()) {
-                if (p.isUsable() && p.getChangesetId() == current.getId()) {
-                    target.add(p);
-                }
-            }
-            for (OsmPrimitive p: layer.data.getWays()) {
-                if (p.isUsable() && p.getChangesetId() == current.getId()) {
-                    target.add(p);
-                }
-            }
-            for (OsmPrimitive p: layer.data.getRelations()) {
+            for (OsmPrimitive p: layer.data.allPrimitives()) {
                 if (p.isUsable() && p.getChangesetId() == current.getId()) {
                     target.add(p);
@@ -449 +439 @@
             OsmDataLayer layer = Main.main.getEditLayer();
             Set<OsmPrimitive> target = new HashSet<OsmPrimitive>();
-            for (OsmPrimitive p: layer.data.getNodes()) {
+            for (OsmPrimitive p: layer.data.allPrimitives()) {
                 if (p.isUsable() && p.getChangesetId() == current.getId()) {
                     target.add(p);
                 }
             }
-            for (OsmPrimitive p: layer.data.getWays()) {
-                if (p.isUsable() && p.getChangesetId() == current.getId()) {
-                    target.add(p);
-                }
-            }
-            for (OsmPrimitive p: layer.data.getRelations()) {
-                if (p.isUsable() && p.getChangesetId() == current.getId()) {
-                    target.add(p);
-                }
-            }
             if (target.isEmpty()) {
                 alertNoPrimitivesToZoomTo();

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

@@ -137 +137 @@
         }
         Set<Changeset> changesets = new HashSet<Changeset>();
-        for (OsmPrimitive p: ds.getNodes()) {
-            if (p.getChangesetId() <=0 ) {
-                continue;
-            }
-            changesets.add(new Changeset(p.getChangesetId()));
-        }
-        for (OsmPrimitive p: ds.getWays()) {
-            if (p.getChangesetId() <=0 ) {
-                continue;
-            }
-            changesets.add(new Changeset(p.getChangesetId()));
-        }
-        for (OsmPrimitive p: ds.getRelations()) {
+        for (OsmPrimitive p: ds.allPrimitives()) {
             if (p.getChangesetId() <=0 ) {
                 continue;

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

@@ -25 +25 @@
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
-import java.util.Set;
 
 import javax.swing.AbstractAction;
@@ -55 +53 @@
 import org.openstreetmap.josm.data.osm.DataSetMerger;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.DatasetCollection;
 import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
 import org.openstreetmap.josm.data.osm.Node;
@@ -271 +270 @@
 
     @Override public String getToolTipText() {
-        int nodes = undeletedSize(data.getNodes());
-        int ways = undeletedSize(data.getWays());
+        int nodes = new DatasetCollection(data.getNodes(), OsmPrimitive.nonDeletedPredicate).size();
+        int ways = new DatasetCollection(data.getWays(), OsmPrimitive.nonDeletedPredicate).size();
 
         String tool = trn("{0} node", "{0} nodes", nodes, nodes)+", ";
@@ -477 +476 @@
 
         // if uploaded, clean the modified flags as well
-        final Set<OsmPrimitive> processedSet = new HashSet<OsmPrimitive>(processed);
         data.clenupDeletedPrimitives();
-        for (final Iterator<Node> it = data.getNodes().iterator(); it.hasNext();) {
-            cleanIterator(it, processedSet);
-        }
-        for (final Iterator<Way> it = data.getWays().iterator(); it.hasNext();) {
-            cleanIterator(it, processedSet);
-        }
-        for (final Iterator<Relation> it = data.getRelations().iterator(); it.hasNext();) {
-            cleanIterator(it, processedSet);
-        }
-    }
-
-    /**
-     * Clean the modified flag for the given iterator over a collection if it is in the
-     * list of processed entries.
-     *
-     * @param it The iterator to change the modified and remove the items if deleted.
-     * @param processed A list of all objects that have been successfully progressed.
-     *         If the object in the iterator is not in the list, nothing will be changed on it.
-     */
-    private void cleanIterator(final Iterator<? extends OsmPrimitive> it, final Collection<OsmPrimitive> processed) {
-        final OsmPrimitive osm = it.next();
-        if (!processed.remove(osm))
-            return;
-        osm.setModified(false);
-    }
-
-    /**
-     * @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() && osm.isVisible()) {
-                size++;
-            }
-        return size;
-    }
+        for (OsmPrimitive p: data.allPrimitives()) {
+            if (processed.contains(p)) {
+                p.setModified(false);
+            }
+        }
+    }
+
 
     @Override public Object getInfoComponent() {