summaryrefslogtreecommitdiffstats
path: root/src/jrummikub
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 16:25:17 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-21 16:25:17 +0200
commit39ba50e1acccea934d6d082f66d35559295d57b0 (patch)
tree01f2b3227ef5e2a4c837d3e1f284e7e5dbb2a88b /src/jrummikub
parent7899a38fe63a819d405a18e0139cea6ff95aac33 (diff)
downloadJRummikub-39ba50e1acccea934d6d082f66d35559295d57b0.tar
JRummikub-39ba50e1acccea934d6d082f66d35559295d57b0.zip
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
Diffstat (limited to 'src/jrummikub')
-rw-r--r--src/jrummikub/control/ApplicationControl.java8
-rw-r--r--src/jrummikub/control/LoginControl.java5
-rw-r--r--src/jrummikub/view/IView.java2
-rw-r--r--src/jrummikub/view/impl/View.java9
4 files changed, 15 insertions, 9 deletions
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<LoginData>() {
@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,14 +497,15 @@ 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) {
gameListPanel.reset();