Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 13567)
+++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java	(revision 13568)
@@ -1470,5 +1470,5 @@
             newRel.addMember(new RelationMember("inner", w));
         }
-        cmds.add(layer != null ? new AddCommand(layer.data, newRel) :
+        cmds.add(layer != null ? new AddCommand(layer.getDataSet(), newRel) :
             new AddCommand(inner.iterator().next().getDataSet(), newRel));
         addedRelations.add(newRel);
Index: trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 13567)
+++ trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 13568)
@@ -57,5 +57,5 @@
             return;
         }
-        MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(editLayer.data);
+        MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(editLayer.getDataSet());
         ((OsmDataLayer) targetLayer).mergeFrom(builder.build());
     }
Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 13567)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 13568)
@@ -158,5 +158,5 @@
     public static boolean checkPreUploadConditions(AbstractModifiableLayer layer) {
         return checkPreUploadConditions(layer,
-                layer instanceof OsmDataLayer ? new APIDataSet(((OsmDataLayer) layer).data) : null);
+                layer instanceof OsmDataLayer ? new APIDataSet(((OsmDataLayer) layer).getDataSet()) : null);
     }
 
@@ -243,5 +243,5 @@
 
         final UploadDialog dialog = UploadDialog.getUploadDialog();
-        dialog.setChangesetTags(layer.data);
+        dialog.setChangesetTags(layer.getDataSet());
         dialog.setUploadedPrimitives(apiData);
         dialog.setVisible(true);
Index: trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 13567)
+++ trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 13568)
@@ -99,5 +99,5 @@
         }
         Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(editLayer.data.getAllSelected());
-        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(editLayer.data);
+        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(editLayer.getDataSet());
         if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) {
             JOptionPane.showMessageDialog(