Changeset 1008

Timestamp:

12/11/12 16:48:01 (12 years ago)

Author:

fglaser

Message:

• autoquest-plugin-mfc subproject refactored to use GUI element naming convention were appropriate
• MFCWindowTree marked as deprecated (one should use generalized GUIElementTree instead)

Location:

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

Files:

• EventGenerator.java (modified) (1 diff)
• HandlerCreate.java (modified) (9 diffs)
• HandlerDestroy.java (modified) (2 diffs)
• HandlerSetText.java (modified) (5 diffs)
• MFCLogParser.java (modified) (2 diffs)
• guimodel/MFCWindowTree.java (modified) (2 diffs)

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

@@ -121 +121 @@
     /**
      * <p>
-     * reference to the gui element tree created during parsing
+     * reference to the GUI element tree created during parsing
      * </p>
      */

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

@@ -18 +18 @@
 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;
 
 /**
  * <p>
- * Message handler for {@code WM_CREATE} messages. The handler maintains the {@link MFCWindowTree}.
+ * Message handler for {@code WM_CREATE} messages. The handler maintains the {@link GUIElementTree}.
  * </p>
  * 
@@ -44 +43 @@
     /**
      * <p>
-     * Name of the created window.
+     * Name of the created GUI element.
      * </p>
      */
-    private String windowName;
+    private String guiElementName;
 
     /**
      * <p>
-     * HWND of the created window.
+     * HWND of the created GUI element.
      * </p>
      */
@@ -58 +57 @@
     /**
      * <p>
-     * HWND of the created window's parent.
+     * HWND of the created GUI elements's parent.
      * </p>
      */
@@ -65 +64 @@
     /**
      * <p>
-     * Resource Id of the created window.
+     * Resource Id of the created element.
      * </p>
      */
@@ -72 +71 @@
     /**
      * <p>
-     * Window class of the created window.
+     * GUI element class of the created element.
      * </p>
      */
@@ -79 +78 @@
     /**
      * <p>
-     * Modality of the created window.
+     * Modality of the created GUI element.
      * </p>
      */
@@ -92 +91 @@
     public void onEndElement() {
         if (hwnd != 0) {
-                IGUIElementSpec spec = new MFCGUIElementSpec(hwnd, windowName, resourceId, className, isModal);
+                IGUIElementSpec spec = new MFCGUIElementSpec(hwnd, guiElementName, resourceId, className, isModal);
             super.getGUIElementTree().add(hwnd, parentHwnd, spec);
         }
@@ -109 +108 @@
         }
         else if (name.equals("window.name")) {
-            windowName = value;
+            guiElementName = value;
         }
         else if (name.equals("window.parent.hwnd")) {
@@ -139 +138 @@
     @Override
     public void onStartElement() {
-        windowName = "";
+        guiElementName = "";
         hwnd = 0;
         parentHwnd = 0;

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

@@ -19 +19 @@
 /**
  * <p>
- * Handler for {@code WM_DESTROY} message. The handler maintains the {@link MFCWindowTree}.
+ * Handler for {@code WM_DESTROY} message. The handler maintains the {@link GUIElementTree}.
  * </p>
  * 
@@ -42 +42 @@
     /**
      * <p>
-     * HWND of the window that is destroyed.
+     * HWND of the GUI element that is destroyed.
      * </p>
      */

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

@@ -18 +18 @@
 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;
 
 /**
  * <p>
- * Handles {@code WM_SETTEXT} messages. Handler maintains the {@link MFCWindowTree}.
+ * Handles {@code WM_SETTEXT} messages. Handler maintains the {@link GUIElementTree}.
  * </p>
  * 
@@ -45 +44 @@
     /**
      * <p>
-     * New name of the window.
+     * New name of the GUI element.
      * </p>
      */
-    private String windowName;
+    private String guiElementName;
 
     /**
      * <p>
-     * HWND of the window.
+     * HWND of the GUI element.
      * </p>
      */
@@ -67 +66 @@
                 MFCGUIElement element = (MFCGUIElement) super.getGUIElementTree().find(hwnd);
                 MFCGUIElementSpec spec = (MFCGUIElementSpec) element.getSpecification();
-            spec.setName(windowName);
+            spec.setName(guiElementName);
         }
     }
@@ -83 +82 @@
         }
         else if (name.equals("window.newText")) {
-            windowName = value;
+            guiElementName = value;
         }
     }
@@ -94 +93 @@
     @Override
     public void onStartElement() {
-        windowName = "";
+        guiElementName = "";
         hwnd = 0;
     }

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

@@ -73 +73 @@
     /**
      * <p>
-     * internal handle to the gui element tree
+     * internal handle to the GUI element tree
      * </p>
      */
@@ -246 +246 @@
     /**
      * <p>
-     * Returns the gui model that is obtained from parsing log files.
+     * Returns the GUI model that is obtained from parsing log files.
      * </p>
      * 

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

@@ -23 +23 @@
 
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory;
+import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException;
@@ -38 +39 @@
  * @author Steffen Herbold
  * @version 1.0
+ * @deprecated This class is replaced by a generalized version. Use {@link #GUIElementTree} instead. 
+ * @see #GUIElementTree
  */
 public class MFCWindowTree {