Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 2292) +++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 2381) @@ -35,5 +35,4 @@ import org.openstreetmap.josm.data.projection.Mercator; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -import org.xml.sax.SAXException; public class MultiFetchServerObjectReaderTest { @@ -124,7 +123,7 @@ logger.info("creating data set on the server ..."); ArrayList primitives = new ArrayList(); - primitives.addAll(testDataSet.nodes); - primitives.addAll(testDataSet.ways); - primitives.addAll(testDataSet.relations); + primitives.addAll(testDataSet.getNodes()); + primitives.addAll(testDataSet.getWays()); + primitives.addAll(testDataSet.getRelations()); OsmServerWriter writer = new OsmServerWriter(); @@ -247,5 +246,5 @@ } DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(10, out.nodes.size()); + assertEquals(10, out.getNodes().size()); Iterator it = out.nodes.iterator(); while(it.hasNext()) { @@ -261,13 +260,11 @@ public void testMultiGet10Ways() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList ways= new ArrayList(ds.ways); + ArrayList ways= new ArrayList(ds.getWays()); for (int i =0; i< 10; i++) { reader.append(ways.get(i)); } DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(10, out.ways.size()); - Iterator it = out.ways.iterator(); - while(it.hasNext()) { - Way w1 = it.next(); + assertEquals(10, out.getWays().size()); + for (Way w1: out.getWays()) { Way w2 = (Way)ds.getPrimitiveById(w1.getId(), OsmPrimitiveType.WAY); assertNotNull(w2); @@ -281,13 +278,11 @@ public void testMultiGet10Relations() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList relations= new ArrayList(ds.relations); + ArrayList relations= new ArrayList(ds.getRelations()); for (int i =0; i< 10; i++) { reader.append(relations.get(i)); } DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(10, out.relations.size()); - Iterator it = out.relations.iterator(); - while(it.hasNext()) { - Relation r1 = it.next(); + assertEquals(10, out.getRelations().size()); + for (Relation r1: out.getRelations()) { Relation r2 = (Relation)ds.getPrimitiveById(r1.getId(), OsmPrimitiveType.RELATION); assertNotNull(r2); @@ -301,10 +296,10 @@ public void testMultiGet800Nodes() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList nodes = new ArrayList(ds.nodes); + ArrayList nodes = new ArrayList(ds.getNodes()); for (int i =0; i< 812; i++) { reader.append(nodes.get(i)); } DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(812, out.nodes.size()); + assertEquals(812, out.getNodes().size()); Iterator it = out.nodes.iterator(); while(it.hasNext()) { @@ -320,5 +315,5 @@ public void multiGetWithNonExistingNode() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList nodes = new ArrayList(ds.nodes); + ArrayList nodes = new ArrayList(ds.getNodes()); for (int i =0; i< 10; i++) { reader.append(nodes.get(i)); @@ -327,8 +322,6 @@ reader.append(n); // doesn't exist DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(10, out.nodes.size()); - Iterator it = out.nodes.iterator(); - while(it.hasNext()) { - Node n1 = it.next(); + assertEquals(10, out.getNodes().size()); + for (Node n1:out.getNodes()) { Node n2 = (Node)ds.getPrimitiveById(n1.getId(), OsmPrimitiveType.NODE); assertNotNull(n2); Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 2292) +++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 2381) @@ -34,5 +34,4 @@ import org.openstreetmap.josm.data.projection.Mercator; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; -import org.xml.sax.SAXException; public class OsmServerBackreferenceReaderTest { @@ -40,5 +39,5 @@ protected static Node lookupNode(DataSet ds, int i) { - for (Node n: ds.nodes) { + for (Node n : ds.getNodes()) { if (("node-" + i).equals(n.get("name"))) return n; } @@ -48,5 +47,5 @@ protected static Way lookupWay(DataSet ds, int i) { - for (Way w: ds.ways) { + for (Way w : ds.getWays()) { if (("way-" + i).equals(w.get("name"))) return w; } @@ -55,5 +54,5 @@ protected static Relation lookupRelation(DataSet ds, int i) { - for (Relation r: ds.relations) { + for (Relation r : ds.getRelations()) { if (("relation-" + i).equals(r.get("name"))) return r; } @@ -103,5 +102,5 @@ } } - ds.relations.add(r); + ds.addPrimitive(r); } } @@ -127,7 +126,7 @@ logger.info("creating data set on the server ..."); ArrayList primitives = new ArrayList(); - primitives.addAll(ds.nodes); - primitives.addAll(ds.ways); - primitives.addAll(ds.relations); + primitives.addAll(ds.getNodes()); + primitives.addAll(ds.getWays()); + primitives.addAll(ds.getRelations()); OsmServerWriter writer = new OsmServerWriter(); Changeset cs = new Changeset(); @@ -253,8 +252,8 @@ reader.setReadFull(false); DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(10, referers.nodes.size()); - assertEquals(1, referers.ways.size()); - assertEquals(0, referers.relations.size()); - for (Way way: referers.ways) { + assertEquals(10, referers.getNodes().size()); + assertEquals(1, referers.getWays().size()); + assertEquals(0, referers.getRelations().size()); + for (Way way : referers.getWays()) { assertEquals(w.getId(), way.getId()); assertEquals(false, way.incomplete); @@ -272,8 +271,8 @@ reader.setReadFull(true); DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(10, referers.nodes.size()); - assertEquals(1, referers.ways.size()); - assertEquals(0, referers.relations.size()); - for (Way way: referers.ways) { + assertEquals(10, referers.getNodes().size()); + assertEquals(1, referers.getWays().size()); + assertEquals(0, referers.getRelations().size()); + for (Way way : referers.getWays()) { assertEquals(w.getId(), way.getId()); assertEquals(false, way.incomplete); @@ -292,10 +291,10 @@ reader.setReadFull(false); DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(0, referers.nodes.size()); // no nodes loaded - assertEquals(6, referers.ways.size()); // 6 ways referred by two relations - for (Way w1: referers.ways) { + assertEquals(0, referers.getNodes().size()); // no nodes loaded + assertEquals(6, referers.getWays().size()); // 6 ways referred by two relations + for (Way w1 : referers.getWays()) { assertEquals(true, w1.incomplete); } - assertEquals(2, referers.relations.size()); // two relations referring to w + assertEquals(2, referers.getRelations().size()); // two relations referring to w Relation r = lookupRelation(referers, 0); @@ -316,18 +315,18 @@ reader.setReadFull(true); DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); - assertEquals(6, referers.ways.size()); // 6 ways referred by two relations - for (Way w1: referers.ways) { + assertEquals(6, referers.getWays().size()); // 6 ways referred by two relations + for (Way w1 : referers.getWays()) { assertEquals(false, w1.incomplete); } - assertEquals(2, referers.relations.size()); // two relations referring to + assertEquals(2, referers.getRelations().size()); // two relations referring to Set expectedNodeIds = new HashSet(); - for (Way way: referers.ways) { - Way orig = (Way)ds.getPrimitiveById(way.getId(), OsmPrimitiveType.WAY); - for(Node n: orig.getNodes()) { + for (Way way : referers.getWays()) { + Way orig = (Way) ds.getPrimitiveById(way.getId(), OsmPrimitiveType.WAY); + for (Node n : orig.getNodes()) { expectedNodeIds.add(n.getId()); } } - assertEquals(expectedNodeIds.size(), referers.nodes.size()); - for (Node n : referers.nodes) { + assertEquals(expectedNodeIds.size(), referers.getNodes().size()); + for (Node n : referers.getNodes()) { assertEquals(true, expectedNodeIds.contains(n.getId())); } @@ -342,5 +341,5 @@ @Test public void testBackrefrenceForRelation() throws OsmTransferException { - Relation r = lookupRelation(ds,1); + Relation r = lookupRelation(ds, 1); assertNotNull(r); // way with name "relation-1" is referred to by four relations: @@ -370,6 +369,6 @@ referringRelationsIds.add(r.getId()); - for (Relation r1: referers.relations) { - if (! referringRelationsIds.contains(r1.getId())) { + for (Relation r1 : referers.getRelations()) { + if (!referringRelationsIds.contains(r1.getId())) { assertEquals(true, r1.incomplete); } @@ -401,6 +400,6 @@ } - assertEquals(expectedWayIds.size(), referers.ways.size()); - for (Way w1 : referers.ways) { + assertEquals(expectedWayIds.size(), referers.getWays().size()); + for (Way w1 : referers.getWays()) { assertEquals(true, expectedWayIds.contains(w1.getId())); assertEquals(true, w1.incomplete); @@ -409,5 +408,5 @@ // make sure we didn't read any nodes // - assertEquals(0, referers.nodes.size()); + assertEquals(0, referers.getNodes().size()); } @@ -438,5 +437,5 @@ @Test public void testBackrefrenceForRelation_Full() throws OsmTransferException { - Relation r = lookupRelation(ds,1); + Relation r = lookupRelation(ds, 1); assertNotNull(r); // way with name "relation-1" is referred to by four relations: @@ -468,5 +467,5 @@ // all relations are fully loaded // - for (Relation r1: referers.relations) { + for (Relation r1 : referers.getRelations()) { assertEquals(false, r1.incomplete); } @@ -497,5 +496,5 @@ } for (long id : expectedWayIds) { - Way w = (Way)referers.getPrimitiveById(id, OsmPrimitiveType.WAY); + Way w = (Way) referers.getPrimitiveById(id, OsmPrimitiveType.WAY); assertNotNull(w); assertEquals(false, w.incomplete); @@ -503,11 +502,11 @@ Set expectedNodeIds = new HashSet(); - for(int i=6; i< 10;i++) { + for (int i = 6; i < 10; i++) { Relation r1 = lookupRelation(ds, i); expectedNodeIds.addAll(getNodeIdsInRelation(r1)); } - assertEquals(expectedNodeIds.size(), referers.nodes.size()); - for(Node n : referers.nodes) { + assertEquals(expectedNodeIds.size(), referers.getNodes().size()); + for (Node n : referers.getNodes()) { assertEquals(true, expectedNodeIds.contains(n.getId())); } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 2292) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 2381) @@ -20,5 +20,5 @@ r.incomplete = false; DataSet ds = new DataSet(); - ds.relations.add(r); + ds.addPrimitive(r); APIDataSet apiDataSet = new APIDataSet(); @@ -48,6 +48,6 @@ DataSet ds = new DataSet(); - ds.relations.add(r1); - ds.relations.add(r2); + ds.addPrimitive(r1); + ds.addPrimitive(r2); APIDataSet apiDataSet = new APIDataSet(); @@ -88,8 +88,8 @@ DataSet ds = new DataSet(); - ds.relations.add(r1); - ds.relations.add(r2); - ds.relations.add(r3); - ds.relations.add(r4); + ds.addPrimitive(r1); + ds.addPrimitive(r2); + ds.addPrimitive(r3); + ds.addPrimitive(r4); APIDataSet apiDataSet = new APIDataSet(); @@ -130,7 +130,7 @@ DataSet ds = new DataSet(); - ds.relations.add(r1); - ds.relations.add(r2); - ds.relations.add(r3); + ds.addPrimitive(r1); + ds.addPrimitive(r2); + ds.addPrimitive(r3); APIDataSet apiDataSet = new APIDataSet(); @@ -167,7 +167,7 @@ DataSet ds = new DataSet(); - ds.relations.add(r1); - ds.relations.add(r2); - ds.relations.add(r3); + ds.addPrimitive(r1); + ds.addPrimitive(r2); + ds.addPrimitive(r3); APIDataSet apiDataSet = new APIDataSet(); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 2292) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 2381) @@ -40,8 +40,8 @@ Node n4 = new Node(new LatLon(20.0,20.0)); n4.put("name","n4"); - source.nodes.add(n1); - source.nodes.add(n2); - source.nodes.add(n3); - source.nodes.add(n4); + source.addPrimitive(n1); + source.addPrimitive(n2); + source.addPrimitive(n3); + source.addPrimitive(n4); source.setSelected(n1,n2); @@ -49,5 +49,5 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(2, hull.nodes.size()); + assertEquals(2, hull.getNodes().size()); OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); @@ -58,8 +58,8 @@ assertNull(p); - p = lookupByName(hull.nodes, "n2"); - assertNotNull(p); - - p = lookupByName(hull.nodes, "n4"); + p = lookupByName(hull.getNodes(), "n2"); + assertNotNull(p); + + p = lookupByName(hull.getNodes(), "n4"); assertNull(p); } @@ -75,7 +75,7 @@ w1.addNode(n1); w1.addNode(n2); - source.nodes.add(n1); - source.nodes.add(n2); - source.ways.add(w1); + source.addPrimitive(n1); + source.addPrimitive(n2); + source.addPrimitive(w1); source.setSelected(w1); @@ -83,6 +83,6 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.ways.size()); - assertEquals(2, hull.nodes.size()); + assertEquals(1, hull.getWays().size()); + assertEquals(2, hull.getNodes().size()); OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); @@ -108,7 +108,7 @@ w1.addNode(n1); w1.addNode(n2); - source.nodes.add(n1); - source.nodes.add(n2); - source.ways.add(w1); + source.addPrimitive(n1); + source.addPrimitive(n2); + source.addPrimitive(w1); source.setSelected(w1,n1,n2); @@ -116,6 +116,6 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.ways.size()); - assertEquals(2, hull.nodes.size()); + assertEquals(1, hull.getWays().size()); + assertEquals(2, hull.getNodes().size()); OsmPrimitive p = hull.getPrimitiveById(1,OsmPrimitiveType.NODE); @@ -137,5 +137,5 @@ Way w1 = new Way(3); w1.incomplete = true; - source.ways.add(w1); + source.addPrimitive(w1); source.setSelected(w1); @@ -143,5 +143,5 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.ways.size()); + assertEquals(1, hull.getWays().size()); OsmPrimitive p = hull.getPrimitiveById(3, OsmPrimitiveType.WAY); @@ -167,10 +167,10 @@ Relation r40 = new Relation(40); r1.addMember(new RelationMember("relation-40", r40)); - source.nodes.add(n20); - source.nodes.add(n21); - source.nodes.add(n22); - source.ways.add(w30); - source.relations.add(r1); - source.relations.add(r40); + source.addPrimitive(n20); + source.addPrimitive(n21); + source.addPrimitive(n22); + source.addPrimitive(w30); + source.addPrimitive(r1); + source.addPrimitive(r40); source.setSelected(r1,n20,w30,r40); @@ -178,7 +178,7 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.ways.size()); - assertEquals(3, hull.nodes.size()); - assertEquals(2, hull.relations.size()); + assertEquals(1, hull.getWays().size()); + assertEquals(3, hull.getNodes().size()); + assertEquals(2, hull.getRelations().size()); OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); @@ -226,10 +226,10 @@ Relation r40 = new Relation(40); r1.addMember(new RelationMember("relation-40", r40)); - source.nodes.add(n20); - source.nodes.add(n21); - source.nodes.add(n22); - source.ways.add(w30); - source.relations.add(r1); - source.relations.add(r40); + source.addPrimitive(n20); + source.addPrimitive(n21); + source.addPrimitive(n22); + source.addPrimitive(w30); + source.addPrimitive(r1); + source.addPrimitive(r40); source.setSelected(r1); @@ -237,7 +237,7 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.ways.size()); - assertEquals(1, hull.nodes.size()); - assertEquals(2, hull.relations.size()); + assertEquals(1, hull.getWays().size()); + assertEquals(1, hull.getNodes().size()); + assertEquals(2, hull.getRelations().size()); OsmPrimitive p = hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); @@ -293,10 +293,10 @@ r1.addMember(new RelationMember("relation-40", r40)); - source.nodes.add(n20); - source.nodes.add(n21); - source.nodes.add(n22); - source.ways.add(w30); - source.relations.add(r1); - source.relations.add(r40); + source.addPrimitive(n20); + source.addPrimitive(n21); + source.addPrimitive(n22); + source.addPrimitive(w30); + source.addPrimitive(r1); + source.addPrimitive(r40); source.setSelected(r1); @@ -304,31 +304,31 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.ways.size()); - assertEquals(3, hull.nodes.size()); - assertEquals(2, hull.relations.size()); - - OsmPrimitive p = lookupByName(hull.relations, "r1"); + assertEquals(1, hull.getWays().size()); + assertEquals(3, hull.getNodes().size()); + assertEquals(2, hull.getRelations().size()); + + OsmPrimitive p = lookupByName(hull.getRelations(), "r1"); assertNotNull(p); assertEquals(p.getClass(), Relation.class); - Way w = (Way)lookupByName(hull.ways, "w30"); + Way w = (Way)lookupByName(hull.getWays(), "w30"); assertNotNull(w); assertEquals(2, w.getNodesCount()); - Node n = (Node)lookupByName(hull.nodes, "n21"); + Node n = (Node)lookupByName(hull.getNodes(), "n21"); assertNotNull(n); assertTrue(w.containsNode(n)); - n = (Node)lookupByName(hull.nodes, "n22"); + n = (Node)lookupByName(hull.getNodes(), "n22"); assertNotNull(n); assertTrue(w.containsNode(n)); - Relation r = (Relation)lookupByName(hull.relations, "r40"); - assertNotNull(r); - - r = (Relation)lookupByName(hull.relations, "r1"); + Relation r = (Relation)lookupByName(hull.getRelations(), "r40"); + assertNotNull(r); + + r = (Relation)lookupByName(hull.getRelations(), "r1"); assertNotNull(r); assertEquals(3, r.getMembersCount()); - RelationMember m = new RelationMember("node-20", lookupByName(hull.nodes, "n20")); + RelationMember m = new RelationMember("node-20", lookupByName(hull.getNodes(), "n20")); assertTrue(r.getMembers().contains(m)); m = new RelationMember("way-30", lookupByName(hull.ways, "w30")); @@ -343,5 +343,5 @@ Relation r1 = new Relation(1); r1.addMember(new RelationMember("relation-1",r1)); - source.relations.add(r1); + source.addPrimitive(r1); source.setSelected(r1); @@ -349,5 +349,5 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.relations.size()); + assertEquals(1, hull.getRelations().size()); Relation r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); @@ -363,5 +363,5 @@ r1.put("name", "r1"); r1.addMember(new RelationMember("relation-1",r1)); - source.relations.add(r1); + source.addPrimitive(r1); source.setSelected(r1); @@ -369,7 +369,7 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(1, hull.relations.size()); - - Relation r = (Relation)lookupByName(hull.relations, "r1"); + assertEquals(1, hull.getRelations().size()); + + Relation r = (Relation)lookupByName(hull.getRelations(), "r1"); assertNotNull(r); assertEquals(1, r.getMembersCount()); @@ -384,6 +384,6 @@ r1.addMember(new RelationMember("relation-2",r2)); r2.addMember(new RelationMember("relation-1",r1)); - source.relations.add(r1); - source.relations.add(r2); + source.addPrimitive(r1); + source.addPrimitive(r2); source.setSelected(r1,r2); @@ -391,5 +391,5 @@ DataSet hull = builder.build(); assertNotNull(hull); - assertEquals(2, hull.relations.size()); + assertEquals(2, hull.getRelations().size()); r1 = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (revision 2292) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (revision 2381) @@ -8,5 +8,4 @@ import java.io.File; -import java.net.URLEncoder; import java.text.MessageFormat; import java.util.Arrays; @@ -358,5 +357,5 @@ Node n2 = (Node)my.getPrimitiveById(1,OsmPrimitiveType.NODE); assertEquals(0,visitor.getConflicts().size()); - assertEquals(2,my.nodes.size()); + assertEquals(2, my.getNodes().size()); assertEquals(n,n2); } @@ -402,5 +401,5 @@ visitor.merge(); - Node n2 = my.nodes.iterator().next(); + Node n2 = my.getNodes().iterator().next(); assertEquals(0,visitor.getConflicts().size()); assertEquals("value1",n2.get("key1")); @@ -440,5 +439,5 @@ visitor.merge(); - Node n2 = my.nodes.iterator().next(); + Node n2 = my.getNodes().iterator().next(); assertEquals(0,visitor.getConflicts().size()); assertEquals("value1",n2.get("key1"));