Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/login
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15769/src/games/stendhal/client/gui/login
Modified Files:
ProfileList.java
Log Message:
don't depend on default encoding
Index: ProfileList.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/gui/login/ProfileList.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ProfileList.java 4 Oct 2010 19:44:33 -0000 1.10
--- ProfileList.java 10 Jan 2013 23:21:21 -0000 1.11
***************
*** 19,23 ****
import java.io.InputStreamReader;
import java.io.OutputStream;
! import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Iterator;
--- 19,24 ----
import java.io.InputStreamReader;
import java.io.OutputStream;
! import java.io.OutputStreamWriter;
! import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
***************
*** 43,47 ****
/**
* Add a profile. This will remove duplicates.
! *
* @param profile
* A user login profile.
--- 44,48 ----
/**
* Add a profile. This will remove duplicates.
! *
* @param profile
* A user login profile.
***************
*** 64,68 ****
/**
* Get an iterator of profiles.
! *
* @return An iterator of profiles.
*/
--- 65,69 ----
/**
* Get an iterator of profiles.
! *
* @return An iterator of profiles.
*/
***************
*** 81,85 ****
String s;
! final BufferedReader r = new BufferedReader(new InputStreamReader(in));
clear();
--- 82,86 ----
String s;
! final BufferedReader r = new BufferedReader(new InputStreamReader(in, "UTF-8"));
clear();
***************
*** 92,96 ****
/**
* Remove a profile.
! *
* @param profile
* A user login profile.
--- 93,97 ----
/**
* Remove a profile.
! *
* @param profile
* A user login profile.
***************
*** 102,106 ****
/**
* Save a list of profiles to an output stream.
! *
* @param out
* The stream to write.
--- 103,107 ----
/**
* Save a list of profiles to an output stream.
! *
* @param out
* The stream to write.
***************
*** 110,114 ****
final Encoder codec = new Encoder();
! final PrintStream ps = new PrintStream(out);
try {
--- 111,115 ----
final Encoder codec = new Encoder();
! final Writer writer = new OutputStreamWriter(out, "UTF-8");
try {
***************
*** 116,123 ****
while (iter.hasNext()) {
! ps.println(codec.encode(iter.next().encode()));
}
} finally {
! ps.flush();
}
}
--- 117,125 ----
while (iter.hasNext()) {
! writer.write(codec.encode(iter.next().encode()));
! writer.write(System.getProperty("line.separator"));
}
} finally {
! writer.flush();
}
}
|