Changeset 1217 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter
- Timestamp:
- 06/06/13 17:08:25 (11 years ago)
- Location:
- trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel
- Files:
-
- 2 added
- 5 edited
- 4 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/FilterResult.java
r1216 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter; 16 16 17 17 import java.util.List; … … 45 45 @SuppressWarnings("unchecked") 46 46 public void addTask(ITask task) { 47 boolean notFilteredYet = !filteredTasks.contains(task) && !tasksNotMatchedFilter.contains(task); 48 if(notFilteredYet) { 49 if (filterPredicate.apply(task)) { 50 filteredTasks.add(task); 51 } 52 else { 53 tasksNotMatchedFilter.add(task); 54 } 55 } 47 boolean notFilteredYet = 48 !filteredTasks.contains(task) && !tasksNotMatchedFilter.contains(task); 49 if (notFilteredYet) { 50 if (filterPredicate.apply(task)) { 51 filteredTasks.add(task); 52 } 53 else { 54 tasksNotMatchedFilter.add(task); 55 } 56 } 56 57 } 57 58 -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/IterativeDFSFilterStrategy.java
r1216 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter; 16 16 17 17 import java.util.LinkedList; … … 26 26 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 27 27 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 28 import de.ugoe.cs.autoquest.usability.task tree.filters.EventTargetFilter;29 import de.ugoe.cs.autoquest.usability.task tree.filters.EventTypeFilter;30 import de.ugoe.cs.autoquest.usability.task tree.filters.TaskTypeFilter;28 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTargetFilter; 29 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter; 30 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter; 31 31 32 32 /** … … 86 86 } 87 87 88 private void processChildrenOfCurrentTask(Queue<ITask> unvisitedTasks, 89 ITask task) 90 { 88 private void processChildrenOfCurrentTask(Queue<ITask> unvisitedTasks, ITask task) { 91 89 if (task instanceof IStructuringTemporalRelationship) { 92 90 for (ITask child : ((IStructuringTemporalRelationship) task).getChildren()) { -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/TaskModelFilterStrategy.java
r1216 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter; 16 16 17 17 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 18 import de.ugoe.cs.autoquest.usability.task tree.filters.EventTargetFilter;19 import de.ugoe.cs.autoquest.usability.task tree.filters.EventTypeFilter;20 import de.ugoe.cs.autoquest.usability.task tree.filters.TaskTypeFilter;18 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTargetFilter; 19 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.EventTypeFilter; 20 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter; 21 21 22 22 /** -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/EventTargetFilter.java
r1152 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree.filters;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter.types; 16 16 17 17 import com.google.common.base.Function; … … 27 27 /** 28 28 * <p> 29 * TODO comment29 * Event target filter for {@link EventTask}s. 30 30 * </p> 31 31 * … … 44 44 } 45 45 46 /* 47 * (non-Javadoc) 48 * 49 * @see de.ugoe.cs.autoquest.usability.tasktree.filters.TaskFilter#getId() 50 */ 46 51 @SuppressWarnings("unchecked") 47 52 @Override … … 50 55 } 51 56 57 /* 58 * (non-Javadoc) 59 * 60 * @see de.ugoe.cs.autoquest.usability.tasktree.filters.TaskFilter#getId() 61 */ 52 62 @SuppressWarnings("rawtypes") 53 63 @Override … … 59 69 } 60 70 71 /** 72 * 73 * <p> 74 * Gets the event target of a {@link ITask}. 75 * </p> 76 * 77 * @return event target 78 */ 61 79 private Function<ITask, IEventTarget> taskExtractionFunction() { 62 80 return new Function<ITask, IEventTarget>() { -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/EventTypeFilter.java
r1152 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree.filters;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter.types; 16 16 17 17 import com.google.common.base.Function; … … 31 31 /** 32 32 * <p> 33 * TODO comment33 * Event type filter for {@link EventTask}s. 34 34 * </p> 35 35 * … … 39 39 40 40 MOUSE_BUTTON_INTERACTION(MouseButtonInteraction.class), 41 41 42 42 MOUSE_CLICK(MouseClick.class), 43 43 44 44 MOUSE_INTERACTION(MouseInteraction.class), 45 45 46 46 TEXT_INPUT(TextInput.class), 47 47 48 48 SCROLL(Scroll.class), 49 49 50 50 USER_INTERACTION(IInteraction.class); 51 51 … … 55 55 this.eventTypeClazz = eventTypeClazz; 56 56 } 57 57 58 /* 59 * (non-Javadoc) 60 * 61 * @see de.ugoe.cs.autoquest.usability.tasktree.filters.TaskFilter#getId() 62 */ 58 63 @SuppressWarnings("unchecked") 59 64 @Override … … 62 67 } 63 68 69 /* 70 * (non-Javadoc) 71 * 72 * @see de.ugoe.cs.autoquest.usability.tasktree.filters.TaskFilter#getId() 73 */ 64 74 @SuppressWarnings("rawtypes") 65 75 @Override … … 71 81 } 72 82 83 /** 84 * 85 * <p> 86 * Gets the event type of a {@link ITask}. 87 * </p> 88 * 89 * @return event type 90 */ 73 91 private Function<ITask, IEventType> taskExtractionFunction() { 74 92 return new Function<ITask, IEventType>() { -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/TaskFilter.java
r1152 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree.filters;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter.types; 16 16 17 17 import com.google.common.base.Predicate; … … 19 19 /** 20 20 * <p> 21 * TODO comment21 * A task filter allows to filter a collection of tasks, considering a provided predicate. 22 22 * </p> 23 23 * … … 26 26 public interface TaskFilter<T> { 27 27 28 /** 29 * 30 * <p> 31 * {@link Class} of type or property, which is used to filter tasks. 32 * </p> 33 * 34 * @return 35 */ 28 36 public Class<T> clazz(); 29 37 38 /** 39 * 40 * <p> 41 * Provides predicate to filter tasks. 42 * </p> 43 * 44 * @return 45 */ 30 46 @SuppressWarnings("rawtypes") 31 47 public Predicate filterPredicate(); -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/TaskModelFilter.java
r1152 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree.filters;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter.types; 16 16 17 17 import com.google.common.base.Preconditions; 18 18 19 19 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 20 import de.ugoe.cs.autoquest.usability.task tree.FilterResult;21 import de.ugoe.cs.autoquest.usability.task tree.TaskModelFilterStrategy;20 import de.ugoe.cs.autoquest.usability.taskmodel.filter.FilterResult; 21 import de.ugoe.cs.autoquest.usability.taskmodel.filter.TaskModelFilterStrategy; 22 22 23 23 /** -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/TaskTypeFilter.java
r1152 r1217 13 13 // limitations under the License. 14 14 15 package de.ugoe.cs.autoquest.usability.task tree.filters;15 package de.ugoe.cs.autoquest.usability.taskmodel.filter.types; 16 16 17 17 import com.google.common.base.Predicate; … … 26 26 /** 27 27 * <p> 28 * T ODO comment28 * Task type filter for {@link ITask}s. 29 29 * </p> 30 30 * … … 34 34 35 35 EVENT_TASK_NODE(IEventTask.class), 36 36 37 37 ITERATION(IIteration.class), 38 38 39 39 SEQUENCE(ISequence.class), 40 41 SELECTION(ISelection.class) ,;40 41 SELECTION(ISelection.class); 42 42 43 43 private Class<? extends ITask> taskTypeClazz; … … 47 47 } 48 48 49 /* 50 * (non-Javadoc) 51 * 52 * @see de.ugoe.cs.autoquest.usability.tasktree.filters.TaskFilter#getId() 53 */ 49 54 @SuppressWarnings("unchecked") 50 55 @Override … … 53 58 } 54 59 60 /* 61 * (non-Javadoc) 62 * 63 * @see de.ugoe.cs.autoquest.usability.tasktree.filters.TaskFilter#getId() 64 */ 55 65 @SuppressWarnings("rawtypes") 56 66 @Override
Note: See TracChangeset
for help on using the changeset viewer.