From 39ba50e1acccea934d6d082f66d35559295d57b0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 21 Jun 2011 16:25:17 +0200 Subject: Don't reset login panel after failed login git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@548 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/control/ApplicationControl.java | 8 ++++---- src/jrummikub/control/LoginControl.java | 5 ++++- src/jrummikub/view/IView.java | 2 ++ src/jrummikub/view/impl/View.java | 9 +++++---- 4 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/jrummikub') diff --git a/src/jrummikub/control/ApplicationControl.java b/src/jrummikub/control/ApplicationControl.java index 71de63e..58d1690 100644 --- a/src/jrummikub/control/ApplicationControl.java +++ b/src/jrummikub/control/ApplicationControl.java @@ -95,7 +95,7 @@ public class ApplicationControl { public void handle() { abortControls(); - createLoginControl(); + createLoginControl(true); } }); @@ -121,7 +121,7 @@ public class ApplicationControl { /** * Create a new network login control */ - private void createLoginControl() { + private void createLoginControl(boolean reset) { loginControl = new LoginControl(view); loginControl.getLoginEvent().add(new IListener1() { @Override @@ -135,7 +135,7 @@ public class ApplicationControl { startApplication(); } }); - loginControl.startLogin(); + loginControl.startLogin(reset); } /** @@ -234,7 +234,7 @@ public class ApplicationControl { @Override public void handle() { networkControl = null; - createLoginControl(); + createLoginControl(false); } }); diff --git a/src/jrummikub/control/LoginControl.java b/src/jrummikub/control/LoginControl.java index f26b0d6..24bfcf6 100644 --- a/src/jrummikub/control/LoginControl.java +++ b/src/jrummikub/control/LoginControl.java @@ -53,7 +53,10 @@ public class LoginControl { * Open Login panel * */ - public void startLogin() { + public void startLogin(boolean reset) { + if (reset) { + view.resetLoginPanel(); + } view.showLoginPanel(true); } diff --git a/src/jrummikub/view/IView.java b/src/jrummikub/view/IView.java index 8643781..c0dc675 100644 --- a/src/jrummikub/view/IView.java +++ b/src/jrummikub/view/IView.java @@ -221,6 +221,8 @@ public interface IView { */ public void showLoginPanel(boolean show); + public void resetLoginPanel(); + /** * Enable/disable pause mode * diff --git a/src/jrummikub/view/impl/View.java b/src/jrummikub/view/impl/View.java index 9a0bf9e..0f279ab 100644 --- a/src/jrummikub/view/impl/View.java +++ b/src/jrummikub/view/impl/View.java @@ -497,13 +497,14 @@ public class View extends JFrame implements IView { @Override public void showLoginPanel(boolean show) { - if (show) { - loginPanel.resetLoginPanel(); - } - loginPanel.setVisible(show); } + @Override + public void resetLoginPanel() { + loginPanel.resetLoginPanel(); + } + @Override public void showGameListPanel(boolean show) { if (show) { -- cgit v1.2.3