Index: applications/editors/josm/plugins/build.xml
===================================================================
--- applications/editors/josm/plugins/build.xml	(revision 16407)
+++ applications/editors/josm/plugins/build.xml	(revision 16409)
@@ -35,6 +35,6 @@
         <ant antfile="build.xml" target="dist" dir="terracer"/>
         <ant antfile="build.xml" target="dist" dir="usertools"/>
-        <ant antfile="build.xml" target="dist" dir="utilsplugin"/>
-        <ant antfile="build.xml" target="dist" dir="validator"/>
+<!--        <ant antfile="build.xml" target="dist" dir="utilsplugin"/>
+-->        <ant antfile="build.xml" target="dist" dir="validator"/>
         <ant antfile="build.xml" target="dist" dir="waydownloader"/>
         <ant antfile="build.xml" target="dist" dir="wmsplugin"/>
Index: applications/editors/josm/plugins/routing/build.xml
===================================================================
--- applications/editors/josm/plugins/routing/build.xml	(revision 16407)
+++ applications/editors/josm/plugins/routing/build.xml	(revision 16409)
@@ -44,5 +44,5 @@
                 <attribute name="Plugin-Description" value="Provides routing capabilities."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
-                <attribute name="Plugin-Mainversion" value="1725"/>
+                <attribute name="Plugin-Mainversion" value="1755"/>
                 <attribute name="Plugin-Stage" value="50"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
Index: applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
===================================================================
--- applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 16407)
+++ applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 16409)
@@ -160,5 +160,5 @@
 
     public void addLayer() {
-        OsmDataLayer osmLayer = Main.main.editLayer();
+        OsmDataLayer osmLayer = Main.map.mapView.getEditLayer();
         RoutingLayer layer = new RoutingLayer(tr("Routing") + " [" + osmLayer.name + "]", osmLayer);
         layers.add(layer);
Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml	(revision 16407)
+++ applications/editors/josm/plugins/surveyor/build.xml	(revision 16409)
@@ -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="1722"/>
+                <attribute name="Plugin-Mainversion" value="1755"/>
                 <attribute name="Plugin-Requires" value="livegps"/>
                 <attribute name="Plugin-Stage" value="60"/>
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 16407)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java	(revision 16409)
@@ -39,8 +39,8 @@
     @Override
     public void run() {
-        if(Main.map == null || Main.map.mapView == null || Main.map.mapView.editLayer == null) {
+        if(Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null) {
             return;
         }
-        OsmDataLayer layer = Main.map.mapView.editLayer;
+        OsmDataLayer layer = Main.map.mapView.getEditLayer();
         try {
             DataSet dataset = layer.data;
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 16407)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 16409)
@@ -70,5 +70,5 @@
         node.put("created_by", "JOSM-surveyor-plugin");
         synchronized(LiveGpsLock.class) {
-            Main.main.editLayer().data.nodes.add(node);
+            Main.map.mapView.getEditLayer().data.nodes.add(node);
             Main.ds.setSelected(node);
         }
Index: applications/editors/josm/plugins/validator/build.xml
===================================================================
--- applications/editors/josm/plugins/validator/build.xml	(revision 16407)
+++ applications/editors/josm/plugins/validator/build.xml	(revision 16409)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="An OSM data validator. It checks for problems in data, and provides fixes for the common ones. Spellcheck integrated for tag names."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/Validator"/>
-                <attribute name="Plugin-Mainversion" value="1725"/>
+                <attribute name="Plugin-Mainversion" value="1755"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java
===================================================================
--- applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java	(revision 16407)
+++ applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java	(revision 16409)
@@ -132,5 +132,5 @@
      */
     public void layerRemoved(Layer oldLayer) {
-        if (oldLayer == Main.map.mapView.editLayer) {
+        if (oldLayer == Main.map.mapView.getEditLayer()) {
             Main.map.mapView.removeLayer(this);
         } else if (oldLayer == this) {