Changeset 2388 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2009-11-02T21:04:32+01:00 (14 years ago)

Author:

jttt

Message:

Replace Dataset.nodes with getNodes(), etc

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (4 diffs)

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

@@ -52 +52 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -458 +457 @@
         // if uploaded, clean the modified flags as well
         final Set<OsmPrimitive> processedSet = new HashSet<OsmPrimitive>(processed);
-        for (final Iterator<Node> it = data.nodes.iterator(); it.hasNext();) {
+        data.clenupDeletedPrimitives();
+        for (final Iterator<Node> it = data.getNodes().iterator(); it.hasNext();) {
             cleanIterator(it, processedSet);
         }
-        for (final Iterator<Way> it = data.ways.iterator(); it.hasNext();) {
+        for (final Iterator<Way> it = data.getWays().iterator(); it.hasNext();) {
             cleanIterator(it, processedSet);
         }
-        for (final Iterator<Relation> it = data.relations.iterator(); it.hasNext();) {
+        for (final Iterator<Relation> it = data.getRelations().iterator(); it.hasNext();) {
             cleanIterator(it, processedSet);
         }
@@ -482 +482 @@
             return;
         osm.setModified(false);
-        if (osm.isDeleted()) {
-            it.remove();
-        }
     }
 
@@ -507 +504 @@
 
         String nodeText = trn("{0} node", "{0} nodes", counter.nodes, counter.nodes);
-        if (counter.deletedNodes > 0)
+        if (counter.deletedNodes > 0) {
             nodeText += " ("+trn("{0} deleted", "{0} deleted", counter.deletedNodes, counter.deletedNodes)+")";
+        }
 
         String wayText = trn("{0} way", "{0} ways", counter.ways, counter.ways);
-        if (counter.deletedWays > 0)
+        if (counter.deletedWays > 0) {
             wayText += " ("+trn("{0} deleted", "{0} deleted", counter.deletedWays, counter.deletedWays)+")";
+        }
 
         String relationText = trn("{0} relation", "{0} relations", counter.relations, counter.relations);
-        if (counter.deletedRelations > 0)
+        if (counter.deletedRelations > 0) {
             relationText += " ("+trn("{0} deleted", "{0} deleted", counter.deletedRelations, counter.deletedRelations)+")";
+        }
 
         p.add(new JLabel(tr("{0} consists of:", getName())), GBC.eol());