Changeset 1152 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/UsagePattern.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/rules/patterns/UsagePattern.java (modified) (5 diffs)

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

@@ -22 +22 @@
 import com.google.common.collect.Iterables;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.tasktree.IterativeDFSFilterStrategy;
-import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTreeFilter;
-import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTreeNodeTypeFilter;
+import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskModelFilter;
+import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter;
 
 /**
@@ -37 +37 @@
 public class UsagePattern {
     
-    private TaskTreeFilter taskTreeFilter = new TaskTreeFilter(new IterativeDFSFilterStrategy());
+    private TaskModelFilter taskTreeFilter = new TaskModelFilter(new IterativeDFSFilterStrategy());
     
-    private TaskTreeNodeTypeFilter concernedNode;
+    private TaskTypeFilter concernedTask;
 
     private List<UsagePatternVisitor> patternVisitors;
@@ -53 +53 @@
      * @param eventType
      */
-    public UsagePattern(TaskTreeNodeTypeFilter concernedNode,
+    public UsagePattern(TaskTypeFilter concernedNode,
                         UsagePatternVisitor... patternVisitor)
     {
         this.patternVisitors = Arrays.asList(patternVisitor);
-        this.concernedNode = concernedNode;
+        this.concernedTask = concernedNode;
     }
 
-    public boolean containedIn(ITaskTree taskTree) {
-        List<ITaskTreeNode> allConcernedNodes = filterAllConcernedNodeFrom(taskTree);
-        for(ITaskTreeNode concernedNode : allConcernedNodes) {
-            applyAllVisitors(concernedNode);
+    public boolean containedIn(ITaskModel taskModel) {
+        List<ITask> allConcernedTasks = filterAllConcernedTasksFrom(taskModel);
+        for(ITask concernedTask : allConcernedTasks) {
+            applyAllVisitors(concernedTask);
             if(allVisitorsArePresent()) {
                 this.present = true;
@@ -75 +75 @@
     }
 
-    private void applyAllVisitors(ITaskTreeNode concernedNode) {
+    private void applyAllVisitors(ITask concernedTask) {
         Optional<UsagePatternVisitor> previousVisitor = Optional.absent();
         for(UsagePatternVisitor visitor : patternVisitors) {
             if(appliedOnSelectionNode(previousVisitor)) {
-                for(ITaskTreeNode selectionNode : previousVisitor.get().getRetainedSelectionNodes()) {
-                    selectionNode.accept(visitor);
+                for(ITask selection : previousVisitor.get().getRetainedSelectionNodes()) {
+                    selection.accept(visitor);
                 }
             } else {
                 previousVisitor = Optional.of(visitor);
-                concernedNode.accept(visitor);
+                concernedTask.accept(visitor);
             }
         }
@@ -101 +101 @@
      * @return
      */
-    private List<ITaskTreeNode> filterAllConcernedNodeFrom(ITaskTree taskTree) {
-        return this.taskTreeFilter.filterByNodeType(this.concernedNode).from(taskTree).nodesMatchedFilter();
+    private List<ITask> filterAllConcernedTasksFrom(ITaskModel taskModel) {
+        return this.taskTreeFilter.filterByNodeType(this.concernedTask).from(taskModel).tasksMatchedFilter();
     }