From: Hendrik <nh...@us...> - 2007-03-23 23:49:11
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24849/src/games/stendhal/client/gui Modified Files: LoginDialog.java Log Message: removed protocol box to simplify the dialog (next version if marauroa will only support TCP anyway) Index: LoginDialog.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/LoginDialog.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** LoginDialog.java 23 Mar 2007 21:00:49 -0000 1.50 --- LoginDialog.java 23 Mar 2007 23:49:10 -0000 1.51 *************** *** 53,61 **** public class LoginDialog extends JDialog { - // private static final long serialVersionUID = 4436228792112530975L; - - private static final String TCPIP_TEXT = "TCP/IP (default)"; - - private static final String UDP_TEXT = "UDP"; // Variables declaration --- 53,56 ---- *************** *** 174,208 **** /* - * Network Protocol - */ - l = new JLabel("Network protocol"); - - c.gridx = 0; - c.gridy = 3; - contentPane.add(l, c); - - protocolComboBox = new JComboBox(new String[] { TCPIP_TEXT, UDP_TEXT }); - - c.gridx = 1; - c.gridy = 3; - c.insets = new Insets(4, 4, 4, 4); - c.fill = GridBagConstraints.BOTH; - contentPane.add(protocolComboBox, c); - - /* - * What if we want to "save" a profile in TCP mode, and just - * use UDP when forced to? - */ - if (Debug.WEB_START_SANDBOX) { - // UDP is not supported in sandbox mode. - l.setEnabled(false); - // l.setVisible(false); - - protocolComboBox.setSelectedItem(TCPIP_TEXT); - protocolComboBox.setEnabled(false); - // protocolComboBox.setVisible(false); - } - - /* * Username */ --- 169,172 ---- *************** *** 211,215 **** c.insets = new Insets(4, 4, 4, 4); c.gridx = 0; ! c.gridy = 4; contentPane.add(l, c); --- 175,179 ---- c.insets = new Insets(4, 4, 4, 4); c.gridx = 0; ! c.gridy = 3; contentPane.add(l, c); *************** *** 217,221 **** c.gridx = 1; ! c.gridy = 4; c.fill = GridBagConstraints.BOTH; contentPane.add(usernameField, c); --- 181,185 ---- c.gridx = 1; ! c.gridy = 3; c.fill = GridBagConstraints.BOTH; contentPane.add(usernameField, c); *************** *** 227,231 **** c.gridx = 0; ! c.gridy = 5; c.fill = GridBagConstraints.NONE; contentPane.add(l, c); --- 191,195 ---- c.gridx = 0; ! c.gridy = 4; c.fill = GridBagConstraints.NONE; contentPane.add(l, c); *************** *** 234,238 **** c.gridx = 1; ! c.gridy = 5; c.fill = GridBagConstraints.BOTH; contentPane.add(passwordField, c); --- 198,202 ---- c.gridx = 1; ! c.gridy = 4; c.fill = GridBagConstraints.BOTH; contentPane.add(passwordField, c); *************** *** 244,248 **** c.gridx = 0; ! c.gridy = 6; c.fill = GridBagConstraints.NONE; contentPane.add(saveLoginBox, c); --- 208,212 ---- c.gridx = 0; ! c.gridy = 5; c.fill = GridBagConstraints.NONE; contentPane.add(saveLoginBox, c); *************** *** 260,264 **** c.gridx = 1; ! c.gridy = 6; c.anchor = GridBagConstraints.CENTER; c.insets = new Insets(15, 4, 4, 4); --- 224,228 ---- c.gridx = 1; ! c.gridy = 5; c.anchor = GridBagConstraints.CENTER; c.insets = new Insets(15, 4, 4, 4); *************** *** 301,305 **** profile.setPassword(new String(passwordField.getPassword())); ! profile.setTCP(protocolComboBox.getSelectedItem() == TCPIP_TEXT); /* --- 265,269 ---- profile.setPassword(new String(passwordField.getPassword())); ! profile.setTCP(true); /* *************** *** 480,489 **** serverPortField.setText(String.valueOf(profile.getPort())); - if (profile.isTCP()) { - protocolComboBox.setSelectedItem(TCPIP_TEXT); - } else { - protocolComboBox.setSelectedItem(UDP_TEXT); - } - usernameField.setText(profile.getUser()); passwordField.setText(profile.getPassword()); --- 444,447 ---- *************** *** 493,498 **** serverPortField.setText(String.valueOf(Profile.DEFAULT_SERVER_PORT)); - protocolComboBox.setSelectedItem(TCPIP_TEXT); - usernameField.setText(""); passwordField.setText(""); --- 451,454 ---- *************** *** 522,531 **** } - public static void main(String args[]) { - new LoginDialog(null, null).setVisible(true); - } - - // - // /** --- 478,481 ---- |