From bd12bbd30e436389ebd09a3f4a543cc3ff8fc77e Mon Sep 17 00:00:00 2001 From: mguessan Date: Fri, 6 Aug 2010 23:07:21 +0000 Subject: [PATCH] SWT: fix 2992428, hide instead of dispose on close git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1328 3d1905a2-6b24-0410-a738-b14d5a86fcbd --- src/java/davmail/ui/AboutFrame.java | 6 +++--- src/java/davmail/ui/AcceptCertificateDialog.java | 4 ++-- src/java/davmail/ui/PasswordPromptDialog.java | 6 +++--- src/java/davmail/ui/SettingsFrame.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/java/davmail/ui/AboutFrame.java b/src/java/davmail/ui/AboutFrame.java index 96d35690..0f5ab3f0 100644 --- a/src/java/davmail/ui/AboutFrame.java +++ b/src/java/davmail/ui/AboutFrame.java @@ -46,7 +46,7 @@ public class AboutFrame extends JFrame { * About frame. */ public AboutFrame() { - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); setTitle(BundleMessage.format("UI_ABOUT_DAVMAIL")); setIconImage(DavGatewayTray.getFrameIcon()); try { @@ -81,7 +81,7 @@ public class AboutFrame extends JFrame { } catch (URISyntaxException e) { DavGatewayTray.error(new BundleMessage("LOG_UNABLE_TO_OPEN_LINK"), e); } - dispose(); + setVisible(false); } } }); @@ -95,7 +95,7 @@ public class AboutFrame extends JFrame { JButton ok = new JButton(BundleMessage.format("UI_BUTTON_OK")); ActionListener close = new ActionListener() { public void actionPerformed(ActionEvent evt) { - dispose(); + setVisible(false); } }; ok.addActionListener(close); diff --git a/src/java/davmail/ui/AcceptCertificateDialog.java b/src/java/davmail/ui/AcceptCertificateDialog.java index d4be18fc..583c8b70 100644 --- a/src/java/davmail/ui/AcceptCertificateDialog.java +++ b/src/java/davmail/ui/AcceptCertificateDialog.java @@ -126,13 +126,13 @@ public class AcceptCertificateDialog extends JDialog { accept.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { accepted = true; - dispose(); + setVisible(false); } }); deny.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { accepted = false; - dispose(); + setVisible(false); } }); diff --git a/src/java/davmail/ui/PasswordPromptDialog.java b/src/java/davmail/ui/PasswordPromptDialog.java index 86f331d2..3cb60450 100644 --- a/src/java/davmail/ui/PasswordPromptDialog.java +++ b/src/java/davmail/ui/PasswordPromptDialog.java @@ -73,7 +73,7 @@ public class PasswordPromptDialog extends JDialog { passwordField.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { password = passwordField.getPassword(); - dispose(); + setVisible(false); } }); JPanel passwordPanel = new JPanel(); @@ -102,13 +102,13 @@ public class PasswordPromptDialog extends JDialog { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { password = passwordField.getPassword(); - dispose(); + setVisible(false); } }); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { password = null; - dispose(); + setVisible(false); } }); diff --git a/src/java/davmail/ui/SettingsFrame.java b/src/java/davmail/ui/SettingsFrame.java index a11f75b5..7e83a0ee 100644 --- a/src/java/davmail/ui/SettingsFrame.java +++ b/src/java/davmail/ui/SettingsFrame.java @@ -506,7 +506,7 @@ public class SettingsFrame extends JFrame { * DavMail settings frame. */ public SettingsFrame() { - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); setTitle(BundleMessage.format("UI_DAVMAIL_SETTINGS")); setIconImage(DavGatewayTray.getFrameIcon()); @@ -615,7 +615,7 @@ public class SettingsFrame extends JFrame { Settings.setLoggingLevel("httpclient.wire", (Level) wireLoggingLevelField.getSelectedItem()); Settings.setProperty("davmail.logFilePath", logFilePathField.getText()); - dispose(); + setVisible(false); Settings.save(); // restart listeners with new config DavGateway.restart(); @@ -626,7 +626,7 @@ public class SettingsFrame extends JFrame { cancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { reload(); - dispose(); + setVisible(false); } });