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

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/dialogs/changeset

Files:

• ChangesetDetailPanel.java (modified) (2 diffs)
• ChangesetListModel.java (modified) (1 diff)

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;