Changeset 10378 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

Timestamp:

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

Author:

Don-vip

Message:

Checkstyle 6.19: enable SingleSpaceSeparator and fix violations

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java (modified) (2 diffs)

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

@@ -137 +137 @@
         }
 
-        myDeletedState =  conflict.isMyDeleted() || my.isDeleted();
+        myDeletedState = conflict.isMyDeleted() || my.isDeleted();
         theirDeletedState = their.isDeleted();
 
@@ -211 +211 @@
      * @return The state of deleted flag
      */
-    public  Boolean getTheirDeletedState() {
+    public Boolean getTheirDeletedState() {
         return theirDeletedState;
     }