Index: applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- applications/editors/josm/plugins/waydownloader/build.xml	(revision 18300)
+++ applications/editors/josm/plugins/waydownloader/build.xml	(revision 18417)
@@ -91,5 +91,5 @@
                 <attribute name="Plugin-Description" value="Easy downloading along a long set of interconnected ways"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WayDownloaderPlugin"/>
-                <attribute name="Plugin-Mainversion" value="2327"/>
+                <attribute name="Plugin-Mainversion" value="2381"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
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 18300)
+++ applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 18417)
@@ -102,12 +102,12 @@
                         DownloadOsmTask downloadTask = new DownloadOsmTask();
                         final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor();
-                        final Future<?> future = downloadTask.download( 
+                        final Future<?> future = downloadTask.download(
                         		false /* no new layer */,
                         		new Bounds(
-                        				selectedNode.getCoor().lat()- latbuffer, 
-                        				selectedNode.getCoor().lon()- lonbuffer, 
-                        				selectedNode.getCoor().lat()+ latbuffer, 
+                        				selectedNode.getCoor().lat()- latbuffer,
+                        				selectedNode.getCoor().lon()- lonbuffer,
+                        				selectedNode.getCoor().lat()+ latbuffer,
                         				selectedNode.getCoor().lon()+ lonbuffer
-                        		), 
+                        		),
                         		monitor
                         );
@@ -200,5 +200,5 @@
     /** See if there's another node at the same coordinates. If so return it. Otherwise null */
     private Node duplicateNode() {
-        for (Node onNode:Main.main.getCurrentDataSet().nodes) {
+        for (Node onNode:Main.main.getCurrentDataSet().getNodes()) {
             if (!onNode.equals(this.selectedNode)
                     && !onNode.incomplete
@@ -223,5 +223,5 @@
 
         //loop through every way
-        for (Way onWay:Main.main.getCurrentDataSet().ways) {
+        for (Way onWay:Main.main.getCurrentDataSet().getWays()) {
             if (onWay.getNodesCount() >= 2) {
                 if (onWay.isFirstLastNode(selectedNode)) {