Changeset 1857 for trunk/autoquest-plugin-jfc

Timestamp:

01/09/15 16:04:45 (10 years ago)

Author:

sherbold

Message:

• added command parseJFCDirwithJacaretoIndicies
• modified command generateJacaretoReplay such that it now can handle multiple sequences at once
• added new GUI mappings

Location:

trunk/autoquest-plugin-jfc

Files:

• data/guimappings/guimapping-swing.txt (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDgenerateJacaretoReplay.java (modified) (5 diffs)
• src/main/java/de/ugoe/cs/autoquest/plugin/jfc/commands/CMDparseJFCDirwithJacaretoIndices.java (added)

trunk/autoquest-plugin-jfc/data/guimappings/guimapping-swing.txt

@@ -41 +41 @@
 javax.swing.JWindow = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCFrame
 javax.swing.Popup$HeavyWeightWindow = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
+javax.swing.PopupFactory$MediumWeightPopup$MediumWeightComponent = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCDialog
 javax.swing.plaf.basic.BasicComboBoxEditor$BorderlessTextField = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCTextField
 javax.swing.plaf.basic.BasicComboPopup$1 = de.ugoe.cs.autoquest.plugin.jfc.guimodel.JFCMenu

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

@@ -342 +342 @@
         StructureNode.nextRef = 0;
 
-        writeJacaretoXML(sequences, filename, classpath, basepath, classpathext);
+        int index = 1;
+        for( List<Event> sequence : sequences ) {
+            writeJacaretoXML(sequence, filename+"_"+index, classpath, basepath, classpathext);
+            index++;
+        }
     }
 
@@ -450 +454 @@
      * 
      */
-    private void writeJacaretoEvents(BufferedWriter writer, Collection<List<Event>> sequences)
+    private void writeJacaretoEvents(BufferedWriter writer, List<Event> sequence)
         throws IOException
     {
@@ -461 +465 @@
         structure.addRecordable(); // ApplicationStarter
 
-        for (List<Event> sequence : sequences) {
-            for (Iterator<Event> eventIter = sequence.iterator(); eventIter.hasNext();) {
-                Event event = eventIter.next();
-
-                if (event.getType() instanceof MouseButtonDown) {
-                    handleMouseButtonDown(writer, event);
+        for (Iterator<Event> eventIter = sequence.iterator(); eventIter.hasNext();) {
+            Event event = eventIter.next();
+
+            if (event.getType() instanceof MouseButtonDown) {
+                handleMouseButtonDown(writer, event);
+            }
+            else if (event.getType() instanceof MouseButtonUp) {
+                handleMouseButtonUp(writer, event);
+            }
+            else if (event.getType() instanceof MouseDoubleClick) {
+                handleMouseDoubleClick(writer, event);
+            }
+            else if (event.getType() instanceof MouseClick) {
+                if (event.getTarget() instanceof JFCMenuButton) {
+                    // if a menu file was provided, use the improved event
+                    // generation
+                    if (menuList != null) {
+                        if (menuElements.isEmpty()) {
+                            // parse the menu structure
+                            GUIModel model = ((IGUIElement) event.getTarget()).getGUIModel();
+                            getMenuElements(model.getRootElements(), model);
+                        }
+
+                        Stack<JFCGUIElement> hierarchy =
+                            findMenuItemHierarchy((JFCGUIElement) event.getTarget());
+
+                        while (!hierarchy.empty()) {
+                            generateFullClick(writer, event, hierarchy.pop());
+                        }
+                        continue;
+                    }
                 }
-                else if (event.getType() instanceof MouseButtonUp) {
-                    handleMouseButtonUp(writer, event);
-                }
-                else if (event.getType() instanceof MouseDoubleClick) {
-                    handleMouseDoubleClick(writer, event);
-                }
-                else if (event.getType() instanceof MouseClick) {
-                    if (event.getTarget() instanceof JFCMenuButton) {
-                        // if a menu file was provided, use the improved event
-                        // generation
-                        if (menuList != null) {
-                            if (menuElements.isEmpty()) {
-                                // parse the menu structure
-                                GUIModel model = ((IGUIElement) event.getTarget()).getGUIModel();
-                                getMenuElements(model.getRootElements(), model);
-                            }
-
-                            Stack<JFCGUIElement> hierarchy =
-                                findMenuItemHierarchy((JFCGUIElement) event.getTarget());
-
-                            while (!hierarchy.empty()) {
-                                generateFullClick(writer, event, hierarchy.pop());
-                            }
-                            continue;
-                        }
-                    }
-
-                    handleMouseClick(writer, event);
-                }
-                else if (event.getType() instanceof KeyboardFocusChange) {
-                    handleKeyboardFocusChange(writer, event);
-                }
-                else if (event.getType() instanceof MouseDragAndDrop) {
-                    handleMouseDragAndDrop(writer, event);
-                }
-                else if (event.getType() instanceof KeyPressed) {
-                    handleKeyPressed(writer, event);
-                }
-                else if (event.getType() instanceof KeyReleased) {
-                    handleKeyReleased(writer, event);
-                }
-                else if (event.getType() instanceof TextInput) {
-                    handleTextInput(writer, event);
-                }
-                else {
-                    Console.traceln(Level.WARNING, "No handler for event \"" + event +
-                        "\". Skipped.");
-                }
+
+                handleMouseClick(writer, event);
+            }
+            else if (event.getType() instanceof KeyboardFocusChange) {
+                handleKeyboardFocusChange(writer, event);
+            }
+            else if (event.getType() instanceof MouseDragAndDrop) {
+                handleMouseDragAndDrop(writer, event);
+            }
+            else if (event.getType() instanceof KeyPressed) {
+                handleKeyPressed(writer, event);
+            }
+            else if (event.getType() instanceof KeyReleased) {
+                handleKeyReleased(writer, event);
+            }
+            else if (event.getType() instanceof TextInput) {
+                handleTextInput(writer, event);
+            }
+            else {
+                Console.traceln(Level.WARNING, "No handler for event \"" + event +
+                    "\". Skipped.");
             }
         }
@@ -737 +739 @@
     }
 
-    private void writeJacaretoXML(Collection<List<Event>> sequences,
+    private void writeJacaretoXML(List<Event> sequence,
                                   String filename,
                                   String classpath,
@@ -747 +749 @@
         try {
             writeJacaretoHead(writer, classpath, basepath, classpathext);
-            writeJacaretoEvents(writer, sequences);
+            writeJacaretoEvents(writer, sequence);
             writeJacaretoTail(writer);
             writeLine(writer, "</JacaretoStructure>");