Changeset 1872 in josm

Timestamp:

Jul 30, 2009 8:40:34 AM (4 years ago)

Author:

jttt

Message:

Fix #3130

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UpdateDataAction.java (modified) (3 diffs)
• actions/downloadtasks/DownloadOsmTaskList.java (modified) (2 diffs)
• gui/progress/AbstractProgressMonitor.java (modified) (3 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();
+        }
     }
 

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

@@ -19 +19 @@
         String extraText;
         Boolean intermediate;
+
+        boolean finishRequested;
     }
 
@@ -86 +88 @@
 
             if (state == State.IN_SUBTASK) {
-                // Make sure the subtask didn't start yet (once task start it must be finished)
-                boolean broken = currentChild.state != State.INIT;
-                for (Request request:requests) {
-                    broken = broken | request.originator.state != State.INIT;
-                }
-                if (broken) {
-                    throw new ProgressException("Cannot call finishTask when there are unfinished tasks");
-                } else {
-                    state = State.IN_TASK;
-                }
-            }
-
-            checkState(State.IN_TASK);
-            state = State.FINISHED;
-            doFinishTask();
+                requestedState.finishRequested = true;
+            } else {
+                checkState(State.IN_TASK);
+                state = State.FINISHED;
+                doFinishTask();
+            }
         }
     }
@@ -282 +275 @@
 
     private void applyThisRequest(Request request) {
-        if (request.customText != null) {
-            this.customText = request.customText;
-        }
-
-        if (request.title != null) {
-            this.taskTitle = request.title;
-        }
-
-        if (request.intermediate != null) {
-            this.intermediateTask = request.intermediate;
-        }
-
-        if (request.extraText != null) {
-            this.extraText = request.extraText;
-        }
-
-        resetState();
+        if (request.finishRequested) {
+            finishTask();
+        } else {
+            if (request.customText != null) {
+                this.customText = request.customText;
+            }
+
+            if (request.title != null) {
+                this.taskTitle = request.title;
+            }
+
+            if (request.intermediate != null) {
+                this.intermediateTask = request.intermediate;
+            }
+
+            if (request.extraText != null) {
+                this.extraText = request.extraText;
+            }
+
+            resetState();
+        }
     }