Changeset 8406 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2015-05-21T02:19:24+02:00 (10 years ago)

Author:

Don-vip

Message:

Style - Method returns modified parameter

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (3 diffs)

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

@@ -201 +201 @@
             return null; //could not make multipolygon.
         } else {
-            return Pair.create(selectedMultipolygonRelation, createRelation(polygon, new Relation(selectedMultipolygonRelation)));
+            return Pair.create(selectedMultipolygonRelation, createRelation(polygon, selectedMultipolygonRelation));
         }
     }
@@ -214 +214 @@
             return null; //could not make multipolygon.
         } else {
-            return Pair.create(null, createRelation(polygon, new Relation()));
+            return Pair.create(null, createRelation(polygon, null));
         }
     }
@@ -302 +302 @@
      * @return multipolygon relation
      */
-    private static Relation createRelation(MultipolygonBuilder pol, final Relation rel) {
+    private static Relation createRelation(MultipolygonBuilder pol, Relation clone) {
         // Create new relation
+        Relation rel = clone != null ? new Relation(clone) : new Relation();
         rel.put("type", "multipolygon");
         // Add ways to it