Changeset 4739 in josm

Timestamp:

Dec 29, 2011 1:04:12 PM (18 months ago)

Author:

jttt

Message:

• fix #7202 Downloading Data window harder to read since r4718
• update display correctly when progress monitor is moved to background/foreground

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (1 diff)
• PleaseWaitDialog.java (modified) (2 diffs)
• progress/PleaseWaitProgressMonitor.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -126 +126 @@
         }
 
-        public void setTitle(String text) {
+        public void setCurrentAction(String text) {
             this.title = text;
             updateText();

trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

@@ -112 +112 @@
     }
 
+    public void setCurrentAction(String text) {
+        currentAction.setText(text);
+    }
+
     /**
      * Appends a log message to the progress dialog. If the log area isn't visible yet
@@ -166 +170 @@
      *
      * @param callback the cancel callback
-     */    
+     */
     public void setInBackgroundCallback(ActionListener callback) {
         if (callback == null) {

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

@@ -21 +21 @@
 public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
 
-        /**
-         * Implemented by both foreground dialog and background progress dialog (in status bar)
-         */
+    /**
+     * Implemented by both foreground dialog and background progress dialog (in status bar)
+     */
     public interface ProgressMonitorDialog {
         void setVisible(boolean visible);
         void updateProgress(int progress);
         void setCustomText(String text);
-        void setTitle(String text);
+        void setCurrentAction(String text);
         void setIndeterminate(boolean newValue);
-        void appendLogMessage(String message);
+        void appendLogMessage(String message); //TODO Not implemented properly in background monitor, log message will get lost if progress runs in background
     }
 
     public static final int PROGRESS_BAR_MAX = 100;
     private final Window dialogParent;
+
     private int currentProgressValue = 0;
+    private String customText;
+    private String title;
+    private boolean indeterminate;
 
     private boolean isInBackground;
@@ -110 +114 @@
             ProgressMonitorDialog dialog = getDialog();
             if (dialog != null) {
+                reset();
                 dialog.setVisible(true);
             }
@@ -179 +184 @@
     protected void doSetCustomText(final String title) {
         checkState(State.IN_TASK, State.IN_SUBTASK);
+        this.customText = title;
         doInEDT(new Runnable() {
             public void run() {
@@ -192 +198 @@
     protected void doSetTitle(final String title) {
         checkState(State.IN_TASK, State.IN_SUBTASK);
+        this.title = title;
         doInEDT(new Runnable() {
             public void run() {
                 ProgressMonitorDialog dialog = getDialog();
                 if (dialog != null) {
-                    dialog.setTitle(title);
+                    dialog.setCurrentAction(title);
                 }
             }
@@ -204 +211 @@
     @Override
     protected void doSetIntermediate(final boolean value) {
+        this.indeterminate = value;
         doInEDT(new Runnable() {
             public void run() {
@@ -210 +218 @@
                 ProgressMonitorDialog dialog = getDialog();
                 if (dialog != null) {
-                    dialog.setIndeterminate(value && PleaseWaitProgressMonitor.this.dialog.progress.getValue() == 0);
+                    dialog.setIndeterminate(value && currentProgressValue == 0);
                 }
             }
@@ -226 +234 @@
             }
         });
+    }
+
+    public void reset() {
+        if (dialog != null) {
+            dialog.setTitle(title);
+            dialog.setCustomText(customText);
+            dialog.updateProgress(currentProgressValue);
+            dialog.setIndeterminate(indeterminate && currentProgressValue == 0);
+        }
+        BackgroundProgressMonitor backgroundMonitor = null;
+        MapFrame map = Main.map;
+        if (map != null) {
+            backgroundMonitor = map.statusLine.progressMonitor;
+        }
+        if (backgroundMonitor != null) {
+            backgroundMonitor.setCurrentAction(title);
+            backgroundMonitor.setCustomText(customText);
+            backgroundMonitor.updateProgress(currentProgressValue);
+            backgroundMonitor.setIndeterminate(indeterminate && currentProgressValue == 0);
+        }
+
     }
 
@@ -253 +282 @@
             public void run() {
                 dialog.setInBackgroundPossible(PleaseWaitProgressMonitor.this.taskId != null && Main.isDisplayingMapView());
+                reset();
                 getDialog();
             }