Index: /applications/editors/josm/plugins/measurement/build.xml
===================================================================
--- /applications/editors/josm/plugins/measurement/build.xml	(revision 32323)
+++ /applications/editors/josm/plugins/measurement/build.xml	(revision 32324)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="recompile dure to core change"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8554"/>
+    <property name="plugin.main.version" value="10369"/>
     <property name="plugin.canloadatruntime" value="true"/>
     
Index: /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
===================================================================
--- /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 32323)
+++ /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 32324)
@@ -96,5 +96,5 @@
             {
                 putValue(NAME, tr("Reset"));
-                putValue(SMALL_ICON,ImageProvider.get("dialogs", "select"));
+                new ImageProvider("dialogs", "select").getResource().attachImageIcon(this, true);
                 putValue(SHORT_DESCRIPTION, tr("Reset current measurement results and delete measurement path."));
                 putValue("help", HelpUtil.ht("/Dialog/Measurement#Reset"));
Index: /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java
===================================================================
--- /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java	(revision 32323)
+++ /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java	(revision 32324)
@@ -234,5 +234,5 @@
             Box panel = Box.createVerticalBox();
             final JList<GpxLayer> layerList = new JList<>(model);
-            Collection<Layer> data = Main.map.mapView.getAllLayers();
+            Collection<Layer> data = Main.getLayerManager().getLayers();
             Layer lastLayer = null;
             int layerCnt = 0;