Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AbstractInsertEventComposite.java
===================================================================
--- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AbstractInsertEventComposite.java	(revision 526)
+++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/AbstractInsertEventComposite.java	(revision 548)
@@ -16,5 +16,5 @@
 	}
 	
-	public abstract Event<?> getEvent(); 
+	public abstract Event getEvent(); 
 
 }
Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/EditSequenceDialog.java
===================================================================
--- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/EditSequenceDialog.java	(revision 526)
+++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/EditSequenceDialog.java	(revision 548)
@@ -28,5 +28,5 @@
 	private TableColumn tblclmnEventTarget;
 
-	private java.util.List<Event<?>> sequence;
+	private java.util.List<Event> sequence;
 	private SortedSet<String> targets;
 
@@ -46,5 +46,5 @@
 	 * Open the dialog.
 	 */
-	public void open(java.util.List<Event<?>> sequence) {
+	public void open(java.util.List<Event> sequence) {
 		this.sequence = sequence;
 		createContents();
@@ -165,5 +165,5 @@
 	private void updateTableContents() {
 		table.removeAll();
-		for (Event<?> event : sequence) {
+		for (Event event : sequence) {
 			TableItem tableItem = new TableItem(table, SWT.NONE);
 			String target = event.getTarget();
@@ -173,5 +173,5 @@
 				target = target.replace("].", "].\n");
 			}
-			tableItem.setText(new String[] { event.getType(), target });
+			tableItem.setText(new String[] { event.getType().toString(), target });
 		}
 		for (int i = 0; i < table.getColumnCount(); i++) {
@@ -183,5 +183,5 @@
 		InsertAssertionDialog insertDialog = new InsertAssertionDialog(shell,
 				SWT.NONE, targets);
-		Event<?> event = insertDialog.open();
+		Event event = insertDialog.open();
 		if (event != null) {
 			sequence.add(position, event);
Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertAssertionDialog.java
===================================================================
--- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertAssertionDialog.java	(revision 526)
+++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertAssertionDialog.java	(revision 548)
@@ -21,5 +21,5 @@
 public class InsertAssertionDialog extends Dialog {
 
-	protected Event<?> result;
+	protected Event result;
 	protected Shell shell;
 	
@@ -44,5 +44,5 @@
 	 * @return the result
 	 */
-	public Event<?> open() {
+	public Event open() {
 		result = null;
 		insertEventComposites = new ArrayList<AbstractInsertEventComposite>();
Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertFileEquals.java
===================================================================
--- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertFileEquals.java	(revision 526)
+++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertFileEquals.java	(revision 548)
@@ -12,5 +12,5 @@
 import org.eclipse.swt.widgets.Button;
 
-import de.ugoe.cs.quest.assertions.AssertEvent;
+import de.ugoe.cs.quest.assertions.FileEqualsAssertEvent;
 import de.ugoe.cs.quest.assertions.FileEqualsReplay;
 import de.ugoe.cs.quest.eventcore.Event;
@@ -74,8 +74,8 @@
 
 	@Override
-	public Event<?> getEvent() {
+	public Event getEvent() {
 		FileEqualsReplay replay = new FileEqualsReplay(expectedText.getText(), actualText.getText());
-		AssertEvent<FileEqualsReplay> event = new AssertEvent<FileEqualsReplay>("FileEqualsAssertion");
-		event.addReplayEvent(replay);
+		Event event = new Event(new FileEqualsAssertEvent());
+		event.addReplayable(replay);
 		return event;
 	}
Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertTextEquals.java
===================================================================
--- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertTextEquals.java	(revision 526)
+++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/InsertTextEquals.java	(revision 548)
@@ -14,6 +14,8 @@
 
 import de.ugoe.cs.quest.assertions.AssertEvent;
+import de.ugoe.cs.quest.assertions.TextEqualsAssertEventType;
 import de.ugoe.cs.quest.assertions.TextEqualsReplay;
 import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.eventcore.IEventTarget;
 import de.ugoe.cs.util.ArrayTools;
 
@@ -98,10 +100,10 @@
 
 	@Override
-	public Event<?> getEvent() {		
-		String target = targetText.getText();
+	public Event getEvent() {		
+		IEventTarget target = targetText.getText();
 		TextEqualsReplay replay = new TextEqualsReplay(expectedText.getText(), target);
-		AssertEvent<TextEqualsReplay> event = new AssertEvent<TextEqualsReplay>("TextEqualsAssertion");
+		Event event = new Event(new TextEqualsAssertEventType());
 		event.setTarget(target);
-		event.addReplayEvent(replay);
+		event.addReplayable(replay);
 		return event;
 	}
Index: trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java
===================================================================
--- trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java	(revision 526)
+++ trunk/quest-ui-swt/src/main/java/de/ugoe/cs/quest/ui/swt/SequencesDialog.java	(revision 548)
@@ -27,5 +27,5 @@
 	
 	private List sequenceList;
-	private Collection<java.util.List<Event<?>>> sequences;
+	private Collection<java.util.List<Event>> sequences;
 	private SortedSet<String> targets;
 	
@@ -85,6 +85,6 @@
 					EditSequenceDialog editSequenceDialog = new EditSequenceDialog(shell, SWT.NONE, targets);
 					int counter = 0;
-					java.util.List<Event<?>> selectedSequence = null;
-					for( java.util.List<Event<?>> sequence : sequences ) {
+					java.util.List<Event> selectedSequence = null;
+					for( java.util.List<Event> sequence : sequences ) {
 						if( counter==index ) {
 							selectedSequence = sequence;
@@ -116,8 +116,8 @@
 		Object dataObject = GlobalDataContainer.getInstance().getData(sequencesName);
 		if( SequenceInstanceOf.isCollectionOfSequences(dataObject)) {
-			sequences = (Collection<java.util.List<Event<?>>>) dataObject;
+			sequences = (Collection<java.util.List<Event>>) dataObject;
 			int seqDigits = Integer.toString(sequences.size()).length();
 			int counter = 1;
-			for( java.util.List<Event<?>> sequence : sequences ) {
+			for( java.util.List<Event> sequence : sequences ) {
 				String seqName = "#"+String.format("%0"+seqDigits+"d", counter)+": "+sequence.size();
 				sequenceList.add(seqName);
@@ -135,6 +135,6 @@
 			if( targets==null ) {
 				targets = new TreeSet<String>();
-				for( java.util.List<Event<?>> sequence : sequences ) {
-					for( Event<?> event : sequence ) {
+				for( java.util.List<Event> sequence : sequences ) {
+					for( Event event : sequence ) {
 						String target = event.getTarget();
 						if( target!=null ) {