Changeset 1161

Timestamp:

04/19/13 19:34:09 (12 years ago)

Author:

adeicke

Message:

Adjustments due to change from TaskTree? to TaskModel?.

Location:

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

Files:

• ContainsPatternVisitor.java (modified) (5 diffs)
• EndsWithPatternVisitor.java (modified) (3 diffs)
• StartsWithPatternVisitor.java (modified) (3 diffs)

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

@@ -19 +19 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 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;
-import de.ugoe.cs.autoquest.usability.util.PatternsVisitorUtil;
 
 /**
@@ -49 +47 @@
     public void visit(IIteration iteration) {
         checkTaskAndReturnIfPatternIsPresent(iteration.getMarkedTask());
-
     }
 
@@ -57 +54 @@
     public void visit(ISequence sequence) {
         checkAllChildrenAndReturnIfPatternIsPresent(sequence);
-
     }
     
@@ -63 +59 @@
         for (ITask child : sequence.getChildren()) {
             if(checkTaskAndReturnIfPatternIsPresent(child)) {
+                this.present = true;
                 break;
             }
@@ -69 +66 @@
     
     private boolean checkTaskAndReturnIfPatternIsPresent(ITask task) {
-        ITaskModel taskModel = PatternsVisitorUtil.createTaskModelFromNode(task);
-        this.present = containedPattern.containedIn(taskModel); 
+        if(isEvent(task)) return false;
+        return this.containedPattern.containedIn(task);
     }
     

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

@@ -19 +19 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 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;
@@ -48 +47 @@
      */
     public void visit(IIteration iteration) {
-        ITaskModel taskModel = PatternsVisitorUtil.createTaskModelFromNode(iteration);
-        this.present = containedPattern.containedIn(taskModel); 
-
+        this.present = containedPattern.containedIn(iteration); 
     }
 
@@ -58 +55 @@
     public void visit(ISequence sequence) {
         ITask lastTask = PatternsVisitorUtil.lastNodeOf(sequence.getChildren());
-        ITaskModel taskModel;
         if(isEvent(lastTask)) {
-            taskModel = PatternsVisitorUtil.createTaskModelFromNode(sequence);
+            this.present = containedPattern.containedIn(sequence);
         } else {
-            taskModel = PatternsVisitorUtil.createTaskModelFromNode(lastTask);
-        }
-        this.present = containedPattern.containedIn(taskModel);      
+            this.present = containedPattern.containedIn(lastTask);
+        }    
     }
 

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

@@ -19 +19 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 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;
@@ -48 +47 @@
      */
     public void visit(IIteration iteration) {
-        ITaskModel taskModel = PatternsVisitorUtil.createTaskModelFromNode(iteration);
-        this.present = containedPattern.containedIn(taskModel);  
+        this.present = containedPattern.containedIn(iteration);  
     }
 
@@ -57 +55 @@
     public void visit(ISequence sequence) {
         ITask firstTask = PatternsVisitorUtil.firstNodeOf(sequence.getChildren());
-        ITaskModel taskModel;
         if(isEvent(firstTask)) {
-            taskModel = PatternsVisitorUtil.createTaskModelFromNode(sequence);
+            this.present = containedPattern.containedIn(sequence);
         } else {
-            taskModel = PatternsVisitorUtil.createTaskModelFromNode(firstTask);
-        }
-        this.present = containedPattern.containedIn(taskModel);      
+            this.present = containedPattern.containedIn(firstTask);
+        }    
     }