Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 10741)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 10742)
@@ -885,5 +885,5 @@
             return ((DrawAction) map.mapMode).getInProgressSelection();
         } else {
-            DataSet ds = getCurrentDataSet();
+            DataSet ds = getLayerManager().getEditDataSet();
             if (ds == null) return null;
             return ds.getSelected();
Index: trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java	(revision 10741)
+++ trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java	(revision 10742)
@@ -13,4 +13,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 
@@ -101,5 +102,5 @@
     }
 
-    public static void bookmarkOffset(String name, ImageryLayer layer) {
+    public static void bookmarkOffset(String name, AbstractTileSourceLayer layer) {
         LatLon center;
         if (Main.isDisplayingMapView()) {
@@ -110,5 +111,5 @@
         OffsetBookmark nb = new OffsetBookmark(
                 Main.getProjection().toCode(), layer.getInfo().getName(),
-                name, layer.getDx(), layer.getDy(), center.lon(), center.lat());
+                name, layer.getDisplaySettings().getDx(), layer.getDisplaySettings().getDy(), center.lon(), center.lat());
         for (ListIterator<OffsetBookmark> it = allBookmarks.listIterator(); it.hasNext();) {
             OffsetBookmark b = it.next();
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 10741)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 10742)
@@ -190,9 +190,9 @@
     /**
      * This class is an adapter for the old layer change interface.
-     * <p>
-     * New implementations should use {@link org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener}
      * @author Michael Zangl
      * @since 10271
-     */
+     * @deprecated New implementations should use {@link org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener}
+     */
+    @Deprecated
     protected static class LayerChangeAdapter implements ActiveLayerChangeListener, LayerManager.LayerChangeListener {
 
@@ -669,5 +669,5 @@
      */
     public boolean isActiveLayerDrawable() {
-         return getEditLayer() != null;
+         return layerManager.getEditLayer() != null;
     }
 
@@ -678,5 +678,5 @@
      */
     public boolean isActiveLayerVisible() {
-        OsmDataLayer e = getEditLayer();
+        OsmDataLayer e = layerManager.getEditLayer();
         return e != null && e.isVisible();
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 10741)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 10742)
@@ -1246,5 +1246,5 @@
 
     private LatLon getShiftedLatLon(EastNorth en) {
-        return Main.getProjection().eastNorth2latlon(en.add(-getDx(), -getDy()));
+        return Main.getProjection().eastNorth2latlon(en.add(-getDisplaySettings().getDx(), -getDisplaySettings().getDy()));
     }
 
Index: trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 10741)
+++ trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 10742)
@@ -143,5 +143,5 @@
     public static <T> boolean exists(Iterable<T> collection, Class<? extends T> clazz) {
         CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
-        return exists(collection, clazz::isInstance);
+        return StreamUtils.toStream(collection).anyMatch(clazz::isInstance);
     }