Use LoginData type for login data

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@403 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-10 19:06:51 +02:00
parent e4ac4b55cd
commit 28e5462b08
7 changed files with 70 additions and 34 deletions

View file

@ -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<String, String, String> getLoginEvent();
public IEvent1<LoginData> getLoginEvent();
public IEvent getCancelEvent();

View file

@ -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<String, String, String> loginEvent = new Event3<String, String, String>();
private Event1<LoginData> loginEvent = new Event1<LoginData>();
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<String, String, String> getLoginEvent() {
public IEvent1<LoginData> getLoginEvent() {
return loginEvent;
}