Changeset 309 for trunk/EventBenchConsole/src/de

Timestamp:

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

Author:

sherbold

Message:

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

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench

Files:

• jfc/commands/CMDpreprocessJFC.java (modified) (5 diffs)
• swt/CommandHistoryDialog.java (modified) (1 diff)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDpreprocessJFC.java

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
 import java.security.InvalidParameterException;
 import java.util.List;
@@ -42 +45 @@
 
                 File file = new File(source);
-                FileReader fileReader;
+                InputStreamReader reader;
                 try {
-                        fileReader = new FileReader(file);
+                        FileInputStream fis = new FileInputStream(file);
+                        reader = new InputStreamReader(fis, "UTF-16");
                 } catch (FileNotFoundException e) {
+                        Console.printerrln(e.getMessage());
+                        return;
+                } catch (UnsupportedEncodingException e) {
                         Console.printerrln(e.getMessage());
                         return;
@@ -51 +58 @@
                 char[] buffer = new char[(int) file.length()];
                 try {
-                        fileReader.read(buffer);
-                        fileReader.close();
+                        reader.read(buffer);
+                        reader.close();
                 } catch (IOException e) {
                         Console.printerrln(e.getMessage());
@@ -60 +67 @@
                 String content = new String(buffer).trim();
 
-                FileWriter writer;
+                OutputStreamWriter writer;
                 try {
-                        writer = new FileWriter(target);
+                        FileOutputStream fos = new FileOutputStream(target);
+                        writer = new OutputStreamWriter(fos, "UTF-16");
                 } catch (IOException e) {
                         Console.printerrln(e.getMessage());
@@ -72 +80 @@
                                 writer.write("</sessions>");
                         }
+                        writer.close();
                 } catch (IOException e) {
                         Console.printerrln(e.getMessage());

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/CommandHistoryDialog.java

@@ -137 +137 @@
                                         OutputStreamWriter writer = null;
                                         try {
-                                                writer = new OutputStreamWriter(new FileOutputStream(file));
+                                                writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
                                         } catch (IOException e) {
                                                 Console.printerrln("Unable to open file for writing (read-only file):"