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

Timestamp:

2009-07-28T19:48:39+02:00 (15 years ago)

Author:

Gubaer

Message:

replaced JOptionPane.show* by OptionPaneUtil.show*
ExtendeDialog now always on top, too

File:

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

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 
@@ -73 +75 @@
     }
 
+    @Override
     public void doBeginTask() {
         doInEDT(new Runnable() {
@@ -80 +83 @@
                 } else if (dialogParent instanceof Dialog) {
                     dialog = new PleaseWaitDialog((Dialog)dialogParent);
-                } else {
+                } else
                     throw new ProgressException("PleaseWaitDialog parent must be either Frame or Dialog");
-                }
 
                 dialog.cancel.setEnabled(true);
@@ -94 +96 @@
     }
 
+    @Override
     public void doFinishTask() {
         doInEDT(new Runnable() {
@@ -103 +106 @@
                     dialog.cancel.removeActionListener(cancelListener);
                     if (getErrorMessage() != null) {
-                        JOptionPane.showMessageDialog(Main.parent, getErrorMessage());
+                        OptionPaneUtil.showMessageDialog(
+                                Main.parent, getErrorMessage(),
+                                tr("Error"),
+                                JOptionPane.ERROR_MESSAGE);
                     }
                     dialog = null;
@@ -111 +117 @@
     }
 
+    @Override
     protected void updateProgress(double progressValue) {
         final int newValue = (int)(progressValue * PROGRESS_BAR_MAX);