Changeset 8338 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
- Timestamp:
- 2015-05-07T01:27:41+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
r8182 r8338 11 11 import java.util.Collection; 12 12 import java.util.Collections; 13 import java.util.HashSet;14 13 import java.util.LinkedHashMap; 15 14 import java.util.LinkedHashSet; … … 184 183 List<Command> resolution = CombinePrimitiveResolverDialog.launchIfNecessary(wayTags, ways, Collections.singleton(targetWay)); 185 184 186 Li nkedList<Command> cmds = new LinkedList<>();187 Li nkedList<Way> deletedWays = new LinkedList<>(ways);185 List<Command> cmds = new LinkedList<>(); 186 List<Way> deletedWays = new LinkedList<>(ways); 188 187 deletedWays.remove(targetWay); 189 188 … … 561 560 562 561 protected Set<Node> getNodes(Stack<NodePair> pairs) { 563 HashSet<Node> nodes = new LinkedHashSet<>(2*pairs.size());562 Set<Node> nodes = new LinkedHashSet<>(2*pairs.size()); 564 563 for (NodePair pair: pairs) { 565 564 nodes.add(pair.getA()); … … 594 593 595 594 protected List<Node> buildPathFromNodePairs(Stack<NodePair> path) { 596 Li nkedList<Node> ret = new LinkedList<>();595 List<Node> ret = new LinkedList<>(); 597 596 for (NodePair pair: path) { 598 597 ret.add(pair.getA());
Note:
See TracChangeset
for help on using the changeset viewer.