Index: /trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java =================================================================== --- /trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (revision 1812) +++ /trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (revision 1813) @@ -19,5 +19,5 @@ import org.openstreetmap.josm.data.osm.history.HistoryDataSet; import org.openstreetmap.josm.data.projection.Mercator; -import org.openstreetmap.josm.gui.PleaseWaitDialog; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.openstreetmap.josm.io.OsmServerHistoryReader; import org.openstreetmap.josm.io.OsmTransferException; @@ -54,5 +54,4 @@ } System.setProperty("josm.home", josmHome); - Main.pleaseWaitDlg = new PleaseWaitDialog(null); Main.pref.init(false); @@ -74,5 +73,5 @@ HistoryDataSet ds = null; try { - ds = reader.parseHistory(); + ds = reader.parseHistory(NullProgressMonitor.INSTANCE); } catch(OsmTransferException e) { e.printStackTrace(); Index: /trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java =================================================================== --- /trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 1812) +++ /trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 1813) @@ -3,7 +3,8 @@ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.junit.Assert.*; import java.io.File; @@ -31,5 +32,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.projection.Mercator; -import org.openstreetmap.josm.gui.PleaseWaitDialog; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.xml.sax.SAXException; @@ -39,5 +40,5 @@ /** * builds a large data set to be used later for testing MULTI FETCH on the server - * + * * @return a large data set */ @@ -120,5 +121,5 @@ /** * creates the dataset on the server. - * + * * @param ds the data set * @throws OsmTransferException @@ -132,5 +133,5 @@ OsmServerWriter writer = new OsmServerWriter(); - writer.uploadOsm("0.6", primitives); + writer.uploadOsm("0.6", primitives, NullProgressMonitor.INSTANCE); } @@ -177,5 +178,4 @@ // System.setProperty("josm.home", josmHome); - Main.pleaseWaitDlg = new PleaseWaitDialog(null); Main.pref.init(false); // don't use atomic upload, the test API server can't cope with large diff uploads @@ -237,5 +237,5 @@ ds = new DataSet(); FileInputStream fis = new FileInputStream(f); - ds = OsmReader.parseDataSet(fis, Main.pleaseWaitDlg); + ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); fis.close(); } @@ -248,5 +248,5 @@ reader.append(nodes.get(i)); } - DataSet out = reader.parseOsm(); + DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(10, out.nodes.size()); Iterator it = out.nodes.iterator(); @@ -267,5 +267,5 @@ reader.append(ways.get(i)); } - DataSet out = reader.parseOsm(); + DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(10, out.ways.size()); Iterator it = out.ways.iterator(); @@ -287,5 +287,5 @@ reader.append(relations.get(i)); } - DataSet out = reader.parseOsm(); + DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(10, out.relations.size()); Iterator it = out.relations.iterator(); @@ -307,5 +307,5 @@ reader.append(nodes.get(i)); } - DataSet out = reader.parseOsm(); + DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(812, out.nodes.size()); Iterator it = out.nodes.iterator(); @@ -328,5 +328,5 @@ Node n = new Node(9999999); reader.append(n); // doesn't exist - DataSet out = reader.parseOsm(); + DataSet out = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(10, out.nodes.size()); Iterator it = out.nodes.iterator(); Index: /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java =================================================================== --- /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 1812) +++ /trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 1813) @@ -31,5 +31,5 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.projection.Mercator; -import org.openstreetmap.josm.gui.PleaseWaitDialog; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; import org.xml.sax.SAXException; @@ -123,5 +123,5 @@ /** * creates the dataset on the server. - * + * * @param ds the data set * @throws OsmTransferException @@ -134,5 +134,5 @@ primitives.addAll(ds.relations); OsmServerWriter writer = new OsmServerWriter(); - writer.uploadOsm("0.6", primitives); + writer.uploadOsm("0.6", primitives, NullProgressMonitor.INSTANCE); } @@ -182,5 +182,4 @@ // System.setProperty("josm.home", josmHome); - Main.pleaseWaitDlg = new PleaseWaitDialog(null); Main.pref.init(false); // don't use atomic upload, the test API server can't cope with large diff uploads @@ -241,5 +240,5 @@ ds = new DataSet(); FileInputStream fis = new FileInputStream(f); - ds = OsmReader.parseDataSet(fis, Main.pleaseWaitDlg); + ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); fis.close(); } @@ -254,5 +253,5 @@ OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(n); reader.setReadFull(false); - DataSet referers = reader.parseOsm(); + DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(10, referers.nodes.size()); assertEquals(1, referers.ways.size()); @@ -273,5 +272,5 @@ OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(n); reader.setReadFull(true); - DataSet referers = reader.parseOsm(); + DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(10, referers.nodes.size()); assertEquals(1, referers.ways.size()); @@ -293,5 +292,5 @@ OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(w); reader.setReadFull(false); - DataSet referers = reader.parseOsm(); + 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 @@ -317,5 +316,5 @@ OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(w); reader.setReadFull(true); - DataSet referers = reader.parseOsm(); + DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); assertEquals(6, referers.ways.size()); // 6 ways referred by two relations for (Way w1: referers.ways) { @@ -352,5 +351,5 @@ OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(r); reader.setReadFull(false); - DataSet referers = reader.parseOsm(); + DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); Set referringRelationsIds = new HashSet(); @@ -448,5 +447,5 @@ OsmServerBackreferenceReader reader = new OsmServerBackreferenceReader(r); reader.setReadFull(true); - DataSet referers = reader.parseOsm(); + DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE); Set referringRelationsIds = new HashSet(); Index: /trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java =================================================================== --- /trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (revision 1812) +++ /trunk/test/functional/org/openstreetmap/josm/io/OsmServerHistoryReaderTest.java (revision 1813) @@ -8,5 +8,5 @@ import org.openstreetmap.josm.data.osm.history.History; import org.openstreetmap.josm.data.osm.history.HistoryDataSet; -import org.openstreetmap.josm.gui.PleaseWaitDialog; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; public class OsmServerHistoryReaderTest { @@ -15,5 +15,4 @@ public static void init() { System.setProperty("josm.home", "C:\\data\\projekte\\osm\\tag-editor-plugin"); - Main.pleaseWaitDlg = new PleaseWaitDialog(null); Main.pref.init(false); } @@ -22,5 +21,5 @@ public void test1() throws OsmTransferException { OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.NODE,266187); - HistoryDataSet ds = reader.parseHistory(); + HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE); History h = ds.getHistory(266187); System.out.println("num versions: " + h.getNumVersions()); @@ -30,5 +29,5 @@ public void test2() throws OsmTransferException { OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.WAY,32916); - HistoryDataSet ds = reader.parseHistory(); + HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE); History h = ds.getHistory(32916); System.out.println("num versions: " + h.getNumVersions()); @@ -38,5 +37,5 @@ public void test3() throws OsmTransferException { OsmServerHistoryReader reader = new OsmServerHistoryReader(OsmPrimitiveType.RELATION,49); - HistoryDataSet ds = reader.parseHistory(); + HistoryDataSet ds = reader.parseHistory(NullProgressMonitor.INSTANCE); History h = ds.getHistory(49); System.out.println("num versions: " + h.getNumVersions()); Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (revision 1812) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (revision 1813) @@ -5,5 +5,4 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import java.io.File; @@ -27,5 +26,4 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.projection.Mercator; -import org.openstreetmap.josm.gui.PleaseWaitDialog; public class MergeVisitorTest { @@ -62,5 +60,4 @@ System.setProperty("josm.home", josmHome); } - Main.pleaseWaitDlg = new PleaseWaitDialog(null); Main.pref.init(false); @@ -863,5 +860,5 @@ * My dataset includes a deleted node. * Their dataset includes a way with three nodes, the first one being my node. - * + * * => the merged way should include two nodes only. the deleted node should still be * in the data set @@ -925,5 +922,5 @@ * My dataset includes a deleted node. * Their dataset includes a relation with thre nodes, the first one being my node. - * + * * => the merged relation should include two nodes only. the deleted node should still be * in the data set