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-core-usability/src/main/java/de/ugoe/cs/autoquest/usability
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DefaultValueRule.java

    r2042 r2146  
    2929 
    3030import de.ugoe.cs.autoquest.eventcore.Event; 
     31import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec; 
     32import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget; 
     33import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel; 
    3134import de.ugoe.cs.autoquest.eventcore.gui.MouseClick; 
    3235import de.ugoe.cs.autoquest.eventcore.gui.TextInput; 
     
    609612 
    610613        /** 
     614         *  
     615         */ 
     616        public IHierarchicalEventTargetModel<?> getEventTargetModel() { 
     617            return target.getEventTargetModel(); 
     618        } 
     619 
     620        /** 
    611621         * 
    612622         */ 
     
    653663         * 
    654664         */ 
    655         public void updateSpecification(IGUIElementSpec furtherSpec) { 
     665        public void updateSpecification(IEventTargetSpec furtherSpec) { 
    656666            target.updateSpecification(furtherSpec); 
    657667        } 
     
    660670         *  
    661671         */ 
    662         public void addEqualGUIElement(IGUIElement equalElement) { 
    663             target.addEqualGUIElement(equalElement); 
     672        public void addEqualEventTarget(IHierarchicalEventTarget equalElement) { 
     673            target.addEqualEventTarget(equalElement); 
    664674        } 
    665675 
  • trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/RuleUtils.java

    r1918 r2146  
    2323import java.util.Map; 
    2424 
    25 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementGroup; 
     25import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetGroup; 
    2626import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; 
    2727 
     
    123123         
    124124        while (parent != null) { 
    125             if (!(parent instanceof GUIElementGroup)) { 
     125            if (!(parent instanceof HierarchicalEventTargetGroup)) { 
    126126                result = parent.toString() + "/" + result; 
    127127            } 
     
    149149            IGUIElement parent = guiElement; 
    150150            while (parent != null) { 
    151                 if (!(parent instanceof GUIElementGroup)) { 
     151                if (!(parent instanceof HierarchicalEventTargetGroup)) { 
    152152                    path.addFirst(parent); 
    153153                } 
  • trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UnusedGUIElementsRule.java

    r2135 r2146  
    2424 
    2525import de.ugoe.cs.autoquest.eventcore.Event; 
     26import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel; 
    2627import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; 
    2728import de.ugoe.cs.autoquest.eventcore.guimodel.IButton; 
     
    175176        GUIModel model = result.values().iterator().next().iterator().next().getGUIModel(); 
    176177         
    177         GUIModel.Traverser traverser = model.getTraverser(); 
     178        IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser = model.getTraverser(); 
    178179 
    179180        IGUIElement currentGUIElement = null; 
Note: See TracChangeset for help on using the changeset viewer.