Changeset 1006 for trunk/autoquest-plugin-mfc/src/main

Timestamp:

12/05/12 12:54:01 (12 years ago)

Author:

fglaser

Message:

• MFCLogParser and its components updated to work with generalized GUIElementTree
• NOTE THAT GUIElementTree ADDS ALL COMPONENTS TO GUIModel NOT ONLY THE USED ONES (compare MFCWindowTree).
• guimapping-MFC-Dummy.txt added to cover newly discovered classes (needs to be updated).

Location:

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc

Files:

• EventGenerator.java (modified) (5 diffs)
• HandlerCreate.java (modified) (3 diffs)
• HandlerDestroy.java (modified) (4 diffs)
• HandlerSetText.java (modified) (4 diffs)
• MFCLogParser.java (modified) (7 diffs)
• MessageHandler.java (modified) (5 diffs)
• SequenceSplitter.java (modified) (2 diffs)
• guimodel/MFCGUIElementSpec.java (modified) (2 diffs)

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/EventGenerator.java

@@ -34 +34 @@
 import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.eventcore.IEventType;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 import de.ugoe.cs.autoquest.plugin.mfc.EventGenerationRule.Term;
 import de.ugoe.cs.autoquest.plugin.mfc.eventcore.MFCEventTypeFactory;
@@ -40 +41 @@
 import de.ugoe.cs.autoquest.plugin.mfc.eventcore.WindowsMessageType;
 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElement;
-import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree;
 import de.ugoe.cs.util.console.Console;
 
@@ -121 +121 @@
     /**
      * <p>
-     * reference to the window tree created during parsing
-     * </p>
-     */
-    private MFCWindowTree windowTree;
+     * reference to the gui element tree created during parsing
+     * </p>
+     */
+    private GUIElementTree guiElementTree;
 
     /**
@@ -131 +131 @@
      * </p>
      */
