Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 10394)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 10395)
@@ -819,6 +819,5 @@
      *
      * @param layer the layer
-     * @param viewport the viewport to zoom to; can be null, then the viewport
-     * isn't changed
+     * @param viewport the viewport to zoom to; can be null, then the viewport isn't changed
      */
     public final synchronized void addLayer(final Layer layer, ViewportData viewport) {
Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 10394)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 10395)
@@ -423,5 +423,5 @@
      */
     public boolean selectMapMode(MapMode newMapMode) {
-        return selectMapMode(newMapMode, mapView.getActiveLayer());
+        return selectMapMode(newMapMode, mapView.getLayerManager().getActiveLayer());
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 10394)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 10395)
@@ -596,5 +596,5 @@
     /**
      * Returns current data set. To be removed: end of 2016.
-     * @deprecated Use {@link Main#getLayerManager()} instead.
+     * @deprecated Use {@link #getLayerManager()}.getEditDataSet() instead.
      */
     @Override
@@ -1295,6 +1295,6 @@
      * Schedule a zoom to the given position on the next redraw.
      * Temporary, may be removed without warning.
-     * @param viewportData
-     * @since xxx
+     * @param viewportData the viewport to zoom to
+     * @since 10394
      */
     public void scheduleZoomTo(ViewportData viewportData) {
Index: trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 10394)
+++ trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 10395)
@@ -304,4 +304,10 @@
     }
 
+    /**
+     * Returns current data set. To be removed: end of 2016.
+     * @return current data set
+     * @deprecated Use {@link Main#getLayerManager()}.getEditDataSet() instead.
+     */
+    @Deprecated
     protected DataSet getCurrentDataSet() {
         return Main.main.getCurrentDataSet();
@@ -794,5 +800,5 @@
     private Map<Double, List<Node>> getNearestNodesImpl(Point p, Predicate<OsmPrimitive> predicate) {
         Map<Double, List<Node>> nearestMap = new TreeMap<>();
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
 
         if (ds != null) {
@@ -1003,5 +1009,5 @@
     private Map<Double, List<WaySegment>> getNearestWaySegmentsImpl(Point p, Predicate<OsmPrimitive> predicate) {
         Map<Double, List<WaySegment>> nearestMap = new TreeMap<>();
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
 
         if (ds != null) {
@@ -1364,5 +1370,5 @@
     public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean useSelected) {
         Collection<OsmPrimitive> sel;
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
         if (useSelected && ds != null) {
             sel = ds.getSelected();
Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 10394)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 10395)
@@ -398,5 +398,5 @@
         } else {
             // nodes
-            for (Node n : nc.getCurrentDataSet().getNodes()) {
+            for (Node n : Main.getLayerManager().getEditDataSet().getNodes()) {
                 if (n.isSelectable() && selectionResult.contains(nc.getPoint2D(n))) {
                     selection.add(n);
@@ -405,5 +405,5 @@
 
             // ways
-            for (Way w : nc.getCurrentDataSet().getWays()) {
+            for (Way w : Main.getLayerManager().getEditDataSet().getWays()) {
                 if (!w.isSelectable() || w.getNodesCount() == 0) {
                     continue;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 10394)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 10395)
@@ -376,5 +376,5 @@
         public void actionPerformed(ActionEvent e) {
             if (noteData == null) { //there is no notes layer. Create one first
-                Main.map.mapView.addLayer(new NoteLayer());
+                Main.getLayerManager().addLayer(new NoteLayer());
             }
             Main.map.selectMapMode(new AddNoteAction(Main.map, noteData));
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 10394)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 10395)
@@ -387,5 +387,5 @@
         highlightUpdateCount = data.getHighlightUpdateCount();
 
-        boolean active = mv.getActiveLayer() == this;
+        boolean active = mv.getLayerManager().getActiveLayer() == this;
         boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
         boolean virtual = !inactive && mv.isVirtualNodesEnabled();