Changeset 98

Timestamp:

07/04/11 11:59:17 (13 years ago)

Author:

sherbold

Message:

• generateReplayfile now assigns a unique Id to each sequences added to the file

Location:

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

Files:

• ReplayGenerator.java (modified) (3 diffs)
• commands/CMDgenerateReplayfile.java (modified) (2 diffs)
• windows/MFCReplayDecorator.java (modified) (1 diff)

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

@@ -15 +15 @@
         
         private IReplayDecorator decorator = null;
+        
+        int sessionId = 1;
         
         public void createLogfileMultipleSessions(List<List<ReplayableEvent<?>>> sequences, String filename) {
@@ -85 +87 @@
                         throws IOException {
                 if( decorator!=null ) {
-                        writer.write(decorator.getSessionHeader());
+                        writer.write(decorator.getSessionHeader(sessionId));
                 }
                 for( ReplayableEvent<?> currentAction : actions ) {
@@ -96 +98 @@
                 }
                 if( decorator!=null ) {
-                        writer.write(decorator.getSessionFooter());
+                        writer.write(decorator.getSessionFooter(sessionId));
                 }
+                sessionId++;
         }
 

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateReplayfile.java

@@ -27 +27 @@
                 String sequencesName = "sequences";
                 if( parameters.size()==2 ) {
-                        sequencesName = (String) parameters.get(0);
+                        sequencesName = (String) parameters.get(1);
                 }
                 
@@ -36 +36 @@
                         sequences = (List<List<ReplayableEvent<?>>>) dataObject;
                         ReplayGenerator generator = new ReplayGenerator();
-                        if( sequences.size()>0 ) {
-                                if( sequences.get(0).get(0) instanceof Event ) {
-                                        generator.createLogfileMultipleSessions(sequences, filename);
-                                } else {
-                                        Console.printerrln("Loaded data not are not sequences!");
-                                        if( sequencesName.equals("sequences") ) { 
-                                                Console.traceln("Illegal use of \"sequences\" parameter in the GlobalDataContainer.");
-                                                Console.traceln("The parameter should always be of type List<List<Event>>!");
-                                        }
+                        if( sequences!=null && sequences.size()>0 && sequences.get(0).get(0) instanceof Event ) {
+                                generator.createLogfileMultipleSessions(sequences, filename);
+                        } else {
+                                Console.printerrln("Loaded data not are not sequences!");
+                                if( sequencesName.equals("sequences") ) { 
+                                        Console.traceln("Illegal use of \"sequences\" parameter in the GlobalDataContainer.");
+                                        Console.traceln("The parameter should always be of type List<List<Event>>!");
                                 }
                         }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/MFCReplayDecorator.java

@@ -35 +35 @@
 
         @Override
-        public String getSessionHeader() {
-                return " <session>" + StringTools.ENDLINE;
+        public String getSessionHeader(int sessionId) {
+                return " <session id=\""+sessionId+"\">" + StringTools.ENDLINE;
         }
 
         @Override
-        public String getSessionFooter() {
+        public String getSessionFooter(int sessionId) {
                 return " </session>" + StringTools.ENDLINE;
         }