Changeset 4684 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-12-21T12:58:59+01:00 (12 years ago)

Author:

Don-vip

Message:

see #7159 - Layer merging performance

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/OsmDataLayer.java (modified) (3 diffs)
• progress/PleaseWaitProgressMonitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -71 +71 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.FilteredCollection;
@@ -282 +284 @@
 
     @Override public void mergeFrom(final Layer from) {
-        mergeFrom(((OsmDataLayer)from).data);
+        final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Merging layers"));
+        monitor.setCancelable(false);
+        mergeFrom(((OsmDataLayer)from).data, monitor);
+        monitor.close();
     }
 
@@ -292 +297 @@
      */
     public void mergeFrom(final DataSet from) {
+        mergeFrom(from, null);
+    }
+    
+    /**
+     * merges the primitives in dataset <code>from</code> into the dataset of
+     * this layer
+     *
+     * @param from  the source data set
+     */
+    public void mergeFrom(final DataSet from, ProgressMonitor progressMonitor) {
         final DataSetMerger visitor = new DataSetMerger(data,from);
         try {
-            visitor.merge();
+            visitor.merge(progressMonitor);
         } catch (DataIntegrityProblemException e) {
             JOptionPane.showMessageDialog(

trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java

@@ -26 +26 @@
     private PleaseWaitDialog dialog;
     private String windowTitle;
+    
+    private boolean cancelable;
 
     public PleaseWaitProgressMonitor() {
@@ -39 +41 @@
         super(new CancelHandler());
         this.dialogParent = JOptionPane.getFrameForComponent(dialogParent);
+        this.cancelable = true;
     }
 
@@ -58 +61 @@
     };
 
+    public final boolean isCancelable() {
+        return cancelable;
+    }
+
+    public final void setCancelable(boolean cancelable) {
+        this.cancelable = cancelable;
+    }
+
     private void doInEDT(Runnable runnable) {
         EventQueue.invokeLater(runnable);
@@ -76 +87 @@
                     dialog.setTitle(windowTitle);
                 }
-                dialog.setCancelEnabled(true);
+                dialog.setCancelEnabled(cancelable);
                 dialog.setCancelCallback(cancelListener);
                 dialog.setCustomText("");