Index: applications/editors/josm/plugins/osmarender/build.xml
===================================================================
--- applications/editors/josm/plugins/osmarender/build.xml	(revision 18416)
+++ applications/editors/josm/plugins/osmarender/build.xml	(revision 18417)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Launches FireFox to display the current visible screen as a nice SVG image."/>
-                <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/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java
===================================================================
--- applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 18416)
+++ applications/editors/josm/plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java	(revision 18417)
@@ -56,7 +56,7 @@
             CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet(), true);
             DataSet fromDataSet = new DataSet();
-            for (Node n : Main.main.getCurrentDataSet().nodes) {
+            for (Node n : Main.main.getCurrentDataSet().getNodes()) {
                 if (n.isUsable() && n.getCoor().isWithin(b)) {
-                    fromDataSet.nodes.add(n);
+                    fromDataSet.addPrimitive(n);
                     n.visit(backRefsV);
                 }
Index: applications/editors/josm/plugins/remotecontrol/build.xml
===================================================================
--- applications/editors/josm/plugins/remotecontrol/build.xml	(revision 18416)
+++ applications/editors/josm/plugins/remotecontrol/build.xml	(revision 18417)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Let other applications send commands to JOSM."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/RemoteControl"/>
-                <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/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java
===================================================================
--- applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java	(revision 18416)
+++ applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java	(revision 18417)
@@ -37,5 +37,4 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 
 /**
@@ -167,6 +166,6 @@
                         maxlon = downloadBounds.getMaxX();
                     }
-                    Future<?> future = osmTask.download(false /*no new layer*/, new Bounds(minlat,minlon,maxlat,maxlon), null /* let the task manage the progress monitor */);                    
-                    Main.worker.submit(new PostDownloadHandler(osmTask, future));                    
+                    Future<?> future = osmTask.download(false /*no new layer*/, new Bounds(minlat,minlon,maxlat,maxlon), null /* let the task manage the progress monitor */);
+                    Main.worker.submit(new PostDownloadHandler(osmTask, future));
                 } catch (AlreadyLoadedException ex) {
                     System.out.println("RemoteControl: no download necessary");
@@ -199,7 +198,7 @@
                                 }
                             }
-                            for (Way w : Main.main.getCurrentDataSet().ways) if (ways.contains(w.getId())) newSel.add(w);
-                            for (Node n : Main.main.getCurrentDataSet().nodes) if (nodes.contains(n.getId())) newSel.add(n);
-                            for (Relation r : Main.main.getCurrentDataSet().relations) if (relations.contains(r.getId())) newSel.add(r);
+                            for (Way w : Main.main.getCurrentDataSet().getWays()) if (ways.contains(w.getId())) newSel.add(w);
+                            for (Node n : Main.main.getCurrentDataSet().getNodes()) if (nodes.contains(n.getId())) newSel.add(n);
+                            for (Relation r : Main.main.getCurrentDataSet().getRelations()) if (relations.contains(r.getId())) newSel.add(r);
                             Main.main.getCurrentDataSet().setSelected(newSel);
                             if (Main.pref.getBoolean("remotecontrol.permission.change-viewport", true))
@@ -291,6 +290,6 @@
      * Adds a node, reacts to the GET /add_node?lon=...&amp;lat=... request.
      * @param args
-     * @param out 
-     * @throws IOException 
+     * @param out
+     * @throws IOException
      */
     private void addNode(HashMap<String, String> args, Writer out) throws IOException {
@@ -299,19 +298,19 @@
             return;
         }
-        
+
         // Parse the arguments
         double lat = Double.parseDouble(args.get("lat"));
         double lon = Double.parseDouble(args.get("lon"));
         System.out.println("Adding node at (" + lat + ", " + lon + ")");
-        
+
         // Create a new node
         LatLon ll = new LatLon(lat, lon);
         Node nnew = new Node(ll);
-        
+
         // Now execute the commands to add this node.
         Main.main.undoRedo.add(new AddCommand(nnew));
         Main.main.getCurrentDataSet().setSelected(nnew);
         Main.map.mapView.repaint();
-        
+
     }
 
Index: applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- applications/editors/josm/plugins/waydownloader/build.xml	(revision 18416)
+++ 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 18416)
+++ 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)) {