Changeset 3426 in josm


Ignore:
Timestamp:
2010-08-08T14:05:15+02:00 (14 years ago)
Author:
stoecker
Message:

see #5303 - some cleanup patches from matthew Bell - partially applied only

Location:
trunk/src/org/openstreetmap/josm
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

    r3336 r3426  
    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,
     
    105105        dialog.populate(
    106106                modifiedCandidates,
    107                 deletedCandiates
     107                deletedCandidates
    108108        );
    109109        dialog.setVisible(true);
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r3422 r3426  
    900900    }
    901901
    902     public void clenupDeletedPrimitives() {
     902    public void cleanupDeletedPrimitives() {
    903903        beginUpdate();
    904904        try {
  • trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

    r3423 r3426  
    9494            //
    9595            Collection<? extends OsmPrimitive> candidates = null;
    96             switch(source.getType()) {
     96            switch (source.getType()) {
    9797            case NODE: candidates = targetDataSet.getNodes(); break;
    98             case WAY: candidates  =targetDataSet.getWays(); break;
     98            case WAY: candidates  = targetDataSet.getWays(); break;
    9999            case RELATION: candidates = targetDataSet.getRelations(); break;
    100100            default: throw new AssertionError();
     
    134134    }
    135135
    136     protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException{
     136    protected OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) throws IllegalStateException {
    137137        PrimitiveId targetId = mergedMap.get(mergeSource.getPrimitiveId());
    138138        if (targetId == null)
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r3416 r3426  
    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)) {
Note: See TracChangeset for help on using the changeset viewer.