Index: /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java
===================================================================
--- /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java	(revision 1713)
+++ /trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java	(revision 1714)
@@ -46,5 +46,5 @@
 
     public StructureNode(String type) {
-        content = "<StructureElement class=\"jacareto.struct." + type + "\">";
+        setContent(type);
         children = new ArrayList<StructureNode>();
     }
@@ -53,4 +53,8 @@
         content = "<Recordable ref=\"" + (nextRef++) + "\" />";
         children = new ArrayList<StructureNode>();
+    }
+
+    public void setContent(String type) {
+        content = "<StructureElement class=\"jacareto.struct." + type + "\">";
     }
 
@@ -224,6 +228,11 @@
                 Event event = eventIter.next();
 
+                System.out.println(event.getType());
+                System.out.println(event.getTarget());
+                System.out.println("---");
+
                 if (event.getType() instanceof MouseButtonDown) {
                     lastKeySequenceEvent = null;
+                    checkIfMouseDragged();
 
                     lastMouseClickEvent = new StructureNode("MouseClick");
@@ -255,4 +264,5 @@
 
                         lastFocusChangeEvent = null;
+                        lastMouseClickEvent = null;
                     }
                 }
@@ -263,4 +273,6 @@
                 }
                 else if (event.getType() instanceof KeyPressed) {
+                    checkIfMouseDragged();
+
                     if (lastKeySequenceEvent == null) {
                         lastKeySequenceEvent = structure.add("KeySequence");
@@ -270,7 +282,18 @@
                 }
                 else if (event.getType() instanceof KeyReleased) {
+                    checkIfMouseDragged();
+
                     writeKeyEvent(writer, event, 402);
                 }
             }
+        }
+    }
+
+    private void checkIfMouseDragged() {
+        if (lastMouseClickEvent != null) {
+            // this was not really a click, just a drag
+            lastMouseClickEvent.setContent("MouseDrag");
+            structure.children.add(lastMouseClickEvent);
+            lastMouseClickEvent = null;
         }
     }