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

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/visitors/EndsWithPatternVisitor.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) {
-        ITaskTree taskTree = PatternsVisitorUtil.createTaskTreeFromNode(iteration);
-        this.present = containedPattern.containedIn(taskTree); 
+        ITaskModel taskModel = PatternsVisitorUtil.createTaskModelFromNode(iteration);
+        this.present = containedPattern.containedIn(taskModel); 
 
     }
@@ -56 +57 @@
      */
     public void visit(ISequence sequence) {
-        ITaskTreeNode lastNode = PatternsVisitorUtil.lastNodeOf(sequence.getChildren());
-        ITaskTree taskTree;
-        if(isEvent(lastNode)) {
-            taskTree = PatternsVisitorUtil.createTaskTreeFromNode(sequence);
+        ITask lastTask = PatternsVisitorUtil.lastNodeOf(sequence.getChildren());
+        ITaskModel taskModel;
+        if(isEvent(lastTask)) {
+            taskModel = PatternsVisitorUtil.createTaskModelFromNode(sequence);
         } else {
-            taskTree = PatternsVisitorUtil.createTaskTreeFromNode(lastNode);
+            taskModel = PatternsVisitorUtil.createTaskModelFromNode(lastTask);
         }
-        this.present = containedPattern.containedIn(taskTree);      
+        this.present = containedPattern.containedIn(taskModel);      
     }
 
-    private boolean isEvent(ITaskTreeNode firstNode) {
-        return firstNode.getChildren().isEmpty();
+    private boolean isEvent(ITask lastTask) {
+        return lastTask instanceof IEventTask;
     }