Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/EventGenerator.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/EventGenerator.java	(revision 76)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/EventGenerator.java	(revision 77)
@@ -17,6 +17,4 @@
 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,5 +79,5 @@
 	 * </p>
 	 */
-	private ReplayableEvent<WindowsMessage> currentToken;
+	private WindowsEvent currentToken;
 
 	/**
@@ -119,5 +117,5 @@
 	 * <p>
 	 * Tries to match the rules to the given sequence to generate an
-	 * {@link Event}.
+	 * {@link WindowsEvent}.
 	 * </p>
 	 * <p>
@@ -132,5 +130,5 @@
 	 */
 	@SuppressWarnings("unchecked")
-	public Event<WindowsMessage> generateEvent(List<WindowsMessage> sequence) {
+	public WindowsEvent generateEvent(List<WindowsMessage> sequence) {
 		Document rulesDoc = getDocument(rulesFile);
 		Element rulesRoot = rulesDoc.getRootElement();
@@ -144,5 +142,5 @@
 			Element currentRule = ruleElements.get(ruleIndex);
 			currentRuleName = currentRule.getAttributeValue("name");
-			currentToken = new ReplayableEvent<WindowsMessage>(currentRuleName);
+			currentToken = new WindowsEvent(currentRuleName);
 			currentToken.setDecorator(MFCReplayDecorator.getInstance());
 			isMatch = true;
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/LogParser.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/LogParser.java	(revision 76)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/LogParser.java	(revision 77)
@@ -23,5 +23,4 @@
 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,5 +36,5 @@
 	private SequenceSplitter sequenceSplitter;
 	
-	private List<List<Event<WindowsMessage>>> sequences;
+	private List<List<WindowsEvent>> sequences;
 	
 	private SortedMap<Integer, Integer> typeCounter;
@@ -49,5 +48,5 @@
 	public LogParser(boolean countMessageOccurences) {
 		sequenceSplitter = new SequenceSplitter();
-		sequences = new LinkedList<List<Event<WindowsMessage>>>();
+		sequences = new LinkedList<List<WindowsEvent>>();
 		currentHandler = null;
 		this.countMessageOccurences = countMessageOccurences;
@@ -58,5 +57,5 @@
 	}
 	
-	public List<List<Event<WindowsMessage>>> getSequences() {
+	public List<List<WindowsEvent>> getSequences() {
 		return sequences;
 	}
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/SequenceSplitter.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/SequenceSplitter.java	(revision 76)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/SequenceSplitter.java	(revision 77)
@@ -4,5 +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,5 +17,5 @@
 	private EventGenerator tokenGenerator;
 	
-	private List<Event<WindowsMessage>> actionSequence;
+	private List<WindowsEvent> actionSequence;
 	
 	public SequenceSplitter() {
@@ -25,5 +24,5 @@
 		initMessages = true;
 		tokenGenerator = new EventGenerator();
-		actionSequence = new LinkedList<Event<WindowsMessage>>();
+		actionSequence = new LinkedList<WindowsEvent>();
 	}
 	
@@ -31,5 +30,5 @@
 		if( startOfSequence(msg) ) {
 			if( !initMessages ) {
-				Event<WindowsMessage> currentAction = tokenGenerator.generateEvent(currentSequence);
+				WindowsEvent currentAction = tokenGenerator.generateEvent(currentSequence);
 				if( currentAction!=null ) {
 					actionSequence.add(currentAction);
@@ -51,10 +50,10 @@
 	}
 	
-	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);
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/WindowsEvent.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/WindowsEvent.java	(revision 77)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/WindowsEvent.java	(revision 77)
@@ -0,0 +1,14 @@
+package de.ugoe.cs.eventbench.windows;
+
+import de.ugoe.cs.eventbench.data.ReplayableEvent;
+import de.ugoe.cs.eventbench.windows.data.WindowsMessage;
+
+
+// convenience class
+public class WindowsEvent extends ReplayableEvent<WindowsMessage> {
+
+	public WindowsEvent(String type) {
+		super(type);
+	}
+
+}
Index: trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java
===================================================================
--- trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java	(revision 76)
+++ trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/windows/commands/CMDparseXML.java	(revision 77)
@@ -4,8 +4,7 @@
 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,5 +34,5 @@
 		parser.parseFile(filename);
 		
-		List<List<Event<WindowsMessage>>> sequences = parser.getSequences();
+		List<List<WindowsEvent>> sequences = parser.getSequences();
 		
 		GlobalDataContainer.getInstance().addData("sequences", sequences);