Changeset 13568 in josm


Ignore:
Timestamp:
2018-03-25T19:22:01+02:00 (20 months ago)
Author:
Don-vip
Message:

use OsmDataLayer.getDataSet()

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

Legend:

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

    r13434 r13568  
    14701470            newRel.addMember(new RelationMember("inner", w));
    14711471        }
    1472         cmds.add(layer != null ? new AddCommand(layer.data, newRel) :
     1472        cmds.add(layer != null ? new AddCommand(layer.getDataSet(), newRel) :
    14731473            new AddCommand(inner.iterator().next().getDataSet(), newRel));
    14741474        addedRelations.add(newRel);
  • trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java

    r13434 r13568  
    5757            return;
    5858        }
    59         MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(editLayer.data);
     59        MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(editLayer.getDataSet());
    6060        ((OsmDataLayer) targetLayer).mergeFrom(builder.build());
    6161    }
  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r13133 r13568  
    158158    public static boolean checkPreUploadConditions(AbstractModifiableLayer layer) {
    159159        return checkPreUploadConditions(layer,
    160                 layer instanceof OsmDataLayer ? new APIDataSet(((OsmDataLayer) layer).data) : null);
     160                layer instanceof OsmDataLayer ? new APIDataSet(((OsmDataLayer) layer).getDataSet()) : null);
    161161    }
    162162
     
    243243
    244244        final UploadDialog dialog = UploadDialog.getUploadDialog();
    245         dialog.setChangesetTags(layer.data);
     245        dialog.setChangesetTags(layer.getDataSet());
    246246        dialog.setUploadedPrimitives(apiData);
    247247        dialog.setVisible(true);
  • trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

    r13497 r13568  
    9999        }
    100100        Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(editLayer.data.getAllSelected());
    101         Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(editLayer.data);
     101        Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(editLayer.getDataSet());
    102102        if (modifiedCandidates.isEmpty() && deletedCandidates.isEmpty()) {
    103103            JOptionPane.showMessageDialog(
Note: See TracChangeset for help on using the changeset viewer.