From 28e5462b08ad8d086b445c08113ab5b2d0151466 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 10 Jun 2011 19:06:51 +0200 Subject: Use LoginData type for login data git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@403 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/control/ApplicationControl.java | 6 ++--- src/jrummikub/control/LoginControl.java | 19 ++++++++-------- src/jrummikub/util/LoginData.java | 32 +++++++++++++++++++++++++++ src/jrummikub/view/ILoginPanel.java | 5 +++-- src/jrummikub/view/impl/LoginPanel.java | 15 ++++++++----- 5 files changed, 56 insertions(+), 21 deletions(-) create mode 100644 src/jrummikub/util/LoginData.java (limited to 'src') diff --git a/src/jrummikub/control/ApplicationControl.java b/src/jrummikub/control/ApplicationControl.java index 5cd1116..b42bc4f 100644 --- a/src/jrummikub/control/ApplicationControl.java +++ b/src/jrummikub/control/ApplicationControl.java @@ -6,6 +6,7 @@ import jrummikub.model.IRoundState; import jrummikub.util.IListener; import jrummikub.util.IListener1; import jrummikub.util.IListener3; +import jrummikub.util.LoginData; import jrummikub.view.IView; import jrummikub.view.IView.BottomPanelType; @@ -76,10 +77,9 @@ public class ApplicationControl { loginControl = new LoginControl(view); loginControl.getLoginEvent().add( - new IListener3() { + new IListener1() { @Override - public void handle(String userName, String password, - String channelName) { + public void handle(LoginData loginData) { // TODO Auto-generated method stub } }); diff --git a/src/jrummikub/control/LoginControl.java b/src/jrummikub/control/LoginControl.java index 233a2d3..2e6b853 100644 --- a/src/jrummikub/control/LoginControl.java +++ b/src/jrummikub/control/LoginControl.java @@ -5,28 +5,28 @@ import java.util.List; import jrummikub.util.Connection; import jrummikub.util.Event; -import jrummikub.util.Event3; +import jrummikub.util.Event1; import jrummikub.util.IEvent; -import jrummikub.util.IEvent3; +import jrummikub.util.IEvent1; import jrummikub.util.IListener; -import jrummikub.util.IListener3; +import jrummikub.util.IListener1; +import jrummikub.util.LoginData; import jrummikub.view.IView; public class LoginControl { private IView view; - private Event3 loginEvent = new Event3(); + private Event1 loginEvent = new Event1(); private Event cancelEvent = new Event(); private List connections = new ArrayList(); public LoginControl(final IView view) { this.view = view; connections.add(view.getLoginPanel().getLoginEvent() - .add(new IListener3() { + .add(new IListener1() { @Override - public void handle(String userName, String password, - String channelName) { + public void handle(LoginData loginData) { abort(); - loginEvent.emit(userName, password, channelName); + loginEvent.emit(loginData); } })); @@ -43,7 +43,7 @@ public class LoginControl { view.showLoginPanel(true); } - public IEvent3 getLoginEvent() { + public IEvent1 getLoginEvent() { return loginEvent; } @@ -57,5 +57,4 @@ public class LoginControl { c.remove(); } } - } diff --git a/src/jrummikub/util/LoginData.java b/src/jrummikub/util/LoginData.java new file mode 100644 index 0000000..fb295c1 --- /dev/null +++ b/src/jrummikub/util/LoginData.java @@ -0,0 +1,32 @@ +package jrummikub.util; + +public class LoginData { + private String userName; + private String serverName; + private String password; + private String channelName; + + public LoginData(String userName, String serverName, String password, + String channelName) { + this.userName = userName; + this.serverName = serverName; + this.password = password; + this.channelName = channelName; + } + + public String getUserName() { + return userName; + } + + public String getServerName() { + return serverName; + } + + public String getPassword() { + return password; + } + + public String getChannelName() { + return channelName; + } +} \ No newline at end of file diff --git a/src/jrummikub/view/ILoginPanel.java b/src/jrummikub/view/ILoginPanel.java index c80c48a..f464c77 100644 --- a/src/jrummikub/view/ILoginPanel.java +++ b/src/jrummikub/view/ILoginPanel.java @@ -1,11 +1,12 @@ package jrummikub.view; import jrummikub.util.IEvent; -import jrummikub.util.IEvent3; +import jrummikub.util.IEvent1; +import jrummikub.util.LoginData; public interface ILoginPanel { - public IEvent3 getLoginEvent(); + public IEvent1 getLoginEvent(); public IEvent getCancelEvent(); diff --git a/src/jrummikub/view/impl/LoginPanel.java b/src/jrummikub/view/impl/LoginPanel.java index d6260ff..450c392 100644 --- a/src/jrummikub/view/impl/LoginPanel.java +++ b/src/jrummikub/view/impl/LoginPanel.java @@ -16,16 +16,18 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.LineBorder; import jrummikub.util.Event; -import jrummikub.util.Event3; +import jrummikub.util.Event1; import jrummikub.util.IEvent; -import jrummikub.util.IEvent3; +import jrummikub.util.IEvent1; +import jrummikub.util.LoginData; import jrummikub.view.ILoginPanel; @SuppressWarnings("serial") class LoginPanel extends JPanel implements ILoginPanel { - private Event3 loginEvent = new Event3(); + private Event1 loginEvent = new Event1(); private Event cancelEvent = new Event(); private JTextField userNameField; + private JTextField serverNameField; private JTextField passwordField; private JTextField channelNameField; @@ -38,6 +40,7 @@ class LoginPanel extends JPanel implements ILoginPanel { c.weighty = 1; userNameField = addInputRow("Benutzername:"); + serverNameField = addInputRow("Server:"); passwordField = addInputRow("Passwort:"); channelNameField = addInputRow("Channel:"); add(Box.createVerticalGlue(), c); @@ -48,8 +51,8 @@ class LoginPanel extends JPanel implements ILoginPanel { loginButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent arg0) { - loginEvent.emit(userNameField.getText(), passwordField.getText(), - channelNameField.getText()); + loginEvent.emit(new LoginData(userNameField.getText(), serverNameField + .getText(), passwordField.getText(), channelNameField.getText())); } }); add(loginButton, c); @@ -73,7 +76,7 @@ class LoginPanel extends JPanel implements ILoginPanel { } @Override - public IEvent3 getLoginEvent() { + public IEvent1 getLoginEvent() { return loginEvent; } -- cgit v1.2.3