Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java	(revision 957)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java	(revision 958)
@@ -16,6 +16,8 @@
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 /**
@@ -30,5 +32,5 @@
  *            Can be used to declare that events belong to a specific platform without subclassing.
  */
-public class Event implements Serializable {
+public final class Event implements Serializable {
 
     /**
@@ -57,10 +59,17 @@
      * </p>
      */
-    protected IEventType type;
+    private IEventType type;
 
     /**
      * </p> Target of the event.
      */
-    protected IEventTarget target = null;
+    private IEventTarget target = null;
+    
+    /**
+     * <p>
+     * Map with further parameters of the event, which are not belonging to the type or target.
+     * </p>
+     */
+    private Map<String, String> parameters = new HashMap<String, String>();
 
     /**
@@ -71,5 +80,5 @@
      * </p>
      */
-    protected List<IReplayable> replay = new LinkedList<IReplayable>();
+    private List<IReplayable> replay = new LinkedList<IReplayable>();
 
     /**
@@ -235,5 +244,5 @@
     /**
      * <p>
-     * Adds a {@link List}ist of {@link IReplayable} to the replay sequence.
+     * Adds a {@link List} of {@link IReplayable} to the replay sequence.
      * </p>
      * 
@@ -249,4 +258,52 @@
         replay.addAll(generatedReplaySeq);
     }
+    
+    /**
+     * <p>
+     * Adds a parameter to the event or sets it to a new value. The key must not be null. If a
+     * parameter with the specified key already exists, its value is replaced with the new one.
+     * If the value is null, the parameter with the specified key is removed, if it exists.
+     * </p>
+     * 
+     * @param key   the key of the parameter
+     * @param value the value of the parameter
+     * 
+     * @throws IllegalArgumentException
+     *             if the provided key is null
+     */
+    public void setParameter(String key, String value) {
+        if (key == null) {
+            throw new IllegalArgumentException("key must not be null");
+        }
+        
+        if (value == null) {
+            parameters.remove(key);
+        }
+        else {
+            parameters.put(key, value);
+        }
+    }
+
+    /**
+     * <p>
+     * Returns the event parameter with the specified key if it exists or null if not. The key
+     * must not be null.
+     * </p>
+     * 
+     * @param key the key of the parameter to be returned
+     * 
+     * @return the value of the parameter with the specified key or null if there is no parameter
+     *         with that key
+     * 
+     * @throws IllegalArgumentException
+     *             if the provided key is null
+     */
+    public String getParameter(String key) {
+        if (key == null) {
+            throw new IllegalArgumentException("key must not be null");
+        }
+        
+        return parameters.get(key);
+    }
 
     /**
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenser.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenser.java	(revision 957)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenser.java	(revision 958)
@@ -29,8 +29,4 @@
  * provided sequence and identifies any match of the named event sequence pattern. This match is
  * condensed to the mouse click event.
- * </p>
- * <p>
- * This class does not create events of proper type if the events are not of type {@link Event}
- * but derived from it.
  * </p>
  * TODO correctly identify drag and drop