Changeset 1008 for trunk


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed

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

    r1006 r1008  
    121121    /** 
    122122     * <p> 
    123      * reference to the gui element tree created during parsing 
     123     * reference to the GUI element tree created during parsing 
    124124     * </p> 
    125125     */ 

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

    r1006 r1008  
    1818import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; 
    1919import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElementSpec; 
    20 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree; 
    2120 
    2221/** 
    2322 * <p> 
    24  * Message handler for {@code WM_CREATE} messages. The handler maintains the {@link MFCWindowTree}. 
     23 * Message handler for {@code WM_CREATE} messages. The handler maintains the {@link GUIElementTree}. 
    2524 * </p> 
    2625 *  
    … …  
    4443    /** 
    4544     * <p> 
    46      * Name of the created window. 
     45     * Name of the created GUI element. 
    4746     * </p> 
    4847     */ 
    49     private String windowName; 
     48    private String guiElementName; 
    5049 
    5150    /** 
    5251     * <p> 
    53      * HWND of the created window. 
     52     * HWND of the created GUI element. 
    5453     * </p> 
    5554     */ 
    … …  
    5857    /** 
    5958     * <p> 
    60      * HWND of the created window's parent. 
     59     * HWND of the created GUI elements's parent. 
    6160     * </p> 
    6261     */ 
    … …  
    6564    /** 
    6665     * <p> 
    67      * Resource Id of the created window. 
     66     * Resource Id of the created element. 
    6867     * </p> 
    6968     */ 
    … …  
    7271    /** 
    7372     * <p> 
    74      * Window class of the created window. 
     73     * GUI element class of the created element. 
    7574     * </p> 
    7675     */ 
    … …  
    7978    /** 
    8079     * <p> 
    81      * Modality of the created window. 
     80     * Modality of the created GUI element. 
    8281     * </p> 
    8382     */ 
    … …  
    9291    public void onEndElement() { 
    9392        if (hwnd != 0) { 
    94                 IGUIElementSpec spec = new MFCGUIElementSpec(hwnd, windowName, resourceId, className, isModal); 
     93                IGUIElementSpec spec = new MFCGUIElementSpec(hwnd, guiElementName, resourceId, className, isModal); 
    9594            super.getGUIElementTree().add(hwnd, parentHwnd, spec); 
    9695        } 
    … …  
    109108        } 
    110109        else if (name.equals("window.name")) { 
    111             windowName = value; 
     110            guiElementName = value; 
    112111        } 
    113112        else if (name.equals("window.parent.hwnd")) { 
    … …  
    139138    @Override 
    140139    public void onStartElement() { 
    141         windowName = ""; 
     140        guiElementName = ""; 
    142141        hwnd = 0; 
    143142        parentHwnd = 0; 

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

    r1006 r1008  
    1919/** 
    2020 * <p> 
    21  * Handler for {@code WM_DESTROY} message. The handler maintains the {@link MFCWindowTree}. 
     21 * Handler for {@code WM_DESTROY} message. The handler maintains the {@link GUIElementTree}. 
    2222 * </p> 
    2323 *  
    … …  
    4242    /** 
    4343     * <p> 
    44      * HWND of the window that is destroyed. 
     44     * HWND of the GUI element that is destroyed. 
    4545     * </p> 
    4646     */ 

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

    r1006 r1008  
    1818import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElement; 
    1919import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCGUIElementSpec; 
    20 import de.ugoe.cs.autoquest.plugin.mfc.guimodel.MFCWindowTree; 
    2120 
    2221/** 
    2322 * <p> 
    24  * Handles {@code WM_SETTEXT} messages. Handler maintains the {@link MFCWindowTree}. 
     23 * Handles {@code WM_SETTEXT} messages. Handler maintains the {@link GUIElementTree}. 
    2524 * </p> 
    2625 *  
    … …  
    4544    /** 
    4645     * <p> 
    47      * New name of the window. 
     46     * New name of the GUI element. 
    4847     * </p> 
    4948     */ 
    50     private String windowName; 
     49    private String guiElementName; 
    5150 
    5251    /** 
    5352     * <p> 
    54      * HWND of the window. 
     53     * HWND of the GUI element. 
    5554     * </p> 
    5655     */ 
    … …  
    6766                MFCGUIElement element = (MFCGUIElement) super.getGUIElementTree().find(hwnd); 
    6867                MFCGUIElementSpec spec = (MFCGUIElementSpec) element.getSpecification(); 
    69             spec.setName(windowName); 
     68            spec.setName(guiElementName); 
    7069        } 
    7170    } 
    … …  
    8382        } 
    8483        else if (name.equals("window.newText")) { 
    85             windowName = value; 
     84            guiElementName = value; 
    8685        } 
    8786    } 
    … …  
    9493    @Override 
    9594    public void onStartElement() { 
    96         windowName = ""; 
     95        guiElementName = ""; 
    9796        hwnd = 0; 
    9897    } 

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

    r1006 r1008  
    7373    /** 
    7474     * <p> 
    75      * internal handle to the gui element tree 
     75     * internal handle to the GUI element tree 
    7676     * </p> 
    7777     */ 
    … …  
    246246    /** 
    247247     * <p> 
    248      * Returns the gui model that is obtained from parsing log files. 
     248     * Returns the GUI model that is obtained from parsing log files. 
    249249     * </p> 
    250250     *  

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

    r940 r1008  
    2323 
    2424import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory; 
     25import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementTree; 
    2526import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; 
    2627import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException; 
    … …  
    3839 * @author Steffen Herbold 
    3940 * @version 1.0 
     41 * @deprecated This class is replaced by a generalized version. Use {@link #GUIElementTree} instead.  
     42 * @see #GUIElementTree 
    4043 */ 
    4144public class MFCWindowTree { 
Note: See TracChangeset for help on using the changeset viewer.