Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java

Timestamp:

2015-06-02T16:41:37+02:00 (11 years ago)

Author:

Don-vip

Message:

remove extra whitespaces

File:

• trunk/src/org/openstreetmap/josm/command/conflict/ConflictResolveCommand.java (modified) (2 diffs)

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

@@ -45 +45 @@
      */
     protected void rememberConflict(Conflict<?> c) {
-        if (! resolvedConflicts.hasConflictForMy(c.getMy())) {
+        if (!resolvedConflicts.hasConflictForMy(c.getMy())) {
             resolvedConflicts.add(c);
         }
@@ -68 +68 @@
         super.undoCommand();
 
-        if (! Main.map.mapView.hasLayer(getLayer())) {
+        if (!Main.map.mapView.hasLayer(getLayer())) {
             Main.warn(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
                     this.toString(),