Index: trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 2563) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (revision 2578) @@ -76,5 +76,5 @@ Relation r4 = new Relation(1); r4.put("name", "r4"); - r4.incomplete = false; + r4.setIncomplete(false); r4.setModified(true); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 2563) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (revision 2578) @@ -202,5 +202,5 @@ Node n = new Node(1); n.setCoor(new LatLon(0,0)); - n.incomplete = false; + n.setIncomplete(false); n.setDeleted(true); n.put("key1", "value1"); @@ -449,5 +449,5 @@ n.setCoor(new LatLon(0,0)); n.setOsmId(1,1); - n.incomplete = true; + n.setIncomplete(true); my.addPrimitive(n); @@ -470,5 +470,5 @@ assertEquals("value1",n2.get("key1")); assertEquals(true, n1.getTimestamp().equals(n2.getTimestamp())); - assertEquals(false, n2.incomplete); + assertEquals(false, n2.isIncomplete()); assertTrue(n2 == n); } @@ -1004,5 +1004,5 @@ w3.setNodes(Arrays.asList(n1,n2)); source.addPrimitive(w3); - assertTrue(w3.incomplete); + assertTrue(w3.isIncomplete()); DataSet target = new DataSet(); @@ -1016,18 +1016,18 @@ OsmPrimitive p= target.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); - assertTrue(p.incomplete); + assertTrue(p.isIncomplete()); p= target.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(p); - assertTrue(p.incomplete); + assertTrue(p.isIncomplete()); p= target.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(p); - assertTrue(p.incomplete); + assertTrue(p.isIncomplete()); Way w = (Way)target.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(w); - assertTrue(p.incomplete); + assertTrue(p.isIncomplete()); assertEquals(2, w.getNodesCount()); - assertTrue(w.getNode(0).incomplete); - assertTrue(w.getNode(1).incomplete); + assertTrue(w.getNode(0).isIncomplete()); + assertTrue(w.getNode(1).isIncomplete()); } @@ -1067,5 +1067,5 @@ Way w6 = new Way(3); - w6.incomplete = false; + w6.setIncomplete(false); w6.setNodes(Arrays.asList(n4,n5)); my.addPrimitive(w6); @@ -1078,18 +1078,18 @@ OsmPrimitive p= my.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(p); - assertTrue(!p.incomplete); + assertTrue(!p.isIncomplete()); p= my.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(p); - assertTrue(!p.incomplete); + assertTrue(!p.isIncomplete()); p= my.getPrimitiveById(3,OsmPrimitiveType.WAY); assertNotNull(p); - assertTrue(!p.incomplete); + assertTrue(!p.isIncomplete()); Way w = (Way)my.getPrimitiveById(3,OsmPrimitiveType.WAY); assertNotNull(w); - assertTrue(!p.incomplete); + assertTrue(!p.isIncomplete()); assertEquals(2, w.getNodesCount()); - assertTrue(!w.getNode(0).incomplete); - assertTrue(!w.getNode(1).incomplete); + assertTrue(!w.getNode(0).isIncomplete()); + assertTrue(!w.getNode(1).isIncomplete()); } @@ -1108,5 +1108,5 @@ Node n1 = new Node(1); n1.setCoor(new LatLon(1,1)); - n1.incomplete = false; + n1.setIncomplete(false); source.addPrimitive(n1); @@ -1114,5 +1114,5 @@ Node n2 = new Node(2); n2.setCoor(new LatLon(2,2)); - n2.incomplete = false; + n2.setIncomplete(false); source.addPrimitive(n2); @@ -1128,8 +1128,8 @@ Way w6 = new Way(3); - w6.incomplete = false; + w6.setIncomplete(false); w6.addNode(n4); w6.addNode(n5); - w6.incomplete = true; + w6.setIncomplete(true); target.addPrimitive(w6); @@ -1143,13 +1143,13 @@ Node n = (Node)target.getPrimitiveById(1, OsmPrimitiveType.NODE); assertNotNull(n); - assertFalse(n.incomplete); + assertFalse(n.isIncomplete()); n = (Node)target.getPrimitiveById(2, OsmPrimitiveType.NODE); assertNotNull(n); - assertFalse(n.incomplete); + assertFalse(n.isIncomplete()); Way w = (Way)target.getPrimitiveById(3, OsmPrimitiveType.WAY); assertNotNull(w); - assertFalse(w.incomplete); + assertFalse(w.isIncomplete()); assertEquals(2, w.getNodesCount()); assertEquals(1, w.getNode(0).getId()); Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 2563) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java (revision 2578) @@ -72,5 +72,5 @@ Node n2 = new Node(2); Way w1 = new Way(3); - w1.incomplete = false; + w1.setIncomplete(false); w1.addNode(n1); w1.addNode(n2); @@ -105,5 +105,5 @@ Node n2 = new Node(2); Way w1 = new Way(3); - w1.incomplete = false; + w1.setIncomplete(false); w1.addNode(n1); w1.addNode(n2); @@ -147,5 +147,5 @@ assertNotNull(p); assertEquals(p.getClass(), Way.class); - assertTrue(p.incomplete); + assertTrue(p.isIncomplete()); } @@ -156,7 +156,7 @@ Node n20 = new Node(20); r1.addMember(new RelationMember("node-20",n20)); - r1.incomplete = false; + r1.setIncomplete(false); Way w30 = new Way(30); - w30.incomplete = false; + w30.setIncomplete(false); Node n21; w30.addNode(n21 = new Node(21)); @@ -217,5 +217,5 @@ r1.addMember(new RelationMember("node-20",n20)); Way w30 = new Way(30); - w30.incomplete = false; + w30.setIncomplete(false); Node n21; w30.addNode(n21 = new Node(21)); @@ -246,5 +246,5 @@ Way w = (Way)hull.getPrimitiveById(30, OsmPrimitiveType.WAY); assertNotNull(w); - assertTrue(w.incomplete); + assertTrue(w.isIncomplete()); @@ -257,5 +257,5 @@ Relation r = (Relation)hull.getPrimitiveById(40, OsmPrimitiveType.RELATION); assertNotNull(r); - assertTrue(r.incomplete); + assertTrue(r.isIncomplete()); r = (Relation)hull.getPrimitiveById(1, OsmPrimitiveType.RELATION); Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 2563) +++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java (revision 2578) @@ -65,5 +65,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -90,5 +90,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -122,5 +122,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -150,5 +150,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -179,5 +179,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -201,5 +201,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -228,5 +228,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -256,5 +256,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(2)); myWay.addNode(new Node(3)); @@ -289,5 +289,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -318,5 +318,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -347,5 +347,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -381,5 +381,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -410,5 +410,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -441,5 +441,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -471,5 +471,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -505,5 +505,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -532,5 +532,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -563,5 +563,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -597,5 +597,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -624,5 +624,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2)); @@ -655,5 +655,5 @@ Way myWay = new Way(1); - myWay.incomplete = false; + myWay.setIncomplete(false); myWay.addNode(new Node(1)); myWay.addNode(new Node(2));