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

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

@@ -19 +19 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternVisitor;
 import de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter;
@@ -47 +47 @@
      */
     public void visit(IIteration iteration) {
-        checkAllChildrenAndReturnIfPatternIsPresent(iteration.getChildren());
+        checkTaskAndReturnIfPatternIsPresent(iteration.getMarkedTask());
     }
 
@@ -57 +57 @@
     }
     
-    private void checkAllChildrenAndReturnIfPatternIsPresent(List<ITaskTreeNode> children) {
-        for(ITaskTreeNode node : children) {
-            node.accept(this);
-            if(this.present) {
+    private void checkAllChildrenAndReturnIfPatternIsPresent(List<ITask> children) {
+        for (ITask task : children) {
+            if (checkTaskAndReturnIfPatternIsPresent(task)) {
                 break;
             }
@@ -66 +65 @@
     }
 
+    /**
+     *
+     */
+    private boolean checkTaskAndReturnIfPatternIsPresent(ITask task) {
+        task.accept(this);
+        return this.present;
+    }
 }