Index: /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 2497)
+++ /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 2498)
@@ -63,6 +63,4 @@
     private DataSet outputDataSet;
 
-    private boolean cancelled = false;
-
     /**
      * constructor
Index: /trunk/src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 2497)
+++ /trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 2498)
@@ -438,5 +438,4 @@
                     if (n == null) {
                         n = new Node(id);
-                        n.incomplete = true;
                         ds.addPrimitive(n);
                     }
Index: /trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2497)
+++ /trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2498)
@@ -56,8 +56,7 @@
         //
         for (int i=0; i< numNodes; i++) {
-            Node n = new Node(0);
+            Node n = new Node();
             n.setCoor(new LatLon(-36.6,47.6));
             n.put("name", "node-"+i);
-            n.incomplete = false;
             ds.addPrimitive(n);
             nodes.add(n);
@@ -68,6 +67,5 @@
         //
         for (int i=0; i< numWays; i++) {
-            Way w = new Way(0);
-            w.incomplete = false;
+            Way w = new Way();
             int numNodesInWay = 2 + (int)Math.round(Math.random() * 5);
             int start = (int)Math.round(Math.random() * numNodes);
@@ -86,6 +84,5 @@
         //
         for (int i=0; i< numRelations; i++) {
-            Relation r = new Relation(0);
-            r.incomplete = false;
+            Relation r = new Relation();
             r.put("name", "relation-" +i);
             int numNodesInRelation = (int)Math.round(Math.random() * 10);
@@ -132,5 +129,5 @@
 
     @BeforeClass
-    public static void  init() throws OsmTransferException, InterruptedException{
+    public static void  init() throws OsmTransferException {
         logger.info("initializing ...");
         testProperties = new Properties();
Index: /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2497)
+++ /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2498)
@@ -62,8 +62,7 @@
     protected static void populateTestDataSetWithNodes(DataSet ds) {
         for (int i=0;i<100;i++) {
-            Node n = new Node(0);
+            Node n = new Node();
             n.setCoor(new LatLon(-36.6,47.6));
             n.put("name", "node-"+i);
-            n.incomplete = false;
             ds.addPrimitive(n);
         }
@@ -72,6 +71,5 @@
     protected static void populateTestDataSetWithWays(DataSet ds) {
         for (int i=0;i<20;i++) {
-            Way w = new Way(0);
-            w.incomplete = false;
+            Way w = new Way();
             for (int j = 0; j < 10;j++) {
                 w.addNode(lookupNode(ds, i+j));
@@ -84,6 +82,5 @@
     protected static void populateTestDataSetWithRelations(DataSet ds) {
         for (int i=0;i<10;i++) {
-            Relation r = new Relation(0);
-            r.incomplete = false;
+            Relation r = new Relation();
             r.put("name", "relation-" +i);
             for (int j =0; j < 10; j++) {
@@ -139,5 +136,5 @@
 
     @BeforeClass
-    public static void  init() throws OsmTransferException, InterruptedException{
+    public static void  init() throws OsmTransferException {
         logger.info("initializing ...");
         testProperties = new Properties();
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 2497)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java	(revision 2498)
@@ -1,10 +1,11 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.util.List;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
-
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
@@ -18,5 +19,4 @@
         Relation r = new Relation();
         r.put("name", "r1");
-        r.incomplete = false;
         DataSet ds = new DataSet();
         ds.addPrimitive(r);
@@ -39,9 +39,7 @@
         Relation r1 = new Relation();
         r1.put("name", "r1");
-        r1.incomplete = false;
 
         Relation r2 = new Relation();
         r2.put("name", "r2");
-        r2.incomplete = false;
 
         r1.addMember(new RelationMember("", r2));
@@ -69,13 +67,10 @@
         Relation r1 = new Relation();
         r1.put("name", "r1");
-        r1.incomplete = false;
 
         Relation r2 = new Relation();
         r2.put("name", "r2");
-        r2.incomplete = false;
 
         Relation r3 = new Relation();
         r3.put("name", "r3");
-        r3.incomplete = false;
 
         Relation r4 = new Relation(1);
@@ -116,13 +111,10 @@
         Relation r1 = new Relation();
         r1.put("name", "r1");
-        r1.incomplete = false;
 
         Relation r2 = new Relation();
         r2.put("name", "r2");
-        r2.incomplete = false;
 
         Relation r3 = new Relation();
         r3.put("name", "r3");
-        r3.incomplete = false;
 
         r1.addMember(new RelationMember("", r2));
@@ -152,13 +144,10 @@
         Relation r1 = new Relation();
         r1.put("name", "r1");
-        r1.incomplete = false;
 
         Relation r2 = new Relation();
         r2.put("name", "r2");
-        r2.incomplete = false;
 
         Relation r3 = new Relation();
         r3.put("name", "r3");
-        r3.incomplete = false;
 
         r1.addMember(new RelationMember("", r2));
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 2497)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 2498)
@@ -1001,5 +1001,4 @@
 
         Way w3 = new Way(3);
-        w3.incomplete = true;
         w3.setNodes(Arrays.asList(n1,n2));
         their.addPrimitive(w3);
@@ -1051,5 +1050,4 @@
         // an incomplete way with two incomplete nodes
         Way w3 = new Way(3);
-        w3.incomplete = true;
         w3.setNodes(Arrays.asList(n1,n2));
         their.addPrimitive(w3);
Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 2497)
+++ /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitorTest.java	(revision 2498)
@@ -136,5 +136,4 @@
         DataSet source = new DataSet();
         Way w1 = new Way(3);
-        w1.incomplete = true;
         source.addPrimitive(w1);
         source.setSelected(w1);