Index: /applications/editors/josm/plugins/routes/build.xml
===================================================================
--- /applications/editors/josm/plugins/routes/build.xml	(revision 18426)
+++ /applications/editors/josm/plugins/routes/build.xml	(revision 18427)
@@ -35,5 +35,5 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be defined in routes.xml file in plugin directory"/>
-                <attribute name="Plugin-Mainversion" value="2263"/>
+                <attribute name="Plugin-Mainversion" value="2388"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java
===================================================================
--- /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java	(revision 18426)
+++ /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java	(revision 18427)
@@ -1,9 +1,9 @@
 package org.openstreetmap.josm.plugins.routes;
 
-import java.awt.Stroke;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Stroke;
 import java.util.ArrayList;
 import java.util.List;
@@ -105,5 +105,5 @@
 		pathBuilder.clear();
 
-		for (Relation relation:dataset.relations) {
+		for (Relation relation:dataset.getRelations()) {
 			for (RouteDefinition route:routes) {
 				if (route.matches(relation)) {
@@ -113,5 +113,5 @@
 		}
 
-		for (Way way:dataset.ways) {
+		for (Way way:dataset.getWays()) {
 			for (RouteDefinition route:routes) {
 				if (route.matches(way)) {
Index: /applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/build.xml	(revision 18426)
+++ /applications/editors/josm/plugins/surveyor/build.xml	(revision 18427)
@@ -37,5 +37,5 @@
                 <attribute name="Plugin-Description" value="Allow adding markers/nodes on current gps positions."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Surveyor"/>
-                <attribute name="Plugin-Mainversion" value="2012"/>
+                <attribute name="Plugin-Mainversion" value="2388"/>
                 <attribute name="Plugin-Requires" value="livegps"/>
                 <attribute name="Plugin-Stage" value="60"/>
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 18426)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 18427)
@@ -70,5 +70,5 @@
         node.put("created_by", "JOSM-surveyor-plugin");
         synchronized(LiveGpsLock.class) {
-            Main.map.mapView.getEditLayer().data.nodes.add(node);
+            Main.map.mapView.getEditLayer().data.addPrimitive(node);
             Main.main.getCurrentDataSet().setSelected(node);
         }