Changeset 1152 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/EventTargetFilter.java

Timestamp:

04/08/13 16:50:21 (11 years ago)

Author:

pharms

Message:

• complete refactoring of task tree model with a separation of task models and task instances

File:

• trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/EventTargetFilter.java (modified) (3 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/EventTargetFilter.java

@@ -23 +23 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextField;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 
 /**
@@ -32 +32 @@
  * @author Alexander Deicke
  */
-public enum EventTargetFilter implements TaskTreeNodeFilter<IEventTarget> {
+public enum EventTargetFilter implements TaskFilter<IEventTarget> {
 
     TEXT_FIELD(ITextField.class),
@@ -54 +54 @@
     public Predicate filterPredicate() {
         Predicate<Object> instanceOfIEventTaskPredicate = Predicates.instanceOf(IEventTask.class);
-        Predicate<ITaskTreeNode> nodeHoldsInstanceOfFilterArgument =
-            Predicates.compose(Predicates.instanceOf(eventTargetClazz), nodeExtractionFunction());
-        return Predicates.and(instanceOfIEventTaskPredicate, nodeHoldsInstanceOfFilterArgument);
+        Predicate<ITask> taskHoldsInstanceOfFilterArgument =
+            Predicates.compose(Predicates.instanceOf(eventTargetClazz), taskExtractionFunction());
+        return Predicates.and(instanceOfIEventTaskPredicate, taskHoldsInstanceOfFilterArgument);
     }
 
-    private Function<ITaskTreeNode, IEventTarget> nodeExtractionFunction() {
-        return new Function<ITaskTreeNode, IEventTarget>() {
+    private Function<ITask, IEventTarget> taskExtractionFunction() {
+        return new Function<ITask, IEventTarget>() {
 
             @Override
-            public IEventTarget apply(ITaskTreeNode treeNode) {
-                return ((IEventTask) treeNode).getEventTarget();
+            public IEventTarget apply(ITask task) {
+                return ((IEventTask) task).getEventTarget();
             }
         };