Ticket #5303: 0001-Correct-method-and-variable-names.patch

File 0001-Correct-method-and-variable-names.patch, 3.0 KB (added by Matthew Bell, 16 years ago)

  • src/org/openstreetmap/josm/actions/UploadSelectionAction.java 

    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 b public class UploadSelectionAction extends JosmAction{  
    9292        UploadHullBuilder builder = new UploadHullBuilder();
    9393        UploadSelectionDialog dialog = new UploadSelectionDialog();
    9494        Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(getEditLayer().data.getSelected());
    95         Collection<OsmPrimitive> deletedCandiates = getDeletedPrimitives(getEditLayer().data);
    96         if (modifiedCandidates.isEmpty() && deletedCandiates.isEmpty()) {
     95        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(getEditLayer().data);
     96        if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) {
    9797            JOptionPane.showMessageDialog(
    9898                    Main.parent,
    9999                    tr("No changes to upload."),
    … … public class UploadSelectionAction extends JosmAction{  
    104104        }
    105105        dialog.populate(
    106106                modifiedCandidates,
    107                 deletedCandiates
     107                deletedCandidates
    108108        );
    109109        dialog.setVisible(true);
    110110        if (dialog.isCanceled())

  • src/org/openstreetmap/josm/data/osm/DataSet.java 

    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 b public class DataSet implements Cloneable {  
    899899        highlightUpdateCount++;
    900900    }
    901901
    902     public void clenupDeletedPrimitives() {
     902    public void cleanupDeletedPrimitives() {
    903903        beginUpdate();
    904904        try {
    905905            if (cleanupDeleted(nodes.iterator())

  • src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java 

    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 b public class OsmDataLayer extends Layer implements Listener, SelectionChangedLis  
    397397        Main.main.undoRedo.clean(this);
    398398
    399399        // if uploaded, clean the modified flags as well
    400         data.clenupDeletedPrimitives();
     400        data.cleanupDeletedPrimitives();
    401401        for (OsmPrimitive p: data.allPrimitives()) {
    402402            if (processed.contains(p)) {
    403403                p.setModified(false);