Index: trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java
===================================================================
--- trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java	(revision 641)
+++ trunk/quest-plugin-mfc/src/main/java/de/ugoe/cs/quest/plugin/mfc/EventGenerator.java	(revision 644)
@@ -23,5 +23,4 @@
 import de.ugoe.cs.quest.eventcore.IEventType;
 import de.ugoe.cs.quest.plugin.mfc.EventGenerationRule.Term;
-import de.ugoe.cs.quest.plugin.mfc.eventcore.MFCEvent;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.MFCEventTypeFactory;
 import de.ugoe.cs.quest.plugin.mfc.eventcore.ReplayWindowsMessage;
@@ -69,5 +68,5 @@
      * </p>
      */
-    private MFCEvent currentEvent;
+    private Event currentEvent;
 
     /**
@@ -167,5 +166,5 @@
                     (currentRuleName, resolveParameters(currentRule.getEventParameters()));
                 
-                currentEvent = new MFCEvent(currentType, currentTarget, windowTree.getGUIModel());
+                currentEvent = new Event(currentType, currentTarget);
                 
                 for (EventGenerationRule.ReplayMessageSpec replayMessageSpec :
@@ -497,5 +496,5 @@
 
             if ((messageSpec.getLparamHiWord() != null) ||
-                    (messageSpec.getLparamLoWord() != null))
+                (messageSpec.getLparamLoWord() != null))
             {
                 generatedMessage.setLPARAM
@@ -513,5 +512,5 @@
 
             if ((messageSpec.getWparamHiWord() != null) ||
-                    (messageSpec.getWparamLoWord() != null))
+                (messageSpec.getWparamLoWord() != null))
             {
                 generatedMessage.setWPARAM
@@ -732,5 +731,5 @@
         }
         else { // const value
-            int paramValue = getTermValue(messageSpec.getWparam(), int.class);
+            long paramValue = getTermValue(messageSpec.getWparam(), Long.class);
             while (seqIterator.hasNext()) {
                 seqIterator.next().setWPARAM(paramValue);
@@ -906,6 +905,6 @@
                     int index = target.lastIndexOf("<");
                     if (index == 0) {
-                        Console.traceln(Level.WARNING, "Trying to adress parent of top-level window! Replay " +
-                        		"probably invalid!");
+                        Console.traceln(Level.WARNING, "Trying to adress parent of top-level " +
+                                        "window! Replay probably invalid!");
                     }
                     value =  getValueAsType(target.substring(0, index), expectedType);
@@ -1019,4 +1018,7 @@
                     return (T) (Short) Short.parseShort((String) value);
                 }
+                else if (Long.class.equals(expectedType)) {
+                    return (T) (Long) Long.parseLong((String) value);
+                }
             }
             catch (Exception e) {