Changeset 77 for trunk/EventBenchConsole

Timestamp:

06/16/11 15:05:59 (14 years ago)

Author:

sherbold

Message:

+ introduced de.ugoe.cs.eventbench.windows.WindowsEvent?

Location:

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

Files:

• EventGenerator.java (modified) (5 diffs)
• LogParser.java (modified) (4 diffs)
• SequenceSplitter.java (modified) (5 diffs)
• WindowsEvent.java (added)
• commands/CMDparseXML.java (modified) (2 diffs)

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

@@ -17 +17 @@
 import org.jdom.input.SAXBuilder;
 
-import de.ugoe.cs.eventbench.data.Event;
-import de.ugoe.cs.eventbench.data.ReplayableEvent;
 import de.ugoe.cs.eventbench.windows.data.WindowTree;
 import de.ugoe.cs.eventbench.windows.data.WindowTreeNode;
@@ -81 +79 @@
          * </p>
          */
-        private ReplayableEvent<WindowsMessage> currentToken;
+        private WindowsEvent currentToken;
 
         /**
@@ -119 +117 @@
          * <p>
          * Tries to match the rules to the given sequence to generate an
-         * {@link Event}.
+         * {@link WindowsEvent}.
          * </p>
          * <p>
@@ -132 +130 @@
          */
         @SuppressWarnings("unchecked")
-        public Event<WindowsMessage> generateEvent(List<WindowsMessage> sequence) {
+        public WindowsEvent generateEvent(List<WindowsMessage> sequence) {
                 Document rulesDoc = getDocument(rulesFile);
                 Element rulesRoot = rulesDoc.getRootElement();
@@ -144 +142 @@
                         Element currentRule = ruleElements.get(ruleIndex);
                         currentRuleName = currentRule.getAttributeValue("name");
-                        currentToken = new ReplayableEvent<WindowsMessage>(currentRuleName);
+                        currentToken = new WindowsEvent(currentRuleName);
                         currentToken.setDecorator(MFCReplayDecorator.getInstance());
                         isMatch = true;

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

@@ -23 +23 @@
 import org.xml.sax.helpers.DefaultHandler;
 
-import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.windows.data.WindowTree;
 import de.ugoe.cs.eventbench.windows.data.WindowsMessage;
@@ -37 +36 @@
         private SequenceSplitter sequenceSplitter;
         
-        private List<List<Event<WindowsMessage>>> sequences;
+        private List<List<WindowsEvent>> sequences;
         
         private SortedMap<Integer, Integer> typeCounter;
@@ -49 +48 @@
         public LogParser(boolean countMessageOccurences) {
                 sequenceSplitter = new SequenceSplitter();
-                sequences = new LinkedList<List<Event<WindowsMessage>>>();
+                sequences = new LinkedList<List<WindowsEvent>>();
                 currentHandler = null;
                 this.countMessageOccurences = countMessageOccurences;
@@ -58 +57 @@
         }
         
-        public List<List<Event<WindowsMessage>>> getSequences() {
+        public List<List<WindowsEvent>> getSequences() {
                 return sequences;
         }

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

@@ -4 +4 @@
 import java.util.List;
 
-import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.windows.data.WindowsMessage;
 import de.ugoe.cs.util.console.Console;
@@ -18 +17 @@
         private EventGenerator tokenGenerator;
         
-        private List<Event<WindowsMessage>> actionSequence;
+        private List<WindowsEvent> actionSequence;
         
         public SequenceSplitter() {
@@ -25 +24 @@
                 initMessages = true;
                 tokenGenerator = new EventGenerator();
-                actionSequence = new LinkedList<Event<WindowsMessage>>();
+                actionSequence = new LinkedList<WindowsEvent>();
         }
         
@@ -31 +30 @@
                 if( startOfSequence(msg) ) {
                         if( !initMessages ) {
-                                Event<WindowsMessage> currentAction = tokenGenerator.generateEvent(currentSequence);
+                                WindowsEvent currentAction = tokenGenerator.generateEvent(currentSequence);
                                 if( currentAction!=null ) {
                                         actionSequence.add(currentAction);
@@ -51 +50 @@
         }
         
-        public List<Event<WindowsMessage>> getSequence() {
+        public List<WindowsEvent> getSequence() {
                 return actionSequence;
         }
         
         public void endSession() {
-                Event<WindowsMessage> currentAction = tokenGenerator.generateEvent(currentSequence);
+                WindowsEvent currentAction = tokenGenerator.generateEvent(currentSequence);
                 if( currentAction!=null ) {
                         actionSequence.add(currentAction);

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java

@@ -4 +4 @@
 import java.util.List;
 
-import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
 import de.ugoe.cs.eventbench.windows.LogParser;
-import de.ugoe.cs.eventbench.windows.data.WindowsMessage;
+import de.ugoe.cs.eventbench.windows.WindowsEvent;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -35 +34 @@
                 parser.parseFile(filename);
                 
-                List<List<Event<WindowsMessage>>> sequences = parser.getSequences();
+                List<List<WindowsEvent>> sequences = parser.getSequences();
                 
                 GlobalDataContainer.getInstance().addData("sequences", sequences);