Changeset 1862 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2009-07-27T21:09:44+02:00 (17 years ago)

Author:

jttt

Message:

Way refactoring - added method that will in future replace public field nodes

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -144 +144 @@
         List<Node> nodeList = null;
         Object firstTry = actuallyCombineWays(selectedWays, false);
-        if (firstTry instanceof List) {
+        if (firstTry instanceof List<?>) {
             nodeList = (List<Node>) firstTry;
         } else {
             Object secondTry = actuallyCombineWays(selectedWays, true);
-            if (secondTry instanceof List) {
+            if (secondTry instanceof List<?>) {
                 int option = new ExtendedDialog(Main.parent,
                         tr("Change directions?"),
@@ -182 +182 @@
         Way newWay = new Way(modifyWay);
 
-        newWay.nodes.clear();
-        newWay.nodes.addAll(nodeList);
+        newWay.setNodes(nodeList);
 
         // display conflict dialog