Changeset 1811 in josm for trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

Timestamp:

2009-07-19T17:38:55+02:00 (15 years ago)

Author:

jttt

Message:

PleaseWait refactoring. Progress is now reported using ProgressMonitor interface, that is available through PleaseWaitRunnable.

File:

• trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) (6 diffs)

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

@@ -5 +5 @@
 
 import java.awt.EventQueue;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor.CancelListener;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.xml.sax.SAXException;
@@ -27 +22 @@
  * @author Imi
  */
-public abstract class PleaseWaitRunnable implements Runnable {
-    public boolean silent = false;
-    public String errorMessage;
+public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
 
-    private boolean closeDialogCalled = false;
     private boolean cancelled = false;
     private boolean ignoreException;
-
     private final String title;
 
-    private ActionListener cancelListener = new ActionListener(){
-        public void actionPerformed(ActionEvent e) {
-            if (!cancelled) {
-                cancelled = true;
-                cancel();
-            }
-        }
-    };
-
-    private WindowListener windowListener = new WindowAdapter(){
-        @Override public void windowClosing(WindowEvent e) {
-            if (!closeDialogCalled) {
-                if (!cancelled) {
-                    cancelled = true;
-                    cancel();
-                }
-                closeDialog();
-            }
-        }
-    };
+    protected final ProgressMonitor progressMonitor;
 
     /**
@@ -73 +45 @@
      */
     public PleaseWaitRunnable(String title, boolean ignoreException) {
-        this.title = title;
-        this.ignoreException = ignoreException;
+        this(title, new PleaseWaitProgressMonitor(), ignoreException);
     }
 
-    private void prepareDialog() {
-        // reset dialog state
-        errorMessage = null;
-        closeDialogCalled = false;
-
-        Main.pleaseWaitDlg.setTitle(title);
-        Main.pleaseWaitDlg.cancel.setEnabled(true);
-        Main.pleaseWaitDlg.setCustomText("");
-        Main.pleaseWaitDlg.cancel.addActionListener(cancelListener);
-        Main.pleaseWaitDlg.addWindowListener(windowListener);
-        Main.pleaseWaitDlg.setVisible(true);
+    public PleaseWaitRunnable(String title, ProgressMonitor progressMonitor, boolean ignoreException) {
+        this.title = title;
+        this.progressMonitor = progressMonitor == null?new PleaseWaitProgressMonitor():progressMonitor;
+        this.ignoreException = ignoreException;
+        this.progressMonitor.addCancelListener(this);
     }
 
@@ -93 +58 @@
         try {
             try {
-                realRun();
+                progressMonitor.beginTask(title);
+                try {
+                    realRun();
+                } finally {
+                    if (EventQueue.isDispatchThread()) {
+                        finish();
+                    } else {
+                        EventQueue.invokeAndWait(new Runnable() {
+                            public void run() {
+                                finish();
+                            }
+                        });
+                    }
+                }
             } catch (SAXException x) {
                 x.printStackTrace();
-                errorMessage = tr("Error while parsing")+": "+x.getMessage();
+                progressMonitor.setErrorMessage(tr("Error while parsing")+": "+x.getMessage());
             } catch (FileNotFoundException x) {
                 x.printStackTrace();
-                errorMessage = tr("File not found")+": "+x.getMessage();
+                progressMonitor.setErrorMessage(tr("File not found")+": "+x.getMessage());
             } catch (IOException x) {
                 x.printStackTrace();
-                errorMessage = x.getMessage();
+                progressMonitor.setErrorMessage(x.getMessage());
             } catch(OsmTransferException x) {
                 x.printStackTrace();
                 if (x.getCause() != null) {
-                    errorMessage = x.getCause().getMessage();
+                    progressMonitor.setErrorMessage(x.getCause().getMessage());
                 } else {
-                    errorMessage = x.getMessage();
+                    progressMonitor.setErrorMessage(x.getMessage());
                 }
             } finally {
-                closeDialog();
+                progressMonitor.finishTask();
             }
         } catch (final Throwable e) {
@@ -135 +113 @@
                 }
             }).start();
-            prepareDialog();
         } else {
-            EventQueue.invokeLater(new Runnable() {
-                public void run() {
-                    prepareDialog();
-                }
-            });
             doRealRun();
         }
+    }
+
+    public void operationCanceled() {
+        cancel();
     }
 
@@ -164 +140 @@
     protected abstract void finish();
 
-    /**
-     * Close the dialog. Usually called from worker thread.
-     */
-    public void closeDialog() {
-        if (closeDialogCalled)
-            return;
-        closeDialogCalled  = true;
-        try {
-            Runnable runnable = new Runnable(){
-                public void run() {
-                    try {
-                        finish();
-                    } finally {
-                        Main.pleaseWaitDlg.setVisible(false);
-                        Main.pleaseWaitDlg.dispose();
-                        Main.pleaseWaitDlg.removeWindowListener(windowListener);
-                        Main.pleaseWaitDlg.cancel.removeActionListener(cancelListener);
-                    }
-                    if (errorMessage != null && !silent) {
-                        JOptionPane.showMessageDialog(Main.parent, errorMessage);
-                    }
-                }
-            };
-
-            // 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);
-        }
+    public ProgressMonitor getProgressMonitor() {
+        return progressMonitor;
     }
 }