Changeset 1293 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPatternVisitor.java

Timestamp:

08/10/13 10:26:53 (11 years ago)

Author:

adeicke

Message:

Added possibility to consider event target in interaction patterns.

File:

• trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPatternVisitor.java (modified) (4 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPatternVisitor.java

@@ -22 +22 @@
 import com.google.common.collect.Lists;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTarget;
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.eventcore.StringEventType;
@@ -31 +32 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskVisitor;
+import de.ugoe.cs.autoquest.test.DummyGUIElement;
+import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTargetFilter;
 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter;
 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter;
@@ -46 +49 @@
 
     protected EventTypeFilter eventType;
+    
+    protected EventTargetFilter eventTarget;
 
     protected InteractionPattern containedPattern;
@@ -62 +67 @@
     public void visit(IEventTask event) {
         if (!this.present && isEventVisitor()) {
-            IEventType eventType = event.getEventType();
-            if (eventType instanceof StringEventType) {
-                this.present = eventType.toString().equals(nameOfEventType());
-            }
-            else {
-                this.present = eventType.getClass().equals(this.eventType.clazz());
-            }
-        }
-    }
-
-    public boolean isEventVisitor() {
+                boolean matchesEventType = matchesEventType(event.getEventType());
+                boolean matchesEventTarget = matchesEventTarget(event.getEventTarget());
+                this.present = eventTarget != null ? matchesEventType && matchesEventTarget : matchesEventType;
+        }
+    }
+
+    private boolean matchesEventType(IEventType eventType) {
+        if (eventType instanceof StringEventType) {
+            return eventType.toString().equals(nameOfEventType());
+        }
+        else {
+            return eventType.getClass().equals(this.eventType.clazz());
+        }
+        }
+
+        private boolean matchesEventTarget(IEventTarget eventTarget) {
+                if(this.eventTarget != null) {
+                        if(eventTarget instanceof DummyGUIElement) {
+                                return false;
+                        } else {
+                        return eventTarget.getClass().equals(this.eventTarget.clazz());
+                }
+                }
+                return false;
+        }
+
+        public boolean isEventVisitor() {
         return this.eventType != null && this.containedPattern == null;
     }