Changeset 5122 in josm

Timestamp:

Mar 26, 2012 1:38:24 AM (15 months ago)

Author:

Don-vip

Message:

Add ProgressMonitor to DataSet.mergeFrom()

File:

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

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

@@ -37 +37 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.FilteredCollection;
@@ -1166 +1167 @@
      */
     public void mergeFrom(DataSet from) {
+        mergeFrom(from, null);
+    }
+    
+    /**
+     * Moves all primitives and datasources from DataSet "from" to this DataSet
+     * @param from The source DataSet
+     */
+    public void mergeFrom(DataSet from, ProgressMonitor progressMonitor) {
         if (from != null) {
-            new DataSetMerger(this, from).merge();
+            new DataSetMerger(this, from).merge(progressMonitor);
             dataSources.addAll(from.dataSources);
             from.dataSources.clear();