Author: toad
Date: 2007-06-15 21:11:05 +0000 (Fri, 15 Jun 2007)
New Revision: 13614
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/fcp/AddPeer.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/support/io/FileUtil.java
Log:
Specify UTF-8 everywhere. Well almost everywhere.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-06-15 19:29:54 UTC (rev 13613)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2007-06-15 21:11:05 UTC (rev 13614)
@@ -643,6 +643,7 @@
try {
URL url = new URL(urltext);
URLConnection uc = url.openConnection();
+ // FIXME get charset encoding from
uc.getContentType()
in = new BufferedReader(new
InputStreamReader(uc.getInputStream()));
String line;
while ( (line = in.readLine()) != null)
{
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-06-15 19:29:54 UTC (rev
13613)
+++ trunk/freenet/src/freenet/node/Node.java 2007-06-15 21:11:05 UTC (rev
13614)
@@ -470,7 +470,7 @@
private void readNodeFile(String filename, RandomSource r) throws
IOException {
// REDFLAG: Any way to share this code with NodePeer?
FileInputStream fis = new FileInputStream(filename);
- InputStreamReader isr = new InputStreamReader(fis);
+ InputStreamReader isr = new InputStreamReader(fis, "UTF-8");
BufferedReader br = new BufferedReader(isr);
SimpleFieldSet fs = new SimpleFieldSet(br, false, true);
br.close();
@@ -638,7 +638,7 @@
FileOutputStream fos = null;
try {
fos = new FileOutputStream(backup);
- OutputStreamWriter osr = new OutputStreamWriter(fos);
+ OutputStreamWriter osr = new OutputStreamWriter(fos,
"UTF-8");
BufferedWriter bw = new BufferedWriter(osr);
fs.writeTo(bw);
bw.close();
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2007-06-15 19:29:54 UTC
(rev 13613)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2007-06-15 21:11:05 UTC
(rev 13614)
@@ -13,6 +13,7 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.util.Arrays;
import java.util.HashMap;
@@ -133,7 +134,12 @@
Logger.normal(this, "Peers file not found: "+peersFile);
return false;
}
- InputStreamReader ris = new InputStreamReader(fis);
+ InputStreamReader ris;
+ try {
+ ris = new InputStreamReader(fis, "UTF-8");
+ } catch (UnsupportedEncodingException e4) {
+ throw new Error("UTF-8 not supported!: "+e4, e4);
+ }
BufferedReader br = new BufferedReader(ris);
try { // FIXME: no better way?
while(true) {
@@ -726,7 +732,12 @@
+ f + " - " + e2, e2);
return;
}
- OutputStreamWriter w = new OutputStreamWriter(fos);
+ OutputStreamWriter w;
+ try {
+ w = new OutputStreamWriter(fos, "UTF-8");
+ } catch (UnsupportedEncodingException e2) {
+ throw new Error("UTF-8 unsupported!: "+e2, e2);
+ }
BufferedWriter bw = new BufferedWriter(w);
try {
boolean succeeded = writePeers(bw);
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-06-15 19:29:54 UTC
(rev 13613)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-06-15 21:11:05 UTC
(rev 13614)
@@ -2728,7 +2728,12 @@
Logger.normal(this, "Extra peer data file not found:
"+extraPeerDataFile.getPath());
return false;
}
- InputStreamReader isr = new InputStreamReader(fis);
+ InputStreamReader isr;
+ try {
+ isr = new InputStreamReader(fis, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new Error("Impossible: JVM doesn't support UTF-8:
"+e, e);
+ }
BufferedReader br = new BufferedReader(isr);
SimpleFieldSet fs = null;
try {
@@ -2891,7 +2896,12 @@
+ f + " - " + e2, e2);
return -1;
}
- OutputStreamWriter w = new OutputStreamWriter(fos);
+ OutputStreamWriter w;
+ try {
+ w = new OutputStreamWriter(fos, "UTF-8");
+ } catch (UnsupportedEncodingException e2) {
+ throw new Error("UTF-8 unsupported!: "+e2, e2);
+ }
BufferedWriter bw = new BufferedWriter(w);
try {
fs.writeTo(bw);
@@ -2984,7 +2994,12 @@
+ f + " - " + e2, e2);
return false;
}
- OutputStreamWriter w = new OutputStreamWriter(fos);
+ OutputStreamWriter w;
+ try {
+ w = new OutputStreamWriter(fos, "UTF-8");
+ } catch (UnsupportedEncodingException e2) {
+ throw new Error("JVM doesn't support UTF-8 charset!:
"+e2, e2);
+ }
BufferedWriter bw = new BufferedWriter(w);
try {
fs.writeTo(bw);
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2007-06-15
19:29:54 UTC (rev 13613)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2007-06-15
21:11:05 UTC (rev 13614)
@@ -675,6 +675,7 @@
URL url = new URL(key);
URLConnection uc = url.openConnection();
in = new BufferedReader(
+ // FIXME get charset from
uc.getContentType()
new
InputStreamReader(uc.getInputStream()));
}
content = readLines(in, true);
Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-06-15 19:29:54 UTC
(rev 13613)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-06-15 21:11:05 UTC
(rev 13614)
@@ -50,6 +50,7 @@
try {
URL url = new URL(urlString);
URLConnection uc = url.openConnection();
+ // FIXME get charset from uc.getContentType()
in = new BufferedReader( new
InputStreamReader(uc.getInputStream()));
ref = new StringBuffer(1024);
String line;
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-06-15 19:29:54 UTC
(rev 13613)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2007-06-15 21:11:05 UTC
(rev 13614)
@@ -585,7 +585,7 @@
FileOutputStream fos = new
FileOutputStream(compressedTemp);
BufferedOutputStream bos = new
BufferedOutputStream(fos);
GZIPOutputStream gos = new
GZIPOutputStream(bos);
- OutputStreamWriter osw = new
OutputStreamWriter(gos);
+ OutputStreamWriter osw = new
OutputStreamWriter(gos, "UTF-8");
BufferedWriter w = new
BufferedWriter(osw);
w.write(Integer.toString(persistentRequests.length)+ '\n');
for(int
i=0;i<persistentRequests.length;i++)
@@ -657,7 +657,7 @@
private void loadPersistentRequests(InputStream is) throws IOException {
synchronized(persistenceSync) {
- InputStreamReader ris = new InputStreamReader(is);
+ InputStreamReader ris = new InputStreamReader(is,
"UTF-8");
BufferedReader br = new BufferedReader(ris);
String r = br.readLine();
int count;
Modified: trunk/freenet/src/freenet/support/io/FileUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileUtil.java 2007-06-15 19:29:54 UTC
(rev 13613)
+++ trunk/freenet/src/freenet/support/io/FileUtil.java 2007-06-15 21:11:05 UTC
(rev 13614)
@@ -72,6 +72,7 @@
return result;
}
+ // FIXME this is called readUTF but it reads in the default charset ...
eh??
public static String readUTF(File file) throws FileNotFoundException,
IOException {
StringBuffer result = new StringBuffer();
FileInputStream fis = null;
