Changeset 1152 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/TaskTypeFilter.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/TaskTypeFilter.java (moved) (moved from trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/TaskTreeNodeTypeFilter.java) (4 diffs)

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

@@ -22 +22 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 
 /**
@@ -31 +31 @@
  * @author Alexander Deicke
  */
-public enum TaskTreeNodeTypeFilter implements TaskTreeNodeFilter<ITaskTreeNode> {
+public enum TaskTypeFilter implements TaskFilter<ITask> {
 
     EVENT_TASK_NODE(IEventTask.class),
@@ -41 +41 @@
     SELECTION(ISelection.class),;
 
-    private Class<? extends ITaskTreeNode> nodeTypeClazz;
+    private Class<? extends ITask> taskTypeClazz;
 
-    private TaskTreeNodeTypeFilter(Class<? extends ITaskTreeNode> nodeTypeClazz) {
-        this.nodeTypeClazz = nodeTypeClazz;
+    private TaskTypeFilter(Class<? extends ITask> taskTypeClazz) {
+        this.taskTypeClazz = taskTypeClazz;
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    public Class<ITaskTreeNode> clazz() {
-        return (Class<ITaskTreeNode>) this.nodeTypeClazz;
+    public Class<ITask> clazz() {
+        return (Class<ITask>) this.taskTypeClazz;
     }
 
@@ -56 +56 @@
     @Override
     public Predicate filterPredicate() {
-        return Predicates.instanceOf(nodeTypeClazz);
+        return Predicates.instanceOf(taskTypeClazz);
     }