Author: nextgens
Date: 2007-04-24 20:30:18 +0000 (Tue, 24 Apr 2007)
New Revision: 12928
Modified:
trunk/freenet/src/freenet/clients/http/PageMaker.java
trunk/freenet/src/freenet/l10n/L10n.java
trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
Log:
Create FileUtil.readUTF(File)... and use it where appropriate
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2007-04-24
18:04:44 UTC (rev 12927)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2007-04-24
20:30:18 UTC (rev 12928)
@@ -1,10 +1,7 @@
package freenet.clients.http;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.JarURLConnection;
import java.net.URL;
import java.net.URLConnection;
@@ -21,6 +18,7 @@
import freenet.l10n.L10n;
import freenet.support.HTMLNode;
import freenet.support.Logger;
+import freenet.support.io.FileUtil;
/** Simple class to output standard heads and tail for web interface pages.
*/
@@ -216,34 +214,13 @@
private HTMLNode getOverrideContent() {
HTMLNode result = new HTMLNode("style", "type", "text/css");
- FileInputStream fis = null;
- BufferedInputStream bis = null;
- InputStreamReader isr = null;
try {
- fis = new FileInputStream(override);
- bis = new BufferedInputStream(fis);
- isr = new InputStreamReader(bis);
- StringBuffer sb = new StringBuffer();
-
- char[] buf = new char[4096];
-
- while(isr.ready()) {
- isr.read(buf);
- sb.append(buf);
- }
-
- result.addChild("#", sb.toString());
-
+ result.addChild("#", FileUtil.readUTF(override));
} catch (IOException e) {
Logger.error(this, "Got an IOE: " + e.getMessage(), e);
- } finally {
- try {
- if(isr != null) isr.close();
- if(bis != null) bis.close();
- if(fis != null) fis.close();
- } catch (IOException e) {}
}
+
return result;
}
}
Modified: trunk/freenet/src/freenet/l10n/L10n.java
===================================================================
--- trunk/freenet/src/freenet/l10n/L10n.java 2007-04-24 18:04:44 UTC (rev
12927)
+++ trunk/freenet/src/freenet/l10n/L10n.java 2007-04-24 20:30:18 UTC (rev
12928)
@@ -129,7 +129,8 @@
fos = new FileOutputStream(new File(L10n.PREFIX +
L10n.getSelectedLanguage() + L10n.OVERRIDE_SUFFIX));
bos = new BufferedOutputStream(fos);
-
bos.write(L10n.translationOverride.toOrderedString().getBytes("UTF-8"));
+
bos.write(L10n.translationOverride.toOrderedString().getBytes("UTF-8"));
+ bos.flush();
Logger.normal("L10n", "Override file saved
successfully!");
} catch (IOException e) {
Modified: trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
2007-04-24 18:04:44 UTC (rev 12927)
+++ trunk/freenet/src/freenet/node/fcp/TestDDACompleteMessage.java
2007-04-24 20:30:18 UTC (rev 12928)
@@ -3,16 +3,14 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.node.fcp;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
import freenet.node.Node;
import freenet.node.fcp.FCPConnectionHandler.DDACheckJob;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
+import freenet.support.io.FileUtil;
/**
* client -> node: DDARequest { WantRead=true, WantWrite=true, Dir=/tmp/blah }
@@ -57,21 +55,7 @@
File maybeWrittenFile = checkJob.writeFilename;
if (maybeWrittenFile.exists() &&
maybeWrittenFile.isFile() && maybeWrittenFile.canRead()) {
try {
- FileInputStream fis = new
FileInputStream(maybeWrittenFile);
- BufferedInputStream bis = new
BufferedInputStream(fis);
- InputStreamReader isr = new
InputStreamReader(bis);
- StringBuffer sb = new StringBuffer();
-
- char[] buf = new char[1024];
-
- while(isr.ready()) {
- isr.read(buf);
- sb.append(buf);
- }
- isr.close();
- bis.close();
- fis.close();
- isWriteAllowed =
checkJob.writeContent.equals(sb.toString().trim());
+ isWriteAllowed =
checkJob.writeContent.equals(FileUtil.readUTF(maybeWrittenFile).trim());
} catch (IOException e) {
Logger.error(this, "Caught an IOE
trying to read the file (" + maybeWrittenFile + ")! " + e.getMessage());
}
