Changeset 2319 in josm for trunk/src/org/openstreetmap/josm/gui/progress

Timestamp:

2009-10-25T18:22:28+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3725: JOSM doesn't provide indication during upload that the server is sending 410 Gone errors
Progress dialog now includes a small log window for use cases like this. Use appendLogMessage() on the progress monitor.

Location:

trunk/src/org/openstreetmap/josm/gui/progress

Files:

• AbstractProgressMonitor.java (modified) (3 diffs)
• NullProgressMonitor.java (modified) (1 diff)
• PleaseWaitProgressMonitor.java (modified) (9 diffs)
• ProgressMonitor.java (modified) (1 diff)

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

@@ -60 +60 @@
     protected void checkState(State... expectedStates) {
         for (State s:expectedStates) {
-            if (s == state) {
+            if (s == state)
                 return;
-            }
         }
         throw new ProgressException("Expected states are %s but current state is %s", Arrays.asList(expectedStates).toString(), state);
@@ -154 +153 @@
             resetState();
         }
+    }
+
+    /**
+     * Default implementation is empty. Override in subclasses to display the log messages.
+     */
+    public void appendLogMessage(String message) {
+        // do nothing
     }
 
@@ -327 +333 @@
     private Request getRequest(AbstractProgressMonitor child) {
         for (Request request:requests) {
-            if (request.originator == child) {
+            if (request.originator == child)
                 return request;
-            }
         }
         throw new ProgressException("Subtask %s not found", child);

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

@@ -60 +60 @@
     }
 
+    public void appendLogMessage(String message) {
+    }
+
     public void setSilent(boolean value) {
     }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.progress;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Dialog;
@@ -13 +11 @@
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
-import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.JOptionPane;
@@ -35 +32 @@
 
     public PleaseWaitProgressMonitor(String windowTitle) {
-        this(JOptionPane.getFrameForComponent(Main.map));
+        this(JOptionPane.getFrameForComponent(Main.parent));
         this.windowTitle = windowTitle;
     }
@@ -53 +50 @@
         @Override public void windowClosing(WindowEvent e) {
             cancel();
-            closeDialog();
         }
     };
-
-    private void closeDialog() {
-        try {
-            Runnable runnable = new Runnable(){
-                public void run() {
-                }
-            };
-
-            // make sure, this is called in the dispatcher thread ASAP
-            if (EventQueue.isDispatchThread()) {
-                runnable.run();
-            } else {
-                EventQueue.invokeAndWait(runnable);
-            }
-
-        } catch (InterruptedException e) {
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
 
     private void doInEDT(Runnable runnable) {
@@ -85 +61 @@
         doInEDT(new Runnable() {
             public void run() {
-                if (dialogParent instanceof Frame) {
-                    dialog = new PleaseWaitDialog((Frame)dialogParent);
-                } else if (dialogParent instanceof Dialog) {
-                    dialog = new PleaseWaitDialog((Dialog)dialogParent);
+                if (dialogParent instanceof Frame && dialog == null) {
+                    dialog = new PleaseWaitDialog(dialogParent);
+                } else if (dialogParent instanceof Dialog && dialog == null) {
+                    dialog = new PleaseWaitDialog(dialogParent);
                 } else
                     throw new ProgressException("PleaseWaitDialog parent must be either Frame or Dialog");
@@ -95 +71 @@
                     dialog.setTitle(windowTitle);
                 }
-                dialog.cancel.setEnabled(true);
+                dialog.setCancelEnabled(true);
+                dialog.setCancelCallback(cancelListener);
                 dialog.setCustomText("");
-                dialog.cancel.addActionListener(cancelListener);
                 dialog.addWindowListener(windowListener);
                 dialog.progress.setMaximum(PROGRESS_BAR_MAX);
@@ -107 +83 @@
     @Override
     public void doFinishTask() {
-        doInEDT(new Runnable() {
-            public void run() {
-                if (dialog != null) {
-                    dialog.setVisible(false);
-                    dialog.dispose();
-                    dialog.removeWindowListener(windowListener);
-                    dialog.cancel.removeActionListener(cancelListener);
-                    if (getErrorMessage() != null) {
-                        JOptionPane.showMessageDialog(
-                                Main.parent, getErrorMessage(),
-                                tr("Error"),
-                                JOptionPane.ERROR_MESSAGE);
-                    }
-                    dialog = null;
-                }
-            }
-        });
+        // do nothing
     }
 
@@ -164 +124 @@
             public void run() {
                 if (value && dialog.progress.getValue() == 0) {
-                    // Enable only if progress is at the begging. Doing intermediate progress in the middle
+                    // Enable only if progress is at the beginning. Doing intermediate progress in the middle
                     // will hide already reached progress
                     dialog.setIndeterminate(true);
@@ -179 +139 @@
     }
 
+    @Override
+    public void appendLogMessage(final String message) {
+        doInEDT(new Runnable() {
+            public void run() {
+                dialog.appendLogMessage(message);
+            }
+        });
+    }
+
+    public void close() {
+        dialog.setVisible(false);
+        dialog.setCancelCallback(null);
+        dialog.removeWindowListener(windowListener);
+        dialog.dispose();
+        dialog = null;
+    }
 }

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

@@ -123 +123 @@
     void setErrorMessage(String message);
     String getErrorMessage();
+
+    /**
+     * Appends a message to the log managed by the progress monitor.
+     * 
+     * @param message the log message. Ignored if null or white space only.
+     */
+    void appendLogMessage(String message);
 }