Changeset 44 for trunk

Timestamp:

05/17/11 15:40:16 (14 years ago)

Author:

sherbold

Message:

• fixed bug regarding encoding of XML files

Location:

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

Files:

• LogPreprocessor.java (modified) (4 diffs)
• ReplayGenerator.java (modified) (6 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/LogPreprocessor.java

@@ -3 +3 @@
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 
 import org.apache.commons.codec.binary.Base64;
@@ -28 +29 @@
         
         public void convertToXml(String source, String target) throws IOException, FileNotFoundException {
-                FileWriter targetFile = new FileWriter(target);
-                targetFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + StringTools.ENDLINE);
+                OutputStreamWriter targetFile = new OutputStreamWriter(new FileOutputStream(target), "UTF-16");
+                targetFile.write("<?xml version=\"1.0\" encoding=\"UTF-16\"?>" + StringTools.ENDLINE);
                 targetFile.write("<log>" + StringTools.ENDLINE);
                 processFile(source, targetFile);
@@ -41 +42 @@
         
         public void convertDirToXml(String path, String target) throws IOException, FileNotFoundException {
-                FileWriter targetFile = new FileWriter(target);
-                targetFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + StringTools.ENDLINE);
+                OutputStreamWriter targetFile = new OutputStreamWriter(new FileOutputStream(target), "UTF-16");
+                targetFile.write("<?xml version=\"1.0\" encoding=\"UTF-16\"?>" + StringTools.ENDLINE);
                 targetFile.write("<log>" + StringTools.ENDLINE);
                 File folder = new File(path);
@@ -62 +63 @@
         }
 
-        private void processFile(String source, FileWriter targetFile)
+        private void processFile(String source, OutputStreamWriter targetFile)
                         throws FileNotFoundException, IOException {
                 File f = new File(source);

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/ReplayGenerator.java

@@ -2 +2 @@
 
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.List;
 
@@ -14 +15 @@
                 
         public void createLogfileMultipleSessions(List<List<ReplayableEvent<?>>> sequences, String filename) {
-                FileWriter writer = openReplayFile(filename);
+                OutputStreamWriter writer = openReplayFile(filename);
                 if( writer!=null ) {            
                         try {
-                                writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + StringTools.ENDLINE);
+                                writer.write("<?xml version=\"1.0\" encoding=\"UTF-16\"?>" + StringTools.ENDLINE);
                                 writer.write("<log>" + StringTools.ENDLINE);
 
@@ -33 +34 @@
         
         public void createLogfileSingleSession(List<ReplayableEvent<?>> actions, String filename) {
-                FileWriter writer = openReplayFile(filename);
+                OutputStreamWriter writer = openReplayFile(filename);
                 if( writer!=null ) {            
                         try {
-                                writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + StringTools.ENDLINE);
+                                writer.write("<?xml version=\"1.0\" encoding=\"UTF-16\"?>" + StringTools.ENDLINE);
                                 writer.write("<log>" + StringTools.ENDLINE);
         
@@ -49 +50 @@
         }
 
-        private FileWriter openReplayFile(String filename) {
+        private OutputStreamWriter openReplayFile(String filename) {
                 File file = new File(filename);
                 boolean fileCreated;
@@ -63 +64 @@
                         Console.printStacktrace(e);
                 }
-                FileWriter writer = null;
+                OutputStreamWriter writer = null;
                 try {
-                        writer = new FileWriter(file);
+                        writer = new OutputStreamWriter(new FileOutputStream(file), "UTF-16");
                 } catch (IOException e) {
                         Console.printerrln("Unable to open file for writing (read-only file):" + filename);
@@ -73 +74 @@
         }
         
-        private void writeSession(List<ReplayableEvent<?>> actions, FileWriter writer)
+        private void writeSession(List<ReplayableEvent<?>> actions, OutputStreamWriter writer)
                         throws IOException {
                 writer.write(" <session>" + StringTools.ENDLINE);