### Eclipse Workspace Patch 1.0
#P JOSM
|
|
|
18 | 18 | import java.util.LinkedList; |
19 | 19 | import java.util.List; |
20 | 20 | import java.util.Map; |
| 21 | import java.util.Map.Entry; |
21 | 22 | import java.util.Set; |
22 | 23 | import java.util.TreeMap; |
23 | 24 | import java.util.TreeSet; |
24 | | import java.util.Map.Entry; |
25 | 25 | |
26 | 26 | import javax.swing.Box; |
27 | 27 | import javax.swing.JComboBox; |
… |
… |
|
208 | 208 | } |
209 | 209 | } |
210 | 210 | |
211 | | if (checkForTagConflicts(ways.getFirst(), ways.getLast())) { |
212 | | //do nothing. //FIXME: abort? |
213 | | } |
| 211 | if (checkForTagConflicts(ways.getFirst(), ways.getLast())) |
| 212 | //there was conflicts and user canceled abort the action. |
| 213 | return; |
214 | 214 | |
| 215 | |
215 | 216 | JoinAreasResult result = joinAreas(ways.getFirst(), ways.getLast()); |
216 | 217 | |
217 | 218 | if (result.hasChanges) { |
… |
… |
|
305 | 306 | JOptionPane.showMessageDialog(Main.parent, tr("Some of the ways were part of relations that have been modified. Please verify no errors have been introduced.")); |
306 | 307 | } |
307 | 308 | |
| 309 | result.hasChanges = true; |
308 | 310 | result.mergeSuccessful = true; |
309 | 311 | result.outerWay = outerWay; |
310 | 312 | result.innerWays = newInnerWays; |
… |
… |
|
741 | 743 | |
742 | 744 | if (bestWay == null) |
743 | 745 | throw new RuntimeException(); |
744 | | else if (outerWays.contains(bestWay)) |
| 746 | else if (outerWays.contains(bestWay)) { |
745 | 747 | break; //full circle reached, terminate. |
746 | | else { |
| 748 | } else { |
747 | 749 | //add to outer ways, repeat. |
748 | 750 | outerWays.add(bestWay); |
749 | 751 | result.add(new WayInPath(bestWay, bestWayReverse)); |