Index: trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UsabilityEvaluationManager.java
===================================================================
--- trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UsabilityEvaluationManager.java	(revision 927)
+++ trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/UsabilityEvaluationManager.java	(revision 1148)
@@ -19,5 +19,6 @@
 import java.util.logging.Level;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
+import de.ugoe.cs.autoquest.tasktrees.query.TaskTreeQueryProcessor;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.util.console.Console;
 
@@ -55,12 +56,13 @@
      * @param taskTree
      */
-    public UsabilityEvaluationResult evaluateUsability(ITaskTree taskTree) {
+    public UsabilityEvaluationResult evaluateUsability(ITaskModel taskTree) {
         Console.traceln(Level.INFO, "evaluating usability of task tree " + taskTree);
 
         List<UsabilityEvaluationResult> results = new ArrayList<UsabilityEvaluationResult>();
+        TaskTreeQueryProcessor queryProcessor = new TaskTreeQueryProcessor(taskTree);
 
         for (UsabilityEvaluationRule rule : rules) {
             Console.traceln(Level.INFO, "applying rule " + rule.getClass().getSimpleName());
-            UsabilityEvaluationResult result = rule.evaluate(taskTree);
+            UsabilityEvaluationResult result = rule.evaluate(queryProcessor);
             results.add(result);
             Console.traceln(Level.INFO, "the rule found " + result.getAllDefects().size() +