Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.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/gui/conflict/pair/properties/PropertiesMerger.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -321 +321 @@
         lblMergedCoordinates.setText(coordToString(model.getMergedCoords()));
         lblTheirCoordinates.setText(coordToString(model.getTheirCoords()));
-        if (! model.hasCoordConflict()) {
+        if (!model.hasCoordConflict()) {
             lblMyCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
             lblMergedCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
@@ -349 +349 @@
         lblTheirDeletedState.setText(deletedStateToString(model.getTheirDeletedState()));
 
-        if (! model.hasDeletedStateConflict()) {
+        if (!model.hasDeletedStateConflict()) {
             lblMyDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
             lblMergedDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
@@ -403 +403 @@
         @Override
         public void update(Observable o, Object arg) {
-            setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord());
+            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord());
         }
     }
@@ -420 +420 @@
         @Override
         public void update(Observable o, Object arg) {
-            setEnabled(model.hasCoordConflict() && ! model.isDecidedCoord());
+            setEnabled(model.hasCoordConflict() && !model.isDecidedCoord());
         }
     }
@@ -454 +454 @@
         @Override
         public void update(Observable o, Object arg) {
-            setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState());
+            setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState());
         }
     }
@@ -471 +471 @@
         @Override
         public void update(Observable o, Object arg) {
-            setEnabled(model.hasDeletedStateConflict() && ! model.isDecidedDeletedState());
+            setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState());
         }
     }