Changeset 1813 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2009-07-19T18:31:22+02:00 (15 years ago)

Author:

jttt

Message:

Make tests compile using new ProgressMonitor API

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-
 
 import java.io.File;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.projection.Mercator;
-import org.openstreetmap.josm.gui.PleaseWaitDialog;
 
 public class MergeVisitorTest {
@@ -62 +60 @@
             System.setProperty("josm.home", josmHome);
         }
-        Main.pleaseWaitDlg = new PleaseWaitDialog(null);
         Main.pref.init(false);
 
@@ -863 +860 @@
      * 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 +922 @@
      * 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