Index: trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 3425)
+++ trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java	(revision 3426)
@@ -93,6 +93,6 @@
         UploadSelectionDialog dialog = new UploadSelectionDialog();
         Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(getEditLayer().data.getSelected());
-        Collection<OsmPrimitive> deletedCandiates = getDeletedPrimitives(getEditLayer().data);
-        if (modifiedCandidates.isEmpty() && deletedCandiates.isEmpty()) {
+        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(getEditLayer().data);
+        if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) {
             JOptionPane.showMessageDialog(
                     Main.parent,
@@ -105,5 +105,5 @@
         dialog.populate(
                 modifiedCandidates,
-                deletedCandiates
+                deletedCandidates
         );
         dialog.setVisible(true);
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 3425)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 3426)
@@ -900,5 +900,5 @@
     }
 
-    public void clenupDeletedPrimitives() {
+    public void cleanupDeletedPrimitives() {
         beginUpdate();
         try {
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 3425)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 3426)
@@ -94,7 +94,7 @@
             //
             Collection<? extends OsmPrimitive> candidates = null;
-            switch(source.getType()) {
+            switch (source.getType()) {
             case NODE: candidates = targetDataSet.getNodes(); break;
-            case WAY: candidates  =targetDataSet.getWays(); break;
+            case WAY: candidates  = targetDataSet.getWays(); break;
             case RELATION: candidates = targetDataSet.getRelations(); break;
             default: throw new AssertionError();
@@ -134,5 +134,5 @@
     }
 
-    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException{
+    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException {
         PrimitiveId targetId = mergedMap.get(mergeSource.getPrimitiveId());
         if (targetId == null)
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 3425)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 3426)
@@ -398,5 +398,5 @@
 
         // if uploaded, clean the modified flags as well
-        data.clenupDeletedPrimitives();
+        data.cleanupDeletedPrimitives();
         for (OsmPrimitive p: data.allPrimitives()) {
             if (processed.contains(p)) {