[Arianne-commits] stendhal/src/games/stendhal/client/gui LoginDialog.java, 1.27, 1.28

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17016/src/games/stendhal/client/gui

Modified Files:
	LoginDialog.java 
Log Message:
added checkbox for TCP

Index: LoginDialog.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/LoginDialog.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** LoginDialog.java	11 Jul 2006 15:33:21 -0000	1.27
--- LoginDialog.java	16 Jul 2006 15:12:47 -0000	1.28
***************
*** 41,44 ****
--- 41,45 ----
  
  	private JCheckBox saveLoginBox;
+ 	private JCheckBox useTCPBox;
  
  	private JTextField usernameField;
***************
*** 82,85 ****
--- 83,87 ----
  		passwordLabel = new JLabel("Type your password");
  		saveLoginBox = new JCheckBox("Remember login info");
+ 		useTCPBox = new JCheckBox("Experimental TCP");
  		usernameField = new JTextField();
  		passwordField = new JPasswordField();
***************
*** 98,102 ****
  			serverField.addItem(server);
  		}
- 		// Added support for saving port number int...@gm...
  
  		int tokens = loginInfo.countTokens();
--- 100,103 ----
***************
*** 116,121 ****
  			passwordField.setText(loginInfo.nextToken());
  		}
! 		// Added support for saving port number int...@gm...
! 		if (tokens == 4) {
  			//
  			// serverPortField
--- 117,121 ----
  			passwordField.setText(loginInfo.nextToken());
  		}
! 		if (tokens >= 4) {
  			//
  			// serverPortField
***************
*** 159,187 ****
  		c.fill = GridBagConstraints.BOTH;
  		contentPane.add(serverPortField, c);
  		// row 2
  		c.insets = new Insets(4, 4, 4, 4);
  		c.gridx = 0;
! 		c.gridy = 2;
  		contentPane.add(usernameLabel, c);
  		c.gridx = 1;
! 		c.gridy = 2;
  		c.fill = GridBagConstraints.BOTH;
  		contentPane.add(usernameField, c);
  		// row 3
  		c.gridx = 0;
! 		c.gridy = 3;
  		c.fill = GridBagConstraints.NONE;
  		contentPane.add(passwordLabel, c);
  		c.gridx = 1;
! 		c.gridy = 3;
  		c.fill = GridBagConstraints.BOTH;
  		contentPane.add(passwordField, c);
  		// row 4
  		c.gridx = 0;
! 		c.gridy = 4;
  		c.fill = GridBagConstraints.NONE;
  		contentPane.add(saveLoginBox, c);
  		c.gridx = 1;
! 		c.gridy = 4;
  		c.anchor = GridBagConstraints.CENTER;
  		c.insets = new Insets(15, 4, 4, 4);
--- 159,192 ----
  		c.fill = GridBagConstraints.BOTH;
  		contentPane.add(serverPortField, c);
+ 		c.gridx = 1;
+ 		c.gridy = 2;
+ 		c.insets = new Insets(4, 4, 4, 4);
+ 		c.fill = GridBagConstraints.BOTH;
+ 		contentPane.add(useTCPBox, c);
  		// row 2
  		c.insets = new Insets(4, 4, 4, 4);
  		c.gridx = 0;
! 		c.gridy = 3;
  		contentPane.add(usernameLabel, c);
  		c.gridx = 1;
! 		c.gridy = 3;
  		c.fill = GridBagConstraints.BOTH;
  		contentPane.add(usernameField, c);
  		// row 3
  		c.gridx = 0;
! 		c.gridy = 4;
  		c.fill = GridBagConstraints.NONE;
  		contentPane.add(passwordLabel, c);
  		c.gridx = 1;
! 		c.gridy = 4;
  		c.fill = GridBagConstraints.BOTH;
  		contentPane.add(passwordField, c);
  		// row 4
  		c.gridx = 0;
! 		c.gridy = 5;
  		c.fill = GridBagConstraints.NONE;
  		contentPane.add(saveLoginBox, c);
  		c.gridx = 1;
! 		c.gridy = 5;
  		c.anchor = GridBagConstraints.CENTER;
  		c.insets = new Insets(15, 4, 4, 4);
***************
*** 193,208 ****
  		this.setTitle("Login to Server");
  		this.setResizable(false);
! 		this.setSize(new Dimension(410, 205));
  		this.setLocationRelativeTo(owner);
  	}
  
- 	// TODO: Never used? remove me
- 	// /** Add Component Without a Layout Manager (Absolute Positioning) */
- 	// private void addComponent(Container container, Component c, int x, int y,
- 	// int width, int height) {
- 	// c.setBounds(x, y, width, height);
- 	// container.add(c);
- 	// }
- 
  	private void loginButton_actionPerformed(ActionEvent e,
  			boolean saveLoginBoxStatus) {
--- 198,205 ----
  		this.setTitle("Login to Server");
  		this.setResizable(false);
! 		this.setSize(new Dimension(410, 220));
  		this.setLocationRelativeTo(owner);
  	}
  
  	private void loginButton_actionPerformed(ActionEvent e,
  			boolean saveLoginBoxStatus) {
***************
*** 213,216 ****
--- 210,214 ----
  		final int finalPort;// port couldnt be accessed from inner class
  		final ProgressBar progressBar = new ProgressBar(owner);
+ 		final boolean useTCP = useTCPBox.isSelected();
  
  		try {
***************
*** 239,243 ****
  
  				try {
! 					client.connect(server, finalPort);
  					progressBar.step();// for each major connection milestone
  										// call step()
--- 237,241 ----
  
  				try {
! 					client.connect(server, finalPort, useTCP);
  					progressBar.step();// for each major connection milestone
  										// call step()