-    public EventGenerator(MFCWindowTree windowTree) {
+    public EventGenerator(GUIElementTree guiElementTree) {
         rulesFile = "data/rules.xml";
-        this.windowTree = windowTree;
+        this.guiElementTree = guiElementTree;
     }
 
@@ -477 +477 @@
                 String storeParam = resolveElement.getStoreParameterName();
                 long paramHwnd = (Long) currentMessage.getParameter(param);
-                MFCGUIElement guiElement = windowTree.find(paramHwnd);
+                MFCGUIElement guiElement = (MFCGUIElement) guiElementTree.find(paramHwnd);
                 if (guiElement != null) {
                     currentMessage.addParameter(storeParam, "" + guiElement.toXML());

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerCreate.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.mfc;
 
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
+import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec;
+import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElementSpec;
 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree;
 
@@ -32 +35 @@
      * </p>
      * 
-     * @param windowTree the tree of GUI element specifications to be created and adapted during
+     * @param guiElementTree the tree of GUI element specifications to be created and adapted during
      *                   parsing
      */
-    public HandlerCreate(MFCWindowTree windowTree) {
-        super(windowTree);
+    public HandlerCreate(GUIElementTree guiElementTree) {
+        super(guiElementTree);
     }
 
@@ -89 +92 @@
     public void onEndElement() {
         if (hwnd != 0) {
-            super.getWindowTree().add(parentHwnd, hwnd, windowName, resourceId, className, isModal);
+                IGUIElementSpec spec = new MFCGUIElementSpec(hwnd, windowName, resourceId, className, isModal);
+            super.getGUIElementTree().add(hwnd, parentHwnd, spec);
         }
     }

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerDestroy.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.mfc;
 
-import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 
 /**
@@ -23 +23 @@
  * 
  * @author Steffen Herbold
+ * @author Fabian Glaser
  * @version 1.0
  */
@@ -32 +33 @@
      * </p>
      * 
-     * @param windowTree
+     * @param guiElementTree
      *            the tree of GUI element specifications to be created and adapted during parsing
      */
-    public HandlerDestroy(MFCWindowTree windowTree) {
-        super(windowTree);
+    public HandlerDestroy(GUIElementTree guiElementTree) {
+        super(guiElementTree);
     }
 
@@ -54 +55 @@
     public void onEndElement() {
         if (hwnd != 0) {
-            super.getWindowTree().remove(hwnd);
+            super.getGUIElementTree().remove(hwnd);
         }
     }

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/HandlerSetText.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.mfc;
 
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
+import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElement;
+import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElementSpec;
 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree;
 
@@ -23 +26 @@
  * 
  * @author Steffen Herbold
+ * @author Fabian Glaser
  * @version 1.0
  */
@@ -32 +36 @@
      * </p>
      * 
-     * @param windowTree
+     * @param guiElementTree
      *            the tree of GUI element specifications to be created and adapted during parsing
      */
-    public HandlerSetText(MFCWindowTree windowTree) {
-        super(windowTree);
+    public HandlerSetText(GUIElementTree guiElementTree) {
+        super(guiElementTree);
     }
 
@@ -61 +65 @@
     public void onEndElement() {
         if (hwnd != 0) {
-            super.getWindowTree().setName(hwnd, windowName);
+                MFCGUIElement element = (MFCGUIElement) super.getGUIElementTree().find(hwnd);
+                MFCGUIElementSpec spec = (MFCGUIElementSpec) element.getSpecification();
+            spec.setName(windowName);
         }
     }

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/MFCLogParser.java

@@ -41 +41 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.autoquest.plugin.mfc.eventcore.WindowsMessage;
 import de.ugoe.cs.autoquest.plugin.mfc.eventcore.WindowsMessageType;
 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElement;
-import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree;
 import de.ugoe.cs.util.StringTools;
 import de.ugoe.cs.util.console.Console;
@@ -58 +58 @@
  * 
  * @author Steffen Herbold
+ * @author Fabian Glaser
  * @version 1.0
  */
@@ -72 +73 @@
     /**
      * <p>
-     * internal handle to the current window tree
-     * </p>
-     */
-    private MFCWindowTree currentWindowTree;
+     * internal handle to the gui element tree
+     * </p>
+     */
+    private GUIElementTree guiElementTree;
 
     /**
@@ -251 +252 @@
      */
     public GUIModel getGuiModel() {
-        if( currentWindowTree!=null ) {
-            return currentWindowTree.getGUIModel();
+        if( guiElementTree!=null ) {
+            return guiElementTree.getGUIModel();
         } else {
             return null;
@@ -272 +273 @@
             // in some logs, the session end may be marked in between the log. This is because
             // of thread problems. So instead of creating a new GUI model, preserve it.
-            if (currentWindowTree == null) {
-                currentWindowTree = new MFCWindowTree();
-            }
-            sequenceSplitter = new SequenceSplitter(currentWindowTree);
+            if (guiElementTree == null) {
+                guiElementTree = new GUIElementTree();
+            }
+            sequenceSplitter = new SequenceSplitter(guiElementTree);
         }
         else if (qName.equals("msg")) {
@@ -291 +292 @@
 
             if (currentMessageType == WindowsMessageType.WM_CREATE) {
-                currentHandler = new HandlerCreate(currentWindowTree);
+                currentHandler = new HandlerCreate(guiElementTree);
                 currentHandler.onStartElement();
             }
             else if (currentMessageType == WindowsMessageType.WM_DESTROY) {
-                currentHandler = new HandlerDestroy(currentWindowTree);
+                currentHandler = new HandlerDestroy(guiElementTree);
                 currentHandler.onStartElement();
             }
             else if (currentMessageType == WindowsMessageType.WM_SETTEXT) {
-                currentHandler = new HandlerSetText(currentWindowTree);
+                currentHandler = new HandlerSetText(guiElementTree);
                 currentHandler.onStartElement();
             }
@@ -343 +344 @@
                 try {
                     long hwnd = (Long) currentMessageParameters.get("window.hwnd");
-                    MFCGUIElement target = currentWindowTree.find(hwnd);
+                    MFCGUIElement target = (MFCGUIElement) guiElementTree.find(hwnd);
                     
                     WindowsMessage message = new WindowsMessage

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/MessageHandler.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.plugin.mfc;
 
-import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 
 /**
@@ -25 +25 @@
  * 
  * @author Steffen Herbold
+ * @author Fabian Glaser
  * @version 1.0
  */
@@ -35 +36 @@
      * </p>
      */
-    private MFCWindowTree windowTree;
+    private GUIElementTree guiElementTree;
 
     /**
@@ -42 +43 @@
      * </p>
      * 
-     * @param windowTree the tree of GUI element specifications to be created and adapted during
+     * @param guiElementTree the tree of GUI element specifications to be created and adapted during
      *                   parsing
      */
-    protected MessageHandler(MFCWindowTree windowTree) {
-        this.windowTree = windowTree;
+    protected MessageHandler(GUIElementTree guiElementTree) {
+        this.guiElementTree = guiElementTree;
     }
 
@@ -76 +77 @@
 
     /**
-     * @return the window tree created and adapted during parsing
+     * @return the gui element tree created and adapted during parsing
      */
-    protected MFCWindowTree getWindowTree() {
-        return windowTree;
+    protected GUIElementTree getGUIElementTree() {
+        return guiElementTree;
     }
     

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/SequenceSplitter.java

@@ -20 +20 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 import de.ugoe.cs.autoquest.plugin.mfc.eventcore.WindowsMessage;
 import de.ugoe.cs.autoquest.plugin.mfc.eventcore.WindowsMessageType;
-import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree;
 import de.ugoe.cs.util.console.Console;
 
@@ -85 +85 @@
      * </p>
      */
-    public SequenceSplitter(MFCWindowTree windowTree) {
+    public SequenceSplitter(GUIElementTree guiElementTree) {
         currentSequence = new LinkedList<WindowsMessage>();
         openDowns = 0;
         initMessages = true;
-        tokenGenerator = new EventGenerator(windowTree);
+        tokenGenerator = new EventGenerator(guiElementTree);
         actionSequence = new LinkedList<Event>();
         prevMsg = null;

trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/guimodel/MFCGUIElementSpec.java

@@ -94 +94 @@
     /**
      * <p>
-     * Creates a new WindowTreeNode.
-     * </p>
-     * <p>
-     * The constructor is protected WindowTreeNode may only be created from the MFCWindowTree.
+     * Creates a new MFCGUIElementSpec.
      * </p>
      * 
      * @param hwnd
      *            hwnd of the window
-     * @param parent
-     *            reference to the parent's WindowTreeNode
      * @param name
      *            name of the window
@@ -113 +108 @@
      *            modality of the window
      */
-    protected MFCGUIElementSpec(long hwnd, String name, int resourceId, String type, boolean isModal)
+    public MFCGUIElementSpec(long hwnd, String name, int resourceId, String type, boolean isModal)
     {
         this.hwnd = hwnd;