Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
- Timestamp:
- 2014-04-26T17:39:23+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r6901 r7005 51 51 */ 52 52 private final Collection<? extends OsmPrimitive> toDelete; 53 private final Map<OsmPrimitive, PrimitiveData> clonedPrimitives = new HashMap< OsmPrimitive, PrimitiveData>();53 private final Map<OsmPrimitive, PrimitiveData> clonedPrimitives = new HashMap<>(); 54 54 55 55 /** … … 150 150 151 151 private Set<OsmPrimitiveType> getTypesToDelete() { 152 Set<OsmPrimitiveType> typesToDelete = new HashSet< OsmPrimitiveType>();152 Set<OsmPrimitiveType> typesToDelete = new HashSet<>(); 153 153 for (OsmPrimitive osm : toDelete) { 154 154 typesToDelete.add(OsmPrimitiveType.from(osm)); … … 201 201 return null; 202 202 else { 203 List<PseudoCommand> children = new ArrayList< PseudoCommand>(toDelete.size());203 List<PseudoCommand> children = new ArrayList<>(toDelete.size()); 204 204 for (final OsmPrimitive osm : toDelete) { 205 205 children.add(new PseudoCommand() { … … 278 278 */ 279 279 protected static Collection<Node> computeNodesToDelete(OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) { 280 Collection<Node> nodesToDelete = new HashSet< Node>();280 Collection<Node> nodesToDelete = new HashSet<>(); 281 281 for (Way way : OsmPrimitive.getFilteredList(primitivesToDelete, Way.class)) { 282 282 for (Node n : way.getNodes()) { … … 339 339 return null; 340 340 341 Set<OsmPrimitive> primitivesToDelete = new HashSet< OsmPrimitive>(selection);341 Set<OsmPrimitive> primitivesToDelete = new HashSet<>(selection); 342 342 343 343 Collection<Relation> relationsToDelete = Utils.filteredCollection(primitivesToDelete, Relation.class); … … 345 345 return null; 346 346 347 Collection<Way> waysToBeChanged = new HashSet< Way>();347 Collection<Way> waysToBeChanged = new HashSet<>(); 348 348 349 349 if (alsoDeleteNodesInWay) { … … 359 359 waysToBeChanged.addAll(OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Way.class)); 360 360 361 Collection<Command> cmds = new LinkedList< Command>();361 Collection<Command> cmds = new LinkedList<>(); 362 362 for (Way w : waysToBeChanged) { 363 363 Way wnew = new Way(w); … … 415 415 // the way shouldn't be splitted 416 416 417 List<Node> n = new ArrayList< Node>();417 List<Node> n = new ArrayList<>(); 418 418 419 419 n.addAll(ws.way.getNodes().subList(ws.lowerIndex + 1, ws.way.getNodesCount() - 1)); … … 426 426 } 427 427 428 List<Node> n1 = new ArrayList< Node>(), n2 = new ArrayList<Node>();428 List<Node> n1 = new ArrayList<>(), n2 = new ArrayList<>(); 429 429 430 430 n1.addAll(ws.way.getNodes().subList(0, ws.lowerIndex + 1)); … … 440 440 return new ChangeCommand(ws.way, wnew); 441 441 } else { 442 List<List<Node>> chunks = new ArrayList< List<Node>>(2);442 List<List<Node>> chunks = new ArrayList<>(2); 443 443 chunks.add(n1); 444 444 chunks.add(n2);
Note:
See TracChangeset
for help on using the changeset viewer.