Changeset 10378 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2016-06-15T10:30:37+02:00 (9 years ago)

Author:

Don-vip

Message:

Checkstyle 6.19: enable SingleSpaceSeparator and fix violations

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• MoveCommand.java (modified) (2 diffs)
• PurgeCommand.java (modified) (1 diff)
• RotateCommand.java (modified) (1 diff)
• ScaleCommand.java (modified) (1 diff)
• conflict/ConflictAddCommand.java (modified) (1 diff)

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

@@ -107 +107 @@
     public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
         this(objects, end.getX()-start.getX(), end.getY()-start.getY());
-        startEN =  start;
+        startEN = start;
     }
 
@@ -118 +118 @@
     public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
         this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
-        startEN =  start;
+        startEN = start;
     }
 

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

@@ -231 +231 @@
         List<Relation> outR = new ArrayList<>(inR.size());
         while (!childlessR.isEmpty()) {
-            // Identify one childless Relation and
-            // let it virtually die. This makes other
-            // relations childless.
-            Iterator<Relation> it  = childlessR.iterator();
+            // Identify one childless Relation and let it virtually die. This makes other relations childless.
+            Iterator<Relation> it = childlessR.iterator();
             Relation next = it.next();
             it.remove();

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

@@ -81 +81 @@
             double x = oldEastNorth.east() - pivot.east();
             double y = oldEastNorth.north() - pivot.north();
+            // CHECKSTYLE.OFF: SingleSpaceSeparator
             double nx =  cosPhi * x + sinPhi * y + pivot.east();
             double ny = -sinPhi * x + cosPhi * y + pivot.north();
+            // CHECKSTYLE.ON: SingleSpaceSeparator
             n.setEastNorth(new EastNorth(nx, ny));
         }

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

@@ -44 +44 @@
         // releases the button and presses it again with the same modifiers.
         // The very first point of this operation is stored here.
-        startEN   = currentEN;
+        startEN = currentEN;
 
         handleEvent(currentEN);

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

@@ -32 +32 @@
     public ConflictAddCommand(OsmDataLayer layer, Conflict<? extends OsmPrimitive> conflict) {
         super(layer);
-        this.conflict  = conflict;
+        this.conflict = conflict;
     }