Changeset 16438 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java
- Timestamp:
- 2020-05-17T14:18:22+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveTagTransferPaster.java
r15905 r16438 27 27 import org.openstreetmap.josm.gui.conflict.tags.PasteTagsConflictResolverDialog; 28 28 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTagTransferData; 29 import org.openstreetmap.josm.tools.StreamUtils; 29 30 30 31 /** … … 50 51 51 52 TagPasteSupport tagPaster = new TagPasteSupport(data, selection); 52 List<Command> commands = new ArrayList<>(); 53 for (Tag tag : tagPaster.execute()) { 54 Map<String, String> tags = Collections.singletonMap(tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue()); 55 ChangePropertyCommand cmd = new ChangePropertyCommand(OsmDataManager.getInstance().getEditDataSet(), selection, tags); 56 if (cmd.getObjectsNumber() > 0) { 57 commands.add(cmd); 58 } 59 } 53 List<Command> commands = tagPaster.execute().stream() 54 .map(tag -> Collections.singletonMap(tag.getKey(), "".equals(tag.getValue()) ? null : tag.getValue())) 55 .map(tags -> new ChangePropertyCommand(OsmDataManager.getInstance().getEditDataSet(), selection, tags)) 56 .filter(cmd -> cmd.getObjectsNumber() > 0) 57 .collect(StreamUtils.toUnmodifiableList()); 60 58 commitCommands(selection, commands); 61 59 return true; … … 124 122 */ 125 123 protected boolean canPasteFromHeterogeneousSourceWithoutConflict() { 126 for (OsmPrimitiveType type : OsmPrimitiveType.dataValues()) { 127 if (hasTargetPrimitives(type)) { 128 TagCollection tc = data.getForPrimitives(type); 129 if (!tc.isEmpty() && !tc.isApplicableToPrimitive()) 130 return false; 131 } 132 } 133 return true; 124 return OsmPrimitiveType.dataValues().stream() 125 .filter(this::hasTargetPrimitives) 126 .map(data::getForPrimitives) 127 .allMatch(tc -> tc.isEmpty() || tc.isApplicableToPrimitive()); 134 128 } 135 129
Note:
See TracChangeset
for help on using the changeset viewer.