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

Timestamp:

11/08/13 22:34:21 (11 years ago)

Author:

khartmann

Message:

• Reworked Filters to use the first instance of a task to provide type and target
• Added a function to extract all tasks matching a given filter
• Added simple console feedback for matched usability problems

File:

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

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

@@ -20 +20 @@
 
 import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.eventcore.IEventTarget;
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.eventcore.StringEventType;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
@@ -31 +34 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskVisitor;
 import de.ugoe.cs.autoquest.test.DummyGUIElement;
@@ -67 +71 @@
     public void visit(IEventTask event) {
         if (!this.present && isEventVisitor()) {
-                boolean matchesEventType = matchesEventType(event.getEventType());
-                boolean matchesEventTarget = matchesEventTarget(event.getEventTarget());
+                Event eventRepresentative = ((IEventTaskInstance) event.getInstances().iterator().next()).getEvent();
+                boolean matchesEventType = matchesEventType(eventRepresentative.getType());
+                boolean matchesEventTarget = matchesEventTarget(eventRepresentative.getTarget());
                 this.present = eventTarget != null ? matchesEventType && matchesEventTarget : matchesEventType;
         }
+        System.out.printf("%s [%s, %s, %s]: %s\n", event, this.eventType, this.eventTarget, this.taskType, this.present);
+        System.out.println(this.getClass().getSimpleName() + " "+ this.hashCode());
     }