Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 17981) @@ -24,4 +24,5 @@ import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.DefaultNameFormatter; +import org.openstreetmap.josm.data.osm.IPrimitive; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; @@ -193,10 +194,5 @@ throw new IllegalArgumentException(osm + " is already deleted"); clonedPrimitives.put(osm, osm.save()); - - if (osm instanceof Way) { - ((Way) osm).setNodes(null); - } else if (osm instanceof Relation) { - ((Relation) osm).setMembers(null); - } + IPrimitive.resetPrimitiveChildren(osm); } Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (revision 17981) @@ -203,32 +203,5 @@ copyFrom.getReadLock().lock(); try { - Map primMap = new HashMap<>(); - for (Node n : copyFrom.getNodes()) { - Node newNode = new Node(n); - primMap.put(n, newNode); - addPrimitive(newNode); - } - for (Way w : copyFrom.getWays()) { - Way newWay = new Way(w, false, false); - primMap.put(w, newWay); - List newNodes = w.getNodes().stream() - .map(n -> (Node) primMap.get(n)) - .collect(Collectors.toList()); - newWay.setNodes(newNodes); - addPrimitive(newWay); - } - // Because relations can have other relations as members we first clone all relations - // and then get the cloned members - Collection relations = copyFrom.getRelations(); - for (Relation r : relations) { - Relation newRelation = new Relation(r, false, false); - primMap.put(r, newRelation); - addPrimitive(newRelation); - } - for (Relation r : relations) { - ((Relation) primMap.get(r)).setMembers(r.getMembers().stream() - .map(rm -> new RelationMember(rm.getRole(), primMap.get(rm.getMember()))) - .collect(Collectors.toList())); - } + clonePrimitives(copyFrom.getNodes(), copyFrom.getWays(), copyFrom.getRelations()); DataSourceAddedEvent addedEvent = new DataSourceAddedEvent(this, new LinkedHashSet<>(dataSources), copyFrom.dataSources.stream()); @@ -261,4 +234,41 @@ /** + * Clones the specified primitives into this data set. + * @param nodes nodes to clone + * @param ways ways to clone + * @param relations relations to clone + * @since 17981 + */ + public void clonePrimitives(Iterable nodes, Iterable ways, Iterable relations) { + Map primMap = new HashMap<>(); + for (Node n : nodes) { + Node newNode = new Node(n); + primMap.put(n, newNode); + addPrimitive(newNode); + } + for (Way w : ways) { + Way newWay = new Way(w, false, false); + primMap.put(w, newWay); + List newNodes = w.getNodes().stream() + .map(n -> (Node) primMap.get(n)) + .collect(Collectors.toList()); + newWay.setNodes(newNodes); + addPrimitive(newWay); + } + // Because relations can have other relations as members we first clone all relations + // and then get the cloned members + for (Relation r : relations) { + Relation newRelation = new Relation(r, false, false); + primMap.put(r, newRelation); + addPrimitive(newRelation); + } + for (Relation r : relations) { + ((Relation) primMap.get(r)).setMembers(r.getMembers().stream() + .map(rm -> new RelationMember(rm.getRole(), primMap.get(rm.getMember()))) + .collect(Collectors.toList())); + } + } + + /** * Adds a new data source. * @param source data source to add @@ -505,4 +515,20 @@ firePrimitivesAdded(Collections.singletonList(primitive), false); }); + } + + /** + * Adds recursively a primitive, and all its children, to the dataset. + * + * @param primitive the primitive. + * @throws IllegalStateException if the dataset is read-only + * @since 17981 + */ + public void addPrimitiveRecursive(OsmPrimitive primitive) { + if (primitive instanceof Way) { + ((Way) primitive).getNodes().forEach(n -> addPrimitiveRecursive(n)); + } else if (primitive instanceof Relation) { + ((Relation) primitive).getMembers().forEach(m -> addPrimitiveRecursive(m.getMember())); + } + addPrimitive(primitive); } Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (revision 17981) @@ -187,5 +187,5 @@ List referrers = target.getReferrers(); if (referrers.isEmpty()) { - resetPrimitive(target); + IPrimitive.resetPrimitiveChildren(target); target.mergeFrom(source); target.setDeleted(true); @@ -212,5 +212,5 @@ // This can be because of cross-referenced relations. for (OsmPrimitive osm: objectsToDelete) { - resetPrimitive(osm); + IPrimitive.resetPrimitiveChildren(osm); } for (OsmPrimitive osm: objectsToDelete) { @@ -218,12 +218,4 @@ osm.mergeFrom(sourceDataSet.getPrimitiveById(osm.getPrimitiveId())); } - } - } - - private static void resetPrimitive(OsmPrimitive osm) { - if (osm instanceof Way) { - ((Way) osm).setNodes(null); - } else if (osm instanceof Relation) { - ((Relation) osm).setMembers(null); } } Index: trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/data/osm/IPrimitive.java (revision 17981) @@ -533,3 +533,16 @@ || getInterestingTags().equals(other.getInterestingTags()); } + + /** + * Resets primitive children, if applicable. + * @param p primitive + * @since 17981 + */ + static void resetPrimitiveChildren(IPrimitive p) { + if (p instanceof IWay) { + ((IWay) p).setNodes(null); + } else if (p instanceof IRelation) { + ((IRelation) p).setMembers(null); + } + } } Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java (revision 17981) @@ -399,9 +399,7 @@ /** - * Replies the set of {@link OsmPrimitive}s referred to by at least one - * member of this relation + * Replies the set of {@link OsmPrimitive}s referred to by at least one member of this relation. * - * @return the set of {@link OsmPrimitive}s referred to by at least one - * member of this relation + * @return the set of {@link OsmPrimitive}s referred to by at least one member of this relation * @see #getMemberPrimitivesList() */ Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 17981) @@ -197,5 +197,5 @@ /** * Constructs a new {@code Way} from an existing {@code Way}. - * This adds links from all way nodes to the clone. See #19885 for possible memory leaks. + * This adds links from all way nodes to the clone. See #19885 for possible memory leaks. * @param original The original {@code Way} to be identically cloned. Must not be null * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. @@ -214,5 +214,5 @@ /** * Constructs a new {@code Way} from an existing {@code Way}. - * This adds links from all way nodes to the clone. See #19885 for possible memory leaks. + * This adds links from all way nodes to the clone. See #19885 for possible memory leaks. * @param original The original {@code Way} to be identically cloned. Must not be null * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. @@ -226,5 +226,5 @@ /** * Constructs a new {@code Way} from an existing {@code Way} (including its id). - * This adds links from all way nodes to the clone. See #19885 for possible memory leaks. + * This adds links from all way nodes to the clone. See #19885 for possible memory leaks. * @param original The original {@code Way} to be identically cloned. Must not be null * @since 86 Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerAsserts.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerAsserts.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerAsserts.java (revision 17981) @@ -18,6 +18,4 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmUtils; -import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.validation.TestError; import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory; @@ -63,5 +61,5 @@ checksToRun.add(Collections.singleton(check)); // Add primitive to dataset to avoid DataIntegrityProblemException when evaluating selectors - addPrimitive(ds, p); + ds.addPrimitiveRecursive(p); final Collection pErrors = MapCSSTagChecker.getErrorsForPrimitive(p, true, checksToRun); Logging.debug("- Errors: {0}", pErrors); @@ -88,13 +86,4 @@ previousChecks.clear(); previousChecks.trimToSize(); - } - - private static void addPrimitive(DataSet ds, OsmPrimitive p) { - if (p instanceof Way) { - ((Way) p).getNodes().forEach(n -> addPrimitive(ds, n)); - } else if (p instanceof Relation) { - ((Relation) p).getMembers().forEach(m -> addPrimitive(ds, m.getMember())); - } - ds.addPrimitive(p); } Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetValidation.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetValidation.java (revision 17980) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetValidation.java (revision 17981) @@ -2,11 +2,22 @@ package org.openstreetmap.josm.gui.tagging.presets; +import static java.util.Collections.singleton; +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import javax.swing.JLabel; + import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.osm.DataSet; -import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.data.osm.FilterModel; +import org.openstreetmap.josm.data.osm.INode; +import org.openstreetmap.josm.data.osm.IRelation; +import org.openstreetmap.josm.data.osm.IWay; import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.Relation; import org.openstreetmap.josm.data.osm.Tag; -import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper; import org.openstreetmap.josm.data.validation.OsmValidator; @@ -17,13 +28,6 @@ import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.tools.Logging; +import org.openstreetmap.josm.tools.SubclassFilteredCollection; import org.openstreetmap.josm.tools.Utils; - -import javax.swing.JLabel; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.openstreetmap.josm.tools.I18n.tr; /** @@ -74,7 +78,12 @@ static OsmPrimitive applyChangedTags(OsmPrimitive original, List changedTags) { - OsmPrimitive primitive = clone(original); - new DataSet(primitive); - Command command = TaggingPreset.createCommand(Collections.singleton(primitive), changedTags); + DataSet ds = new DataSet(); + Collection primitives = FilterModel.getAffectedPrimitives(singleton(original)); + ds.clonePrimitives( + new SubclassFilteredCollection<>(primitives, INode.class::isInstance), + new SubclassFilteredCollection<>(primitives, IWay.class::isInstance), + new SubclassFilteredCollection<>(primitives, IRelation.class::isInstance)); + OsmPrimitive primitive = ds.getPrimitiveById(original.getOsmPrimitiveId()); + Command command = TaggingPreset.createCommand(singleton(primitive), changedTags); if (command != null) { command.executeCommand(); @@ -82,15 +91,3 @@ return primitive; } - - static OsmPrimitive clone(OsmPrimitive original) { - if (original instanceof Node) { - return new Node(((Node) original)); - } else if (original instanceof Way) { - return new Way(((Way) original), false, false); - } else if (original instanceof Relation) { - return new Relation(((Relation) original), false, false); - } else { - throw new IllegalStateException(); - } - } }