From 0fd1d596f9ac91e0bd540590526052a5a66d6672 Mon Sep 17 00:00:00 2001
From: Matthew W. S. Bell <matthew@bells23.org.uk>
Date: Fri, 6 Aug 2010 16:32:03 +0100
Subject: [PATCH 1/4] Correct method and variable names

---
 .../josm/actions/UploadSelectionAction.java        |    6 +++---
 src/org/openstreetmap/josm/data/osm/DataSet.java   |    2 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
index 99ba771..4ce7ba3 100644
--- a/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
@@ -92,8 +92,8 @@ public class UploadSelectionAction extends JosmAction{
         UploadHullBuilder builder = new UploadHullBuilder();
         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,
                     tr("No changes to upload."),
@@ -104,7 +104,7 @@ public class UploadSelectionAction extends JosmAction{
         }
         dialog.populate(
                 modifiedCandidates,
-                deletedCandiates
+                deletedCandidates
         );
         dialog.setVisible(true);
         if (dialog.isCanceled())
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index 0d84042..6b37453 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -899,7 +899,7 @@ public class DataSet implements Cloneable {
         highlightUpdateCount++;
     }
 
-    public void clenupDeletedPrimitives() {
+    public void cleanupDeletedPrimitives() {
         beginUpdate();
         try {
             if (cleanupDeleted(nodes.iterator())
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 3467d0b..7078082 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -397,7 +397,7 @@ public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis
         Main.main.undoRedo.clean(this);
 
         // if uploaded, clean the modified flags as well
-        data.clenupDeletedPrimitives();
+        data.cleanupDeletedPrimitives();
         for (OsmPrimitive p: data.allPrimitives()) {
             if (processed.contains(p)) {
                 p.setModified(false);
-- 
1.7.1