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

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

@@ -26 +26 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.NodeVisitor;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter;
 import de.ugoe.cs.autoquest.usability.util.PatternsVisitorUtil;
@@ -47 +46 @@
     protected boolean present = false;
     
-    protected List<ITaskTreeNode> retainedChildrenNodesFromSelectionNodes = Lists.newArrayList();
+    protected List<ITask> retainedChildrenTasksFromSelections = Lists.newArrayList();
     
     /* (non-Javadoc)
@@ -85 +84 @@
             this.present = patternIsPresent();
         } else {
-            ITaskTree taskTree = PatternsVisitorUtil.createTaskTreeFromNode(selection);
-            this.present = containedPattern.containedIn(taskTree);  
+            ITaskModel taskModel = PatternsVisitorUtil.createTaskModelFromNode(selection);
+            this.present = containedPattern.containedIn(taskModel);  
         }
     }
 
-    protected void retainNodesWherePatternIsPresent(List<ITaskTreeNode> children) {
-        for(ITaskTreeNode node : children) {
+    protected void retainNodesWherePatternIsPresent(List<ITask> children) {
+        for(ITask task : children) {
             this.present = false;
-            node.accept(this);
+            task.accept(this);
             if(this.present) {
-                this.retainedChildrenNodesFromSelectionNodes.add(node);
+                this.retainedChildrenTasksFromSelections.add(task);
             }
         }
@@ -101 +100 @@
     
     private boolean patternIsPresent() {
-        return !this.retainedChildrenNodesFromSelectionNodes.isEmpty();
+        return !this.retainedChildrenTasksFromSelections.isEmpty();
     }
     
@@ -122 +121 @@
      */
     public void reset() {
-        this.retainedChildrenNodesFromSelectionNodes.clear();
+        this.retainedChildrenTasksFromSelections.clear();
         this.present = false;
     }
@@ -144 +143 @@
      * @return
      */
-    public List<ITaskTreeNode> getRetainedSelectionNodes() {
-        return this.retainedChildrenNodesFromSelectionNodes;
+    public List<ITask> getRetainedSelectionNodes() {
+        return this.retainedChildrenTasksFromSelections;
     }