Index: applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- applications/editors/josm/plugins/waydownloader/build.xml	(revision 34568)
+++ applications/editors/josm/plugins/waydownloader/build.xml	(revision 34569)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13927"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <property name="plugin.author" value="Harry Wood"/>
Index: applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java
===================================================================
--- applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 34568)
+++ applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 34569)
@@ -14,5 +14,4 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.MergeNodesAction;
@@ -22,4 +21,5 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -35,4 +35,5 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -105,6 +106,6 @@
 
             //Download a little rectangle around the selected node
-            double latbuffer = Main.pref.getDouble("waydownloader.latbuffer", 0.00001);
-            double lonbuffer = Main.pref.getDouble("waydownloader.latbuffer", 0.00002);
+            double latbuffer = Config.getPref().getDouble("waydownloader.latbuffer", 0.00001);
+            double lonbuffer = Config.getPref().getDouble("waydownloader.latbuffer", 0.00002);
             DownloadOsmTask downloadTask = new DownloadOsmTask();
             final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor();
@@ -171,5 +172,5 @@
 
                     int ret = JOptionPane.showConfirmDialog(
-                            Main.parent,
+                            MainApplication.getMainFrame(),
                             msg,
                             tr("Merge duplicate node?"),
@@ -184,5 +185,5 @@
                     );
                     if (cmd != null) {
-                    	MainApplication.undoRedo.add(cmd);
+                    	UndoRedoHandler.getInstance().add(cmd);
                         MainApplication.getLayerManager().getEditLayer().data.setSelected(selectedNode);
                     }