Changeset 392 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDpreprocessDirJFC.java

Timestamp:

03/08/12 09:21:51 (12 years ago)

Author:

sherbold

Message:

• JFC pre-processors (commands preprocessDirJFC, preprocessJFC) now generate UTF-8 XML files instead of UTF-16.
• de.ugoe.cs.eventbench.jfc.JFCLogParser adapted to read UTF-8 XML files instead of UTF-16.
• parseDirJFC and parseJFC commands now both pre-compute all JFC event target equalities and furthermore compare all loaded events to a dummy event before the precomputation to make sure the events are known by de.ugoe.cs.eventbench.jfc.data.JFCTargetComparator.

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/jfc/commands/CMDpreprocessDirJFC.java (modified) (3 diffs)

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

@@ -17 +17 @@
 /**
  * <p>
- * Command to pre-process files written by EventBench's JFCMonitor located in a directory. The only task
- * of the pre-processing is checking if the session was closed properly, i.e.,
- * if the XML file ends with a {@code </sessions>} tag. If this is not the case,
- * the tag will be appended to the file.
+ * Command to pre-process files written by EventBench's JFCMonitor located in a
+ * directory. The only task of the pre-processing is checking if the session was
+ * closed properly, i.e., if the XML file ends with a {@code </sessions>} tag.
+ * If this is not the case, the tag will be appended to the file.
  * </p>
  * 
@@ -50 +50 @@
                 String absolutPathSource = sourceFolder.getAbsolutePath();
                 File targetFolder = new File(targetPath);
-                if( !targetFolder.isDirectory()) {
+                if (!targetFolder.isDirectory()) {
                         Console.printerrln(targetPath + " is not a directory");
                 }
                 String absolutPathTarget = targetFolder.getAbsolutePath();
-                
-                for(String filename : sourceFolder.list()) {
+
+                for (String filename : sourceFolder.list()) {
                         String source = absolutPathSource + "/" + filename;
                         Console.traceln("Preprocessing file: " + source);
@@ -78 +78 @@
                                 return;
                         }
-        
+
                         String content = new String(buffer).trim();
-        
+
                         int index = filename.lastIndexOf('.');
-                        String target = absolutPathTarget + "/" + filename.substring(0, index) + ".xml"; 
-                        
+                        String target = absolutPathTarget + "/"
+                                        + filename.substring(0, index) + ".xml";
+
                         Console.traceln("   Saving as: " + target);
-                        
+
                         OutputStreamWriter writer;
                         try {
                                 FileOutputStream fos = new FileOutputStream(target);
-                                writer = new OutputStreamWriter(fos, "UTF-16");
+                                writer = new OutputStreamWriter(fos, "UTF-8");
                         } catch (IOException e) {
                                 Console.printerrln(e.getMessage());