Changeset 1204 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPatternVisitor.java

Timestamp:

05/01/13 14:31:59 (11 years ago)

Author:

adeicke

Message:

Renaming from UsagePattern? to InteractionPattern?.

File:

• trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPatternVisitor.java (moved) (moved from trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/UsagePatternVisitor.java) (7 diffs)

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

@@ -29 +29 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskVisitor;
 import de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter;
+import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTypeFilter;
 
 /**
@@ -37 +38 @@
  * @author Alexander Deicke
  */
-public abstract class UsagePatternVisitor implements ITaskVisitor {
+public abstract class InteractionPatternVisitor implements ITaskVisitor {
     
+        protected TaskTypeFilter taskType;
+        
     protected EventTypeFilter eventType;
     
-    protected UsagePattern containedPattern;
+    protected InteractionPattern containedPattern;
     
     protected boolean present = false;
     
-    protected List<ITask> retainedChildrenTasksFromSelections = Lists.newArrayList();
+    protected List<ITask> retainedSelectionTasks = Lists.newArrayList();
     
     /* (non-Javadoc)
@@ -89 +92 @@
     public void visit(ISelection selection) {
         if(isEventVisitor()) {
-            retainNodesWherePatternIsPresent(selection.getChildren());
+            retainNodesWherePatternIsPresent(selection);
             this.present = patternIsPresent();
         } else {
@@ -96 +99 @@
     }
 
-    protected void retainNodesWherePatternIsPresent(List<ITask> children) {
-        for(ITask task : children) {
+    @SuppressWarnings("unchecked")
+        protected void retainNodesWherePatternIsPresent(ISelection selection) {
+        for(ITask task : selection.getChildren()) {
             this.present = false;
             task.accept(this);
+            if(this.present && this.taskType.filterPredicate().apply(selection)) {
+                this.retainedSelectionTasks.add(selection);
+            }
             if(this.present) {
-                this.retainedChildrenTasksFromSelections.add(task);
+                break;
             }
         }
@@ -107 +114 @@
     
     private boolean patternIsPresent() {
-        return !this.retainedChildrenTasksFromSelections.isEmpty();
+        return !this.retainedSelectionTasks.isEmpty();
     }
     
@@ -128 +135 @@
      */
     public void reset() {
-        this.retainedChildrenTasksFromSelections.clear();
+        this.retainedSelectionTasks.clear();
         this.present = false;
     }
@@ -151 +158 @@
      */
     public List<ITask> getRetainedSelectionNodes() {
-        return this.retainedChildrenTasksFromSelections;
+        return this.retainedSelectionTasks;
     }