Ignore:
Timestamp:
05/19/17 11:31:29 (7 years ago)
Author:
pharms
Message:
  • refactored GUI model so that hierarchical event target structures can also be used and created by plugins not being strictly for GUIs
Location:
trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/HTMLLogParser.java

    r1965 r2146  
    3535 
    3636import de.ugoe.cs.autoquest.eventcore.Event; 
     37import de.ugoe.cs.autoquest.eventcore.EventTargetModelException; 
    3738import de.ugoe.cs.autoquest.eventcore.IEventType; 
    3839import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; 
    39 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModelException; 
    4040import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; 
    4141import de.ugoe.cs.autoquest.plugin.html.eventcore.HTMLEventTypeFactory; 
    … …  
    273273                super.getGUIElementTree().add(replacementId, parentId, specification); 
    274274            } 
    275             catch (GUIModelException e) { 
     275            catch (EventTargetModelException e) { 
    276276                throw new SAXException("could not handle GUI element with id " + 
    277277                                       id + ": " + e.getMessage(), e); 

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModel.java

    r1492 r2146  
    2525 
    2626import de.ugoe.cs.autoquest.CommandHelpers; 
     27import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementFactory; 
    2728import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; 
    2829import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; 
    … …  
    445446                //System.out.println(indent + "merging " + mergeResult + " and " + 
    446447                //                   similarGUIElements.get(1).similarGUIElement); 
    447                 mergeResult = model.mergeGUIElements 
     448                mergeResult = model.mergeEventTargets 
    448449                        (mergeResult, similarGUIElements.remove(1).similarGUIElement, false); 
    449450            } 
    … …  
    492493         
    493494        //System.out.println(indent + "grouping: " + guiElementsToGroup); 
    494         IGUIElement group = model.groupGUIElements(guiElementsToGroup, getGroupName(cluster)); 
     495        IGUIElement group = model.groupEventTargets 
     496            (guiElementsToGroup, getGroupName(cluster), GUIElementFactory.getInstance()); 
    495497        //System.out.println(indent + "  created group for " + cluster + ": " + group); 
    496498         

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDgenerateSeleniumReplay.java

    r2029 r2146  
    173173                            case TAB: 
    174174                                value = "${KEY_TAB}"; 
     175                                break; 
     176                            default: 
     177                                break; 
    175178                        } 
    176179                    } 

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLDocumentSpec.java

    r1876 r2146  
    1515package de.ugoe.cs.autoquest.plugin.html.guimodel; 
    1616 
     17import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec; 
    1718import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; 
    1819import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIView; 
    … …  
    99100     */ 
    100101    @Override 
    101     public boolean getSimilarity(IGUIElementSpec other) { 
     102    public boolean getSimilarity(IEventTargetSpec other) { 
    102103        if (other instanceof HTMLDocumentSpec) { 
    103104            HTMLDocumentSpec otherSpec = (HTMLDocumentSpec) other; 

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLGUIElement.java

    r1490 r2146  
    1515package de.ugoe.cs.autoquest.plugin.html.guimodel; 
    1616 
     17import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec; 
    1718import de.ugoe.cs.autoquest.eventcore.guimodel.AbstractDefaultGUIElement; 
    18 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; 
    1919 
    2020/** 
    … …  
    113113     */ 
    114114    @Override 
    115     public void updateSpecification(IGUIElementSpec updateSpecification) { 
    116         // nothing to do. There is not need for handle things such as name changes, etc. 
     115    public void updateSpecification(IEventTargetSpec updateSpecification) { 
     116        // nothing to do. There is no need for handle things such as name changes, etc. 
    117117    } 
    118118 

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLGUIElementSpec.java

    r1436 r2146  
    1515package de.ugoe.cs.autoquest.plugin.html.guimodel; 
    1616 
     17import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec; 
    1718import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; 
    1819 
    … …  
    7879     */ 
    7980    @Override 
    80     public boolean getSimilarity(IGUIElementSpec other) { 
     81    public boolean getSimilarity(IEventTargetSpec other) { 
    8182        if (other instanceof HTMLGUIElementSpec) { 
    8283            HTMLGUIElementSpec otherSpec = (HTMLGUIElementSpec) other; 

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLPageElementSpec.java

    r1436 r2146  
    1515package de.ugoe.cs.autoquest.plugin.html.guimodel; 
    1616 
     17import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec; 
    1718import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; 
    1819 
    … …  
    108109     */ 
    109110    @Override 
    110     public boolean getSimilarity(IGUIElementSpec other) { 
     111    public boolean getSimilarity(IEventTargetSpec other) { 
    111112        if (other instanceof HTMLPageElementSpec) { 
    112113            HTMLPageElementSpec otherSpec = (HTMLPageElementSpec) other; 

  • trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/guimodel/HTMLServerSpec.java

    r1436 r2146  
    1515package de.ugoe.cs.autoquest.plugin.html.guimodel; 
    1616 
     17import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec; 
    1718import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElementSpec; 
    1819 
    … …  
    7778     */ 
    7879    @Override 
    79     public boolean getSimilarity(IGUIElementSpec other) { 
     80    public boolean getSimilarity(IEventTargetSpec other) { 
    8081        if (other instanceof HTMLServerSpec) { 
    8182            HTMLServerSpec otherSpec = (HTMLServerSpec) other; 
Note: See TracChangeset for help on using the changeset viewer.