Changeset 310

Timestamp:

12/13/11 16:51:46 (12 years ago)

Author:

sherbold

Message:

• now specifies character encoding of file explicitly instead of assuming default encoding

Location:

trunk/JavaHelperLib/src/de/ugoe/cs/util

Files:

• FileTools.java (modified) (2 diffs)
• console/FileOutputListener.java (modified) (3 diffs)
• console/defaultcommands/CMDexec.java (modified) (2 diffs)

trunk/JavaHelperLib/src/de/ugoe/cs/util/FileTools.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 
 /**
@@ -55 +58 @@
                         boolean carriageReturn) throws IOException, FileNotFoundException {
                 File f = new File(filename);
-                FileReader reader = new FileReader(f);
+                FileInputStream fis = new FileInputStream(f);
+                InputStreamReader reader = new InputStreamReader(fis,
+                                Charset.defaultCharset());
                 char[] buffer = new char[(int) f.length()];
                 reader.read(buffer);

trunk/JavaHelperLib/src/de/ugoe/cs/util/console/FileOutputListener.java

@@ -1 +1 @@
 package de.ugoe.cs.util.console;
 
+import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 
 import de.ugoe.cs.util.console.listener.IOutputListener;
@@ -39 +41 @@
          * </p>
          */
-        FileWriter writer = null;
+        OutputStreamWriter writer = null;
 
         /**
@@ -62 +64 @@
         public void start() {
                 try {
-                        writer = new FileWriter(filename);
+                        FileOutputStream fos = new FileOutputStream(filename);
+                        writer = new OutputStreamWriter(fos, "UTF-8");
                         Console.getInstance().registerOutputListener(this);
                 } catch (IOException e) {

trunk/JavaHelperLib/src/de/ugoe/cs/util/console/defaultcommands/CMDexec.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.security.InvalidParameterException;
 import java.util.List;
@@ -38 +40 @@
                         String[] commands;
                         File f = new File(script);
-                        FileReader reader = new FileReader(f);
+                        FileInputStream fis = new FileInputStream(f);
+                        InputStreamReader reader = new InputStreamReader(fis, "UTF-8");
                         char[] buffer = new char[(int) f.length()];
                         reader.read(buffer);