Changeset 2381 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-11-02T07:51:28+01:00 (15 years ago)

Author:

jttt

Message:

Change most occurrences of Dataset.nodes/ways/relations with getNodes()/../.. or addPrimitive

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmServerBackreferenceReader.java (modified) (2 diffs)
• OsmWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -221 +221 @@
         progressMonitor.beginTask(null, 2);
         try {
-            Collection<Way> waysToCheck = new ArrayList<Way>(ds.ways);
+            Collection<Way> waysToCheck = new ArrayList<Way>(ds.getWays());
             if (isReadFull() ||primitiveType.equals(OsmPrimitiveType.NODE)) {
                 for (Way way: waysToCheck) {
@@ -233 +233 @@
             }
             if (isReadFull()) {
-                Collection<Relation> relationsToCheck  = new ArrayList<Relation>(ds.relations);
+                Collection<Relation> relationsToCheck  = new ArrayList<Relation>(ds.getRelations());
                 for (Relation relation: relationsToCheck) {
                     if (!relation.isNew() && relation.incomplete) {

trunk/src/org/openstreetmap/josm/io/OsmWriter.java

@@ -72 +72 @@
 
     public void writeContent(DataSet ds) {
-        for (Node n : ds.nodes)
+        for (Node n : ds.getNodes()) {
             if (shouldWrite(n)) {
                 visit(n);
             }
-        for (Way w : ds.ways)
+        }
+        for (Way w : ds.getWays()) {
             if (shouldWrite(w)) {
                 visit(w);
             }
-        for (Relation e : ds.relations)
+        }
+        for (Relation e : ds.getRelations()) {
             if (shouldWrite(e)) {
                 visit(e);
             }
+        }
     }