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

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

@@ -17 +17 @@
 import com.google.common.base.Preconditions;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.tasktree.FilterResult;
-import de.ugoe.cs.autoquest.usability.tasktree.TaskTreeFilterStrategy;
+import de.ugoe.cs.autoquest.usability.tasktree.TaskModelFilterStrategy;
 
 /**
@@ -28 +28 @@
  * @author Alexander Deicke
  */
-public class TaskTreeFilter {
+public class TaskModelFilter {
 
-    private final TaskTreeFilterStrategy taskTreeFilterStrategy;
+    private final TaskModelFilterStrategy taskModelFilterStrategy;
 
-    public TaskTreeFilter(TaskTreeFilterStrategy treeTraversalStrategy) {
+    public TaskModelFilter(TaskModelFilterStrategy treeTraversalStrategy) {
         Preconditions.checkNotNull(treeTraversalStrategy);
-        this.taskTreeFilterStrategy = treeTraversalStrategy;
+        this.taskModelFilterStrategy = treeTraversalStrategy;
     }
 
@@ -45 +45 @@
     }
 
-    public FilterNodeTypeStep filterByNodeType(TaskTreeNodeTypeFilter nodeType) {
+    public FilterNodeTypeStep filterByNodeType(TaskTypeFilter nodeType) {
         return new FilterNodeTypeStep(nodeType);
     }
@@ -57 +57 @@
         }
 
-        public FilterResult from(ITaskTree taskTree) {
-            return taskTreeFilterStrategy.filter(taskTree, eventTarget);
+        public FilterResult from(ITaskModel taskModel) {
+            return taskModelFilterStrategy.filter(taskModel, eventTarget);
         }
 
@@ -71 +71 @@
         }
 
-        public FilterResult from(ITaskTree taskTree) {
-            return taskTreeFilterStrategy.filter(taskTree, eventType);
+        public FilterResult from(ITaskModel taskModel) {
+            return taskModelFilterStrategy.filter(taskModel, eventType);
         }
 
@@ -79 +79 @@
     public class FilterNodeTypeStep {
 
-        private final TaskTreeNodeTypeFilter nodeType;
+        private final TaskTypeFilter nodeType;
 
-        public FilterNodeTypeStep(TaskTreeNodeTypeFilter nodeType) {
+        public FilterNodeTypeStep(TaskTypeFilter nodeType) {
             this.nodeType = nodeType;
         }
 
-        public FilterResult from(ITaskTree taskTree) {
-            return taskTreeFilterStrategy.filter(taskTree, nodeType);
+        public FilterResult from(ITaskModel taskModel) {
+            return taskModelFilterStrategy.filter(taskModel, nodeType);
         }