Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 13954)
+++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 13955)
@@ -30,5 +30,4 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -287,17 +286,17 @@
 
     private BoundingXYVisitor modeSelectionOrConflict(BoundingXYVisitor v) {
-        Collection<OsmPrimitive> sel = new HashSet<>();
+        Collection<IPrimitive> sel = new HashSet<>();
         if ("selection".equals(mode)) {
-            DataSet dataSet = getLayerManager().getActiveDataSet();
+            OsmData<?, ?, ?, ?> dataSet = getLayerManager().getActiveData();
             if (dataSet != null) {
-                sel = dataSet.getSelected();
+                sel.addAll(dataSet.getSelected());
             }
         } else {
             ConflictDialog conflictDialog = MainApplication.getMap().conflictDialog;
-            Conflict<? extends OsmPrimitive> c = conflictDialog.getSelectedConflict();
+            Conflict<? extends IPrimitive> c = conflictDialog.getSelectedConflict();
             if (c != null) {
                 sel.add(c.getMy());
             } else if (conflictDialog.getConflicts() != null) {
-                sel = conflictDialog.getConflicts().getMyConflictParties();
+                sel.addAll(conflictDialog.getConflicts().getMyConflictParties());
             }
         }
@@ -310,6 +309,6 @@
             return null;
         }
-        for (OsmPrimitive osm : sel) {
-            osm.accept((PrimitiveVisitor) v);
+        for (IPrimitive osm : sel) {
+            osm.accept(v);
         }