Changeset 1901 for trunk/autoquest-plugin-jfc/src/main/java

Timestamp:

03/09/15 15:27:58 (10 years ago)

Author:

dmay

Message:

always finish mouse clicks correctly

File:

• trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java (modified) (4 diffs)

trunk/autoquest-plugin-jfc/src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java

@@ -343 +343 @@
         menuElements = new HashMap<>();
         modifiers = createModifierMap();
+
+        int index = 1;
+        for (List<Event> sequence : sequences) {
+            reinit();
+            writeJacaretoXML(sequence, filename + "_" + index, classpath, basepath, classpathext);
+            index++;
+        }
+    }
+
+    private void reinit() {
+        currentFocus = null;
         currentKeyModifiers = 0;
         StructureNode.nextRef = 0;
-
-        int index = 1;
-        for (List<Event> sequence : sequences) {
-            writeJacaretoXML(sequence, filename + "_" + index, classpath, basepath, classpathext);
-            index++;
-        }
+        lastFocusChangeEvent = null;
+        lastItemActionEvent = null;
+        lastKeySequenceEvent = null;
+        lastKeyTypedEvent = null;
+        lastMouseClickEvent = null;
+        lastMouseDownTarget = null;
     }
 
@@ -550 +561 @@
                     structure.children.add(lastMouseClickEvent);
                     structure.children.add(lastItemActionEvent);
+
+                    lastMouseClickEvent = null;
                 }
                 else {
@@ -736 +749 @@
 
         lastMouseDownTarget = null;
+        lastMouseClickEvent = null;
     }
 
@@ -813 +827 @@
         // get rid of the quote symbols in the command because we want to
         // escape the middle part for XML
-        String cmd = target.getName().substring(1, target.getName().length()-1);
-        
+        String cmd = target.getName().substring(1, target.getName().length() - 1);
+
         //@formatter:off
         writeLine(writer,