Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

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

trunk/src/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommand.java

@@ -49 +49 @@
     @Override
     public boolean executeCommand() {
-        // remember the current state of modified primitives, i.e. of
-        // OSM primitive 'my'
-        //
+        // remember the current state of modified primitives, i.e. of OSM primitive 'my'
         super.executeCommand();
 
@@ -57 +55 @@
             // do nothing
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
-            Node my = (Node)conflict.getMy();
-            Node their = (Node)conflict.getTheir();
+            Node my = (Node) conflict.getMy();
+            Node their = (Node) conflict.getTheir();
             my.setCoor(their.getCoor());
         } else
@@ -65 +63 @@
 
         // remember the layer this command was applied to
-        //
         rememberConflict(conflict);