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

Timestamp:

2009-11-18T18:50:38+01:00 (16 years ago)

Author:

Gubaer

Message:

fixed #3963: Synchronize does not work

File:

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

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

@@ -83 +83 @@
             if (mergeById(source))
                 return;
-            if (!source.isVisible())
-                // ignore it
-                return;
+            //if (!source.isVisible())
+            // ignore it
+            //    return;
         } else {
             // try to merge onto a primitive  which has no id assigned
@@ -236 +236 @@
      * Tries to merge a primitive <code>source</code> into an existing primitive with the same id.
      *
-     * @param source  the other primitive which is to be merged onto a primitive in my primitives
+     * @param source  the source primitive which is to be merged into a target primitive
      * @return true, if this method was able to merge <code>source</code> into a target object; false, otherwise
      */