Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Timestamp:

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

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -141 +141 @@
 
     protected void fixIncomplete(Way other) {
-        Way myWay = (Way)getMergeTarget(other);
+        Way myWay = (Way) getMergeTarget(other);
         if (myWay == null)
             throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
@@ -174 +174 @@
         do {
             flag = false;
-            for (Iterator<OsmPrimitive> it = objectsToDelete.iterator();it.hasNext();) {
+            for (Iterator<OsmPrimitive> it = objectsToDelete.iterator(); it.hasNext();) {
                 OsmPrimitive target = it.next();
                 OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId());
@@ -234 +234 @@
      */
     private void mergeNodeList(Way source) {
-        Way target = (Way)getMergeTarget(source);
+        Way target = (Way) getMergeTarget(source);
         if (target == null)
             throw new IllegalStateException(tr("Missing merge target for way with id {0}", source.getUniqueId()));
@@ -240 +240 @@
         List<Node> newNodes = new ArrayList<>(source.getNodesCount());
         for (Node sourceNode : source.getNodes()) {
-            Node targetNode = (Node)getMergeTarget(sourceNode);
+            Node targetNode = (Node) getMergeTarget(sourceNode);
             if (targetNode != null) {
                 newNodes.add(targetNode);
@@ -363 +363 @@
             // this have to be resolved manually.
             //
-            addConflict(target,source);
+            addConflict(target, source);
         } else if (!target.hasEqualSemanticAttributes(source)) {
             // target is modified and is not semantically equal with source. Can't automatically
             // resolve the differences
             // =>  create a conflict
-            addConflict(target,source);
+            addConflict(target, source);
         } else {
             // clone from other. mergeFrom will mainly copy