Changeset 50 in josm for src/org/openstreetmap/josm/actions/JosmAction.java

Timestamp:

2006-02-12T12:05:34+01:00 (19 years ago)

Author:

imi

Message:

• fixed exception when merging some keys (download)
• fixed "please wait" doesn't disappearing
• added "There are changes" - dialog

File:

• src/org/openstreetmap/josm/actions/JosmAction.java (modified) (3 diffs)

src/org/openstreetmap/josm/actions/JosmAction.java

@@ -7 +7 @@
 import javax.swing.JDialog;
 import javax.swing.JLabel;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -17 +18 @@
 abstract public class JosmAction extends AbstractAction {
 
+        /**
+         * Instanced of this thread will display a "Please Wait" message in middle of JOSM
+         * to indicate a progress beeing executed.
+         *  
+         * @author Imi
+         */
+        protected abstract class PleaseWaitRunnable implements Runnable {
+                private String msg;
+                private JDialog pleaseWaitDlg;
+                /**
+                 * Create the runnable object with a given message for the user.
+                 */
+                PleaseWaitRunnable(String msg) {
+                        this.msg = msg;
+                }
+                public final void run() {
+                        pleaseWaitDlg = new JDialog(Main.main, true);
+                        pleaseWaitDlg.setUndecorated(true);
+                        JLabel l = new JLabel(msg+". Please Wait.");
+                        l.setBorder(BorderFactory.createCompoundBorder(
+                                        BorderFactory.createEtchedBorder(),
+                                        BorderFactory.createEmptyBorder(20,20,20,20)));
+                        pleaseWaitDlg.getContentPane().add(l);
+                        pleaseWaitDlg.pack();
+                        pleaseWaitDlg.setLocation(Main.main.getX()+Main.main.getWidth()/2-pleaseWaitDlg.getWidth()/2,
+                                        Main.main.getY()+Main.main.getHeight()/2-pleaseWaitDlg.getHeight()/2);
+                        pleaseWaitDlg.setResizable(false);
+                        SwingUtilities.invokeLater(new Runnable(){
+                                public void run() {
+                                        pleaseWaitDlg.setVisible(true);
+                                }
+                        });
+                        try {
+                                realRun();
+                        } finally {
+                                closeDialog();
+                        }
+                }
+                public abstract void realRun();
+                public void closeDialog() {
+                        pleaseWaitDlg.setVisible(false);
+                        pleaseWaitDlg.dispose();
+                }
+        }
+        
         /**
          * Construct the action.
@@ -34 +80 @@
                         putValue(ACCELERATOR_KEY, shortCut);
         }
-
-        /**
-         * @return A dialog labeled "... Please Wait." where ... is the message parameter.
-         */
-        protected JDialog createPleaseWaitDialog(String msg) {
-                final JDialog pleaseWaitDlg = new JDialog(Main.main, true);
-                pleaseWaitDlg.setUndecorated(true);
-                JLabel l = new JLabel(msg+". Please Wait.");
-                l.setBorder(BorderFactory.createCompoundBorder(
-                                BorderFactory.createEtchedBorder(),
-                                BorderFactory.createEmptyBorder(20,20,20,20)));
-                pleaseWaitDlg.getContentPane().add(l);
-                pleaseWaitDlg.pack();
-                pleaseWaitDlg.setLocation(Main.main.getX()+Main.main.getWidth()/2-pleaseWaitDlg.getWidth()/2,
-                                Main.main.getY()+Main.main.getHeight()/2-pleaseWaitDlg.getHeight()/2);
-                pleaseWaitDlg.setResizable(false);
-                return pleaseWaitDlg;
-        }
 }