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

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).

File:

• trunk/autoquest-plugin-mfc/src/main/java/de/ugoe/cs/autoquest/plugin/mfc/MFCLogParser.java (modified) (7 diffs)

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