Index: /trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/UsagePatternVisitor.java
===================================================================
--- /trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/UsagePatternVisitor.java	(revision 1159)
+++ /trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/UsagePatternVisitor.java	(revision 1160)
@@ -27,7 +27,6 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskVisitor;
 import de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter;
-import de.ugoe.cs.autoquest.usability.util.PatternsVisitorUtil;
 
 /**
@@ -38,5 +37,5 @@
  * @author Alexander Deicke
  */
-public abstract class UsagePatternVisitor implements NodeVisitor {
+public abstract class UsagePatternVisitor implements ITaskVisitor {
     
     protected EventTypeFilter eventType;
@@ -77,4 +76,13 @@
     
     /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.TaskVisitor#accept(de.ugoe.cs.autoquest.tasktrees.treeifc.ITask)
+     */
+    @Override
+    public void visit(ITask task) {
+        task.accept(this);
+        
+    }
+    
+    /* (non-Javadoc)
      * @see de.ugoe.cs.autoquest.tasktrees.treeifc.NodeVisitor#visit(de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection)
      */
@@ -84,6 +92,5 @@
             this.present = patternIsPresent();
         } else {
-            ITaskModel taskModel = PatternsVisitorUtil.createTaskModelFromNode(selection);
-            this.present = containedPattern.containedIn(taskModel);  
+            this.present = containedPattern.containedIn(selection);  
         }
     }