Fix in LoginPanel

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@568 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Jannis Harder 2011-06-22 02:00:04 +02:00
parent ea8a675cee
commit 79ae31b1c7

View file

@ -34,7 +34,7 @@ class LoginPanel extends JPanel implements ILoginPanel {
private JTextField passwordField; private JTextField passwordField;
private JTextField channelNameField; private JTextField channelNameField;
private JButton startDedicatedServerButton; private JButton startDedicatedServerButton;
LoginPanel() { LoginPanel() {
setLayout(new GridBagLayout()); setLayout(new GridBagLayout());
GridBagConstraints c = new GridBagConstraints(); GridBagConstraints c = new GridBagConstraints();
@ -44,7 +44,7 @@ class LoginPanel extends JPanel implements ILoginPanel {
c.weighty = 1; c.weighty = 1;
ActionListener loginAction = createInputFields(); ActionListener loginAction = createInputFields();
c.weighty = 0; c.weighty = 0;
add(startDedicatedServerButton, c); add(startDedicatedServerButton, c);
startDedicatedServerButton.addActionListener(new ActionListener() { startDedicatedServerButton.addActionListener(new ActionListener() {
@ -53,7 +53,7 @@ class LoginPanel extends JPanel implements ILoginPanel {
useDedicatedServer.emit(passwordField.getText()); useDedicatedServer.emit(passwordField.getText());
} }
}); });
c.weighty = 1; c.weighty = 1;
add(Box.createVerticalGlue(), c); add(Box.createVerticalGlue(), c);
@ -77,8 +77,8 @@ class LoginPanel extends JPanel implements ILoginPanel {
}); });
add(cancelButton, c); add(cancelButton, c);
setBorder(new CompoundBorder(new LineBorder(Color.BLACK), new EmptyBorder( setBorder(new CompoundBorder(new LineBorder(Color.BLACK),
10, 10, 10, 10))); new EmptyBorder(10, 10, 10, 10)));
} }
private ActionListener createInputFields() { private ActionListener createInputFields() {
@ -99,7 +99,7 @@ class LoginPanel extends JPanel implements ILoginPanel {
channelNameField.addActionListener(loginAction); channelNameField.addActionListener(loginAction);
startDedicatedServerButton = new JButton("Dedizierten Server starten"); startDedicatedServerButton = new JButton("Dedizierten Server starten");
// this fixes some strange layouting bug // this fixes some strange layouting bug
startDedicatedServerButton.setPreferredSize(new Dimension(500,10)); startDedicatedServerButton.setPreferredSize(new Dimension(500, 10));
return loginAction; return loginAction;
} }
@ -125,7 +125,7 @@ class LoginPanel extends JPanel implements ILoginPanel {
public IEvent1<String> getUseDedicatedServerEvent() { public IEvent1<String> getUseDedicatedServerEvent() {
return useDedicatedServer; return useDedicatedServer;
} }
private JTextField addInputRow(String label, JTextField textField) { private JTextField addInputRow(String label, JTextField textField) {
GridBagConstraints c = new GridBagConstraints(); GridBagConstraints c = new GridBagConstraints();
c.fill = GridBagConstraints.HORIZONTAL; c.fill = GridBagConstraints.HORIZONTAL;
@ -144,14 +144,15 @@ class LoginPanel extends JPanel implements ILoginPanel {
private void login() { private void login() {
loginEvent.emit(new LoginData(userNameField.getText(), serverNameField loginEvent.emit(new LoginData(userNameField.getText(), serverNameField
.getText(), passwordField.getText(), channelNameField.getText())); .getText(), passwordField.getText().isEmpty() ? "jrummikub"
: passwordField.getText(), channelNameField.getText()));
} }
@Override @Override
public void setServer(String server) { public void setServer(String server) {
serverNameField.setText(server); serverNameField.setText(server);
} }
@Override @Override
public void setChannel(String channel) { public void setChannel(String channel) {
channelNameField.setText(channel); channelNameField.setText(channel);
@ -159,6 +160,8 @@ class LoginPanel extends JPanel implements ILoginPanel {
@Override @Override
public void setDedicatedServerRunning(boolean running) { public void setDedicatedServerRunning(boolean running) {
startDedicatedServerButton.setText(running ? "Dedizierten Server nutzen" : "Dedizierten Server starten"); startDedicatedServerButton
.setText(running ? "Dedizierten Server nutzen"
: "Dedizierten Server starten");
} }
} }