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

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.usability.rules.patterns.visitors;
 
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
-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.rules.patterns.UsagePattern;
 import de.ugoe.cs.autoquest.usability.rules.patterns.UsagePatternVisitor;
@@ -47 +48 @@
      */
     public void visit(IIteration iteration) {
-        checkAllChildrenAndReturnIfPatternIsPresent(iteration);
+        checkTaskAndReturnIfPatternIsPresent(iteration.getMarkedTask());
 
     }
@@ -59 +60 @@
     }
     
-    private void checkAllChildrenAndReturnIfPatternIsPresent(ITaskTreeNode node) {
-        for(ITaskTreeNode child : node.getChildren()) {
-            ITaskTree taskTree;
-            if(isEvent(child)) {
-                taskTree = PatternsVisitorUtil.createTaskTreeFromNode(node);
-            } else {
-                taskTree = PatternsVisitorUtil.createTaskTreeFromNode(child);
-            }
-            this.present = containedPattern.containedIn(taskTree); 
-            if(this.present) {
+    private void checkAllChildrenAndReturnIfPatternIsPresent(ISequence sequence) {
+        for (ITask child : sequence.getChildren()) {
+            if(checkTaskAndReturnIfPatternIsPresent(child)) {
                 break;
             }
@@ -74 +68 @@
     }
     
-    private boolean isEvent(ITaskTreeNode firstNode) {
-        return firstNode.getChildren().isEmpty();
+    private boolean checkTaskAndReturnIfPatternIsPresent(ITask task) {
+        ITaskModel taskModel = PatternsVisitorUtil.createTaskModelFromNode(task);
+        this.present = containedPattern.containedIn(taskModel); 
+    }
+    
+    private boolean isEvent(ITask task) {
+        return task instanceof IEventTask;
     }