[Arianne-commits] stendhal/src/games/stendhal/client/gui j2DClient.java, 1.132, 1.133 LoginDialog.java, 1.55, 1.56

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

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

Modified Files:
	j2DClient.java LoginDialog.java 
Log Message:
force use of TCP

Index: LoginDialog.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/LoginDialog.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** LoginDialog.java	27 Mar 2007 23:41:44 -0000	1.55
--- LoginDialog.java	1 Apr 2007 10:22:12 -0000	1.56
***************
*** 15,19 ****
  import games.stendhal.client.StendhalClient;
  import games.stendhal.client.stendhal;
- import games.stendhal.common.Debug;
  import games.stendhal.client.gui.login.Profile;
  import games.stendhal.client.gui.login.ProfileList;
--- 15,18 ----
***************
*** 250,254 ****
  		profile.setPassword(new String(passwordField.getPassword()));
  
- 		profile.setTCP(true);
  
  		/*
--- 249,252 ----
***************
*** 274,278 ****
  	protected void connect(Profile profile) {
  		final ProgressBar progressBar = new ProgressBar(this);
- 		boolean useTCP;
  
  		// intialize progress bar
--- 272,275 ----
***************
*** 282,290 ****
  		setEnabled(false);
  
- 		// Force TCP for Web Start Sandbox
- 		useTCP = profile.isTCP() || Debug.WEB_START_SANDBOX;
- 
  		try {
! 			client.connect(profile.getHost(), profile.getPort(), useTCP);
  
  			// for each major connection milestone call step()
--- 279,284 ----
  		setEnabled(false);
  
  		try {
! 			client.connect(profile.getHost(), profile.getPort(), true);
  
  			// for each major connection milestone call step()

Index: j2DClient.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/j2DClient.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** j2DClient.java	1 Apr 2007 00:00:56 -0000	1.132
--- j2DClient.java	1 Apr 2007 10:22:12 -0000	1.133
***************
*** 1043,1047 ****
  				StendhalClient client = StendhalClient.get();
  				try {
! 					client.connect(host, Integer.parseInt(port));
  					client.login(username, password);
  
--- 1043,1047 ----
  				StendhalClient client = StendhalClient.get();
  				try {
! 					client.connect(host, Integer.parseInt(port), true);
  					client.login(username, password);