From 06ab9e5b9bde1b0a82a05b3080cfd1f337de1241 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 24 Jul 2015 11:49:30 +0200 Subject: [PATCH] =?utf8?q?Introduced=20updateStatus()=20+=20shutdownApplic?= =?utf8?q?ation()=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../client/gui/AddressbookFrame.java | 39 +++++++++++++++---- .../addressbook/client/gui/ClientFrame.java | 2 + 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java index d03358c..13e02ce 100644 --- a/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java +++ b/Addressbook/src/org/mxchange/addressbook/client/gui/AddressbookFrame.java @@ -138,7 +138,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame this.frame.setVisible(true); // All done here - this.statusLabel.setText(this.getBundle().getString("AddressbookFrame.statusLabel.done.text")); + this.updateStatus("done"); } /** @@ -176,6 +176,20 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame return this.isInitialized; } + /** + * Shuts down the application. + */ + @Override + public void shutdownApplication () { + // To do this, the frame must be initialized + if (!this.isInitialized()) { + // Not initalized, so bad call + this.getLogger().fatal("Bad call of shutdownApplication(). Please report this."); + return; + } + this.getClient().getApplication().doShutdown(); + } + /** * Initialize components */ @@ -194,7 +208,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame @Override public void windowClosed(final WindowEvent e) { // Shutdown application cleanly - self.getClient().getApplication().doShutdown(); + self.shutdownApplication(); } /** @@ -204,7 +218,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame @Override public void windowClosing(final WindowEvent e) { // Also shutdown cleanly here - self.getClient().getApplication().doShutdown(); + self.shutdownApplication(); } }); @@ -220,9 +234,6 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame // Init menu system initMenuSystem(); - // Init status label (which needs to be updated - this.statusLabel = new JLabel(this.getBundle().getString("AddressbookFrame.statusLabel.initializing.text")); - // Init status panel initStatusPanel(); } @@ -254,7 +265,7 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame */ @Override public void actionPerformed (final ActionEvent e) { - self.getClient().getApplication().doShutdown(); + self.shutdownApplication(); } }); @@ -319,6 +330,10 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame * Initializes status panel */ private void initStatusPanel () { + // Init status label (which needs to be updated + this.statusLabel = new JLabel(); + this.updateStatus("initializing"); + // Init status bar in south JPanel panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS)); @@ -328,4 +343,14 @@ public class AddressbookFrame extends BaseFrameworkSystem implements ClientFrame // Add panel to frame this.frame.add(panel, BorderLayout.SOUTH); } + + /** + * Updates status to given type + * + * @param type Status type + */ + private void updateStatus (final String type) { + // Set status message + this.statusLabel.setText(this.getBundle().getString("AddressbookFrame.statusLabel." + type + ".text")); + } } diff --git a/Addressbook/src/org/mxchange/addressbook/client/gui/ClientFrame.java b/Addressbook/src/org/mxchange/addressbook/client/gui/ClientFrame.java index 389e744..24bec98 100644 --- a/Addressbook/src/org/mxchange/addressbook/client/gui/ClientFrame.java +++ b/Addressbook/src/org/mxchange/addressbook/client/gui/ClientFrame.java @@ -53,4 +53,6 @@ public interface ClientFrame extends FrameworkInterface { * @return Field isInitialized */ public boolean isInitialized (); + + public void shutdownApplication (); } -- 2.39.5