Index: /applications/editors/josm/plugins/routes/build.xml
===================================================================
--- /applications/editors/josm/plugins/routes/build.xml	(revision 16593)
+++ /applications/editors/josm/plugins/routes/build.xml	(revision 16594)
@@ -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="1725"/>
+                <attribute name="Plugin-Mainversion" value="1815"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java
===================================================================
--- /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java	(revision 16593)
+++ /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java	(revision 16594)
@@ -65,5 +65,5 @@
     	Way way = Main.map.mapView.getNearestWay(e.getPoint());
     	
-    	Collection<OsmPrimitive> selectedRelations = Main.ds.getSelectedRelations();
+    	Collection<OsmPrimitive> selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations();
     	
     	if (way != null) {
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 16593)
+++ /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java	(revision 16594)
@@ -97,5 +97,5 @@
 		pathBuilder.clear();
 
-		for (Relation relation:Main.ds.relations) {
+		for (Relation relation:Main.main.getCurrentDataSet().relations) {
 			for (RouteDefinition route:routes) {
 				if (route.matches(relation)) {
@@ -105,5 +105,5 @@
 		}
 
-		for (Way way:Main.ds.ways) {
+		for (Way way:Main.main.getCurrentDataSet().ways) {
 			for (RouteDefinition route:routes) {
 				if (route.matches(way)) {
