Changeset 1872 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-07-30T08:40:34+02:00 (15 years ago)

Author:

jttt

Message:

Fix #3130

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UpdateDataAction.java (modified) (3 diffs)
• downloadtasks/DownloadOsmTaskList.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.gui.OptionPaneUtil;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -32 +33 @@
     /**
      * Refreshes the enabled state
-     * 
+     *
      */
     @Override
@@ -81 +82 @@
         }
 
-        new DownloadOsmTaskList().download(false, areas);
+        new DownloadOsmTaskList().download(false, areas, new PleaseWaitProgressMonitor());
     }
 }

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -76 +75 @@
      * @param The Collection of Areas to download
      */
-    public void download(boolean newLayer, Collection<Area> areas) {
-        List<Rectangle2D> rects = new LinkedList<Rectangle2D>();
-        for(Area a : areas) {
-            rects.add(a.getBounds2D());
-        }
-
-        download(newLayer, rects, NullProgressMonitor.INSTANCE);
+    public void download(boolean newLayer, Collection<Area> areas, ProgressMonitor progressMonitor) {
+        progressMonitor.beginTask(tr("Updating data"));
+        try {
+            List<Rectangle2D> rects = new LinkedList<Rectangle2D>();
+            for(Area a : areas) {
+                rects.add(a.getBounds2D());
+            }
+
+            download(newLayer, rects, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+        } finally {
+            progressMonitor.finishTask();
+        }
     }