Index: applications/editors/josm/plugins/FastDraw/build.xml
===================================================================
--- applications/editors/josm/plugins/FastDraw/build.xml	(revision 32309)
+++ applications/editors/josm/plugins/FastDraw/build.xml	(revision 32444)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_fastdraw] Fix incorrect settings saving-2"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7609"/>
+    <property name="plugin.main.version" value="10353"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java
===================================================================
--- applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 32309)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 32444)
@@ -6,4 +6,6 @@
  */
 package org.openstreetmap.josm.plugins.fastdraw;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -15,5 +17,4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -22,4 +23,5 @@
 import java.util.Map;
 import java.util.Set;
+
 import javax.swing.JOptionPane;
 
@@ -46,5 +48,4 @@
 import org.openstreetmap.josm.gui.util.KeyPressReleaseListener;
 import org.openstreetmap.josm.gui.util.ModifierListener;
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -110,5 +111,5 @@
         line.setMv(mv);
         
-        if (getCurrentDataSet() == null) return;
+        if (getLayerManager().getEditDataSet() == null) return;
 
         Main.map.mapView.addMouseListener(this);
@@ -145,5 +146,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getEditLayer() != null);
+        setEnabled(getLayerManager().getEditLayer() != null);
     }
 
@@ -593,5 +594,5 @@
         } else cmds.add(new AddCommand(w));
         Command c = new SequenceCommand(tr("Draw the way by mouse"), cmds);
-        if (!Main.main.hasEditLayer()) return;
+        if (getLayerManager().getEditLayer() == null) return;
         Main.main.undoRedo.add(c);
         lineWasSaved = true;
@@ -600,5 +601,5 @@
             // Select this way and switch drawing mode off
             exitMode();
-            getCurrentDataSet().setSelected(w);
+            getLayerManager().getEditDataSet().setSelected(w);
             Main.map.selectSelectTool(false);
         }
@@ -691,5 +692,5 @@
     private void tryToLoadWay() {
         updateCursor();
-        Collection<Way> selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
+        Collection<Way> selectedWays = Main.getLayerManager().getEditDataSet().getSelectedWays();
         if (selectedWays!=null // if there is a selection
             && selectedWays.size()==1 // and one way is selected