Changeset 8444 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties

Timestamp:

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

Author:

Don-vip

Message:

remove extra whitespaces

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties

Files:

• PropertiesMergeModel.java (modified) (4 diffs)
• PropertiesMerger.java (modified) (6 diffs)

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

@@ -70 +70 @@
     }
 
+    /**
+     * Constructs a new {@code PropertiesMergeModel}.
+     */
     public PropertiesMergeModel() {
         coordMergeDecision = UNDECIDED;
@@ -78 +81 @@
 
     /**
-     * replies true if there is a coordinate conflict and if this conflict is
-     * resolved
-     *
-     * @return true if there is a coordinate conflict and if this conflict is
-     * resolved; false, otherwise
+     * replies true if there is a coordinate conflict and if this conflict is resolved
+     *
+     * @return true if there is a coordinate conflict and if this conflict is resolved; false, otherwise
      */
     public boolean isDecidedCoord() {
-        return ! coordMergeDecision.equals(UNDECIDED);
-    }
-
-    /**
-     * replies true if there is a  conflict in the deleted state and if this conflict is
-     * resolved
+        return !coordMergeDecision.equals(UNDECIDED);
+    }
+
+    /**
+     * replies true if there is a  conflict in the deleted state and if this conflict is resolved
      *
      * @return true if there is a conflict in the deleted state and if this conflict is
@@ -96 +96 @@
      */
     public boolean isDecidedDeletedState() {
-        return ! deletedMergeDecision.equals(UNDECIDED);
+        return !deletedMergeDecision.equals(UNDECIDED);
     }
 
@@ -311 +311 @@
         boolean ret = true;
         if (hasCoordConflict()) {
-            ret = ret && ! coordMergeDecision.equals(UNDECIDED);
+            ret = ret && !coordMergeDecision.equals(UNDECIDED);
         }
         if (hasDeletedStateConflict()) {
-            ret = ret && ! deletedMergeDecision.equals(UNDECIDED);
+            ret = ret && !deletedMergeDecision.equals(UNDECIDED);
         }
         return ret;

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