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

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

Location:

trunk/src/org/openstreetmap/josm/command/conflict

Files:

• ConflictAddCommand.java (modified) (1 diff)
• ConflictResolveCommand.java (modified) (1 diff)
• CoordinateConflictResolveCommand.java (modified) (3 diffs)
• ModifiedConflictResolveCommand.java (modified) (1 diff)
• RelationMemberConflictResolverCommand.java (modified) (1 diff)
• VersionConflictResolveCommand.java (modified) (1 diff)

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

@@ -52 +52 @@
         try {
             getLayer().getConflicts().add(conflict);
-        } catch(IllegalStateException e) {
+        } catch (IllegalStateException e) {
             Main.error(e);
             warnBecauseOfDoubleConflict();

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

@@ -57 +57 @@
     protected void reconstituteConflicts() {
         OsmDataLayer editLayer = getLayer();
-        for(Conflict<?> c : resolvedConflicts) {
+        for (Conflict<?> c : resolvedConflicts) {
             if (!editLayer.getConflicts().hasConflictForMy(c.getMy())) {
                 editLayer.getConflicts().add(c);

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);
 

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

@@ -40 +40 @@
         case RELATION: msg = marktr("Set the ''modified'' flag for relation {0}"); break;
         }
-        return tr(msg,conflict.getMy().getId());
+        return tr(msg, conflict.getMy().getId());
     }
 

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

@@ -92 +92 @@
         //
         if (!editLayer.getConflicts().hasConflictForMy(my)) {
-            editLayer.getConflicts().add(my,their);
+            editLayer.getConflicts().add(my, their);
         }
     }

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

@@ -56 +56 @@
             conflict.getMy().setOsmId(
                     conflict.getMy().getId(),
-                    (int)Math.max(myVersion, theirVersion)
+                    (int) Math.max(myVersion, theirVersion)
             );
             // update visiblity state