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

Timestamp:

2013-10-04T03:27:01+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - Avoid commented-out lines of code, javadoc

File:

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

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

@@ -80 +80 @@
     protected void mergePrimitive(OsmPrimitive source, Collection<? extends OsmPrimitive> candidates) {
         if (!source.isNew() ) {
-            // try to merge onto a matching primitive with the same
-            // defined id
+            // try to merge onto a matching primitive with the same defined id
             //
             if (mergeById(source))
                 return;
-            //if (!source.isVisible())
-            // ignore it
-            //    return;
         } else {
             // ignore deleted primitives from source
@@ -101 +97 @@
                 if (target.hasEqualSemanticAttributes(source)) {
                     mergedMap.put(source.getPrimitiveId(), target.getPrimitiveId());
-                    // copy the technical attributes from other
-                    // version
+                    // copy the technical attributes from other version
                     target.setVisible(source.isVisible());
                     target.setUser(source.getUser());