Changeset 11070 in josm for trunk

Timestamp:

2016-10-01T23:11:11+02:00 (8 years ago)

Author:

simon04

Message:

see #13724 - refactor constructors and add parameters validation to detect root cause

File:

• trunk/src/org/openstreetmap/josm/command/MoveCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -93 +93 @@
         this.x = x;
         this.y = y;
+        Objects.requireNonNull(objects, "objects");
         this.nodes = AllNodesVisitor.getAllNodes(objects);
         for (Node n : this.nodes) {
@@ -106 +107 @@
      */
     public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
-        this(objects, end.getX()-start.getX(), end.getY()-start.getY());
+        this(
+                Objects.requireNonNull(objects, "objects"),
+                Objects.requireNonNull(end, "end").getX() - Objects.requireNonNull(start, "start").getX(),
+                Objects.requireNonNull(end, "end").getY() - Objects.requireNonNull(start, "start").getY());
         startEN = start;
     }
@@ -117 +121 @@
      */
     public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
-        this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
+        this(
+                Collections.singleton(Objects.requireNonNull(p, "p")),
+                Objects.requireNonNull(end, "end").getX() - Objects.requireNonNull(start, "start").getX(),
+                Objects.requireNonNull(end, "end").getY() - Objects.requireNonNull(start, "start").getY());
         startEN = start;
     }