diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-10-24 03:54:51 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-10-24 03:54:51 +0000 |
| commit | 5b7fa81e49780378ad7608c05f274c03e397b578 (patch) | |
| tree | 868d58db0ba8788ccd0bfbc463225d5c290933d1 /java/src/IceGrid/AdminGUI.java | |
| parent | Added comment for FriendlyName. (diff) | |
| download | ice-5b7fa81e49780378ad7608c05f274c03e397b578.tar.bz2 ice-5b7fa81e49780378ad7608c05f274c03e397b578.tar.xz ice-5b7fa81e49780378ad7608c05f274c03e397b578.zip | |
Improved shutdown
Diffstat (limited to 'java/src/IceGrid/AdminGUI.java')
| -rwxr-xr-x | java/src/IceGrid/AdminGUI.java | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/java/src/IceGrid/AdminGUI.java b/java/src/IceGrid/AdminGUI.java index cea67388c7c..564e29371e0 100755 --- a/java/src/IceGrid/AdminGUI.java +++ b/java/src/IceGrid/AdminGUI.java @@ -94,17 +94,48 @@ public class AdminGUI extends JFrame super("IceGrid Admin");
setIconImage(Utils.getIcon("/icons/grid.png").getImage());
- _model = new Model(this, args, Preferences.userNodeForPackage(getClass()),
- new StatusBarI());
-
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter()
{
public void windowClosing(WindowEvent e)
{
- _model.exit(0);
+ if(_model != null)
+ {
+ _model.exit(0);
+ }
}
});
+
+ Thread shutdownHook = new Thread("Shutdown hook")
+ {
+ public void run()
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ if(_model != null)
+ {
+ _model.exit(0);
+ }
+ }
+ });
+ //
+ // Give 3 seconds to the GUI thread
+ //
+ try
+ {
+ Thread.sleep(3000);
+ }
+ catch(java.lang.InterruptedException e)
+ {}
+ System.err.println("End of shutdown hook");
+ }
+ };
+ Runtime.getRuntime().addShutdownHook(shutdownHook);
+
+ _model = new Model(this, args, Preferences.userNodeForPackage(getClass()),
+ new StatusBarI());
initComponents();
_model.showMainFrame();
|