Ticket #175: patch.txt

File patch.txt, 1.0 KB (added by frsantos@…, 19 years ago)
Line 
1Index: /home/frsantos/Proyectos/JOSM/core/src/org/openstreetmap/josm/actions/CombineWayAction.java
2===================================================================
3--- /home/frsantos/Proyectos/JOSM/core/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 265)
4+++ /home/frsantos/Proyectos/JOSM/core/src/org/openstreetmap/josm/actions/CombineWayAction.java (working copy)
5@@ -55,6 +55,8 @@
6 return;
7 }
8
9+ Way newWay = new Way();
10+
11 // collect properties for later conflict resolving
12 Map<String, Set<String>> props = new TreeMap<String, Set<String>>();
13 for (Way w : selectedWays) {
14@@ -62,6 +64,7 @@
15 if (!props.containsKey(e.getKey()))
16 props.put(e.getKey(), new TreeSet<String>());
17 props.get(e.getKey()).add(e.getValue());
18+ newWay.put(e.getKey(), e.getValue());
19 }
20 }
21
22@@ -66,7 +69,6 @@
23 }
24
25 Way oldWay = selectedWays.poll();
26- Way newWay = new Way(oldWay);
27 LinkedList<Command> cmds = new LinkedList<Command>();
28
29 for (Way w : selectedWays)