Changeset 2146 for trunk/autoquest-core-usability

Timestamp:

05/19/17 11:31:29 (8 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:

• DefaultValueRule.java (modified) (4 diffs)
• RuleUtils.java (modified) (3 diffs)
• UnusedGUIElementsRule.java (modified) (2 diffs)

trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/DefaultValueRule.java

@@ -29 +29 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.IEventTargetSpec;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseClick;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
@@ -609 +612 @@
 
         /**
+         * 
+         */
+        public IHierarchicalEventTargetModel<?> getEventTargetModel() {
+            return target.getEventTargetModel();
+        }
+
+        /**
          *
          */
@@ -653 +663 @@
          *
          */
-        public void updateSpecification(IGUIElementSpec furtherSpec) {
+        public void updateSpecification(IEventTargetSpec furtherSpec) {
             target.updateSpecification(furtherSpec);
         }
@@ -660 +670 @@
          * 
          */
-        public void addEqualGUIElement(IGUIElement equalElement) {
-            target.addEqualGUIElement(equalElement);
+        public void addEqualEventTarget(IHierarchicalEventTarget equalElement) {
+            target.addEqualEventTarget(equalElement);
         }
 

trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/RuleUtils.java

@@ -23 +23 @@
 import java.util.Map;
 
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIElementGroup;
+import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetGroup;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 
@@ -123 +123 @@
         
         while (parent != null) {
-            if (!(parent instanceof GUIElementGroup)) {
+            if (!(parent instanceof HierarchicalEventTargetGroup)) {
                 result = parent.toString() + "/" + result;
             }
@@ -149 +149 @@
             IGUIElement parent = guiElement;
             while (parent != null) {
-                if (!(parent instanceof GUIElementGroup)) {
+                if (!(parent instanceof HierarchicalEventTargetGroup)) {
                     path.addFirst(parent);
                 }

trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UnusedGUIElementsRule.java

@@ -24 +24 @@
 
 import de.ugoe.cs.autoquest.eventcore.Event;
+import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IButton;
@@ -175 +176 @@
         GUIModel model = result.values().iterator().next().iterator().next().getGUIModel();
         
-        GUIModel.Traverser traverser = model.getTraverser();
+        IHierarchicalEventTargetModel.Traverser<IGUIElement> traverser = model.getTraverser();
 
         IGUIElement currentGUIElement = null;