Changeset 1319 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel

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

Location:

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types

Files:

• EventTargetFilter.java (modified) (2 diffs)
• EventTypeFilter.java (modified) (2 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/EventTargetFilter.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 
 /**
@@ -85 +87 @@
             @Override
             public IEventTarget apply(ITask task) {
-                return ((IEventTask) task).getEventTarget();
+                // XXX: Use the type of the first instance provided
+                ITaskInstance firstInstance = task.getInstances().iterator().next();
+                return ((IEventTaskInstance) firstInstance).getEvent().getTarget();
             }
         };

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/EventTypeFilter.java

@@ -28 +28 @@
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 
 /**
@@ -97 +99 @@
             @Override
             public IEventType apply(ITask task) {
-                return ((IEventTask) task).getEventType();
+                // XXX: Use the type of the first instance provided
+                ITaskInstance firstInstance = task.getInstances().iterator().next();
+                return ((IEventTaskInstance) firstInstance).getEvent().getType();
             }
         };