Changeset 1152 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters
- Timestamp:
- 04/08/13 16:50:21 (11 years ago)
- Location:
- trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters
- Files:
-
- 2 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/EventTargetFilter.java
r1135 r1152 23 23 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextField; 24 24 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask; 25 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask TreeNode;25 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 26 26 27 27 /** … … 32 32 * @author Alexander Deicke 33 33 */ 34 public enum EventTargetFilter implements Task TreeNodeFilter<IEventTarget> {34 public enum EventTargetFilter implements TaskFilter<IEventTarget> { 35 35 36 36 TEXT_FIELD(ITextField.class), … … 54 54 public Predicate filterPredicate() { 55 55 Predicate<Object> instanceOfIEventTaskPredicate = Predicates.instanceOf(IEventTask.class); 56 Predicate<ITask TreeNode> nodeHoldsInstanceOfFilterArgument =57 Predicates.compose(Predicates.instanceOf(eventTargetClazz), nodeExtractionFunction());58 return Predicates.and(instanceOfIEventTaskPredicate, nodeHoldsInstanceOfFilterArgument);56 Predicate<ITask> taskHoldsInstanceOfFilterArgument = 57 Predicates.compose(Predicates.instanceOf(eventTargetClazz), taskExtractionFunction()); 58 return Predicates.and(instanceOfIEventTaskPredicate, taskHoldsInstanceOfFilterArgument); 59 59 } 60 60 61 private Function<ITask TreeNode, IEventTarget> nodeExtractionFunction() {62 return new Function<ITask TreeNode, IEventTarget>() {61 private Function<ITask, IEventTarget> taskExtractionFunction() { 62 return new Function<ITask, IEventTarget>() { 63 63 64 64 @Override 65 public IEventTarget apply(ITask TreeNode treeNode) {66 return ((IEventTask) t reeNode).getEventTarget();65 public IEventTarget apply(ITask task) { 66 return ((IEventTask) task).getEventTarget(); 67 67 } 68 68 }; -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/EventTypeFilter.java
r1150 r1152 27 27 import de.ugoe.cs.autoquest.eventcore.gui.TextInput; 28 28 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask; 29 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask TreeNode;29 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 30 30 31 31 /** … … 36 36 * @author Alexander Deicke 37 37 */ 38 public enum EventTypeFilter implements Task TreeNodeFilter<IEventType> {38 public enum EventTypeFilter implements TaskFilter<IEventType> { 39 39 40 40 MOUSE_BUTTON_INTERACTION(MouseButtonInteraction.class), … … 66 66 public Predicate filterPredicate() { 67 67 Predicate<Object> instanceOfIEventTaskPredicate = Predicates.instanceOf(IEventTask.class); 68 Predicate<ITask TreeNode> nodeHoldsInstanceOfFilterArgument =69 Predicates.compose(Predicates.instanceOf(eventTypeClazz), nodeExtractionFunction());70 return Predicates.and(instanceOfIEventTaskPredicate, nodeHoldsInstanceOfFilterArgument);68 Predicate<ITask> taskHoldsInstanceOfFilterArgument = 69 Predicates.compose(Predicates.instanceOf(eventTypeClazz), taskExtractionFunction()); 70 return Predicates.and(instanceOfIEventTaskPredicate, taskHoldsInstanceOfFilterArgument); 71 71 } 72 72 73 private Function<ITask TreeNode, IEventType> nodeExtractionFunction() {74 return new Function<ITask TreeNode, IEventType>() {73 private Function<ITask, IEventType> taskExtractionFunction() { 74 return new Function<ITask, IEventType>() { 75 75 76 76 @Override 77 public IEventType apply(ITask TreeNode treeNode) {78 return ((IEventTask) t reeNode).getEventType();77 public IEventType apply(ITask task) { 78 return ((IEventTask) task).getEventType(); 79 79 } 80 80 }; -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/TaskFilter.java
r1150 r1152 24 24 * @author Alexander Deicke 25 25 */ 26 public interface Task TreeNodeFilter<T> {26 public interface TaskFilter<T> { 27 27 28 28 public Class<T> clazz(); -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/TaskModelFilter.java
r1150 r1152 17 17 import com.google.common.base.Preconditions; 18 18 19 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask Tree;19 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 20 20 import de.ugoe.cs.autoquest.usability.tasktree.FilterResult; 21 import de.ugoe.cs.autoquest.usability.tasktree.Task TreeFilterStrategy;21 import de.ugoe.cs.autoquest.usability.tasktree.TaskModelFilterStrategy; 22 22 23 23 /** … … 28 28 * @author Alexander Deicke 29 29 */ 30 public class Task TreeFilter {30 public class TaskModelFilter { 31 31 32 private final Task TreeFilterStrategy taskTreeFilterStrategy;32 private final TaskModelFilterStrategy taskModelFilterStrategy; 33 33 34 public Task TreeFilter(TaskTreeFilterStrategy treeTraversalStrategy) {34 public TaskModelFilter(TaskModelFilterStrategy treeTraversalStrategy) { 35 35 Preconditions.checkNotNull(treeTraversalStrategy); 36 this.task TreeFilterStrategy = treeTraversalStrategy;36 this.taskModelFilterStrategy = treeTraversalStrategy; 37 37 } 38 38 … … 45 45 } 46 46 47 public FilterNodeTypeStep filterByNodeType(TaskT reeNodeTypeFilter nodeType) {47 public FilterNodeTypeStep filterByNodeType(TaskTypeFilter nodeType) { 48 48 return new FilterNodeTypeStep(nodeType); 49 49 } … … 57 57 } 58 58 59 public FilterResult from(ITask Tree taskTree) {60 return task TreeFilterStrategy.filter(taskTree, eventTarget);59 public FilterResult from(ITaskModel taskModel) { 60 return taskModelFilterStrategy.filter(taskModel, eventTarget); 61 61 } 62 62 … … 71 71 } 72 72 73 public FilterResult from(ITask Tree taskTree) {74 return task TreeFilterStrategy.filter(taskTree, eventType);73 public FilterResult from(ITaskModel taskModel) { 74 return taskModelFilterStrategy.filter(taskModel, eventType); 75 75 } 76 76 … … 79 79 public class FilterNodeTypeStep { 80 80 81 private final TaskT reeNodeTypeFilter nodeType;81 private final TaskTypeFilter nodeType; 82 82 83 public FilterNodeTypeStep(TaskT reeNodeTypeFilter nodeType) {83 public FilterNodeTypeStep(TaskTypeFilter nodeType) { 84 84 this.nodeType = nodeType; 85 85 } 86 86 87 public FilterResult from(ITask Tree taskTree) {88 return task TreeFilterStrategy.filter(taskTree, nodeType);87 public FilterResult from(ITaskModel taskModel) { 88 return taskModelFilterStrategy.filter(taskModel, nodeType); 89 89 } 90 90 -
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filters/TaskTypeFilter.java
r1150 r1152 22 22 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection; 23 23 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence; 24 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask TreeNode;24 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 25 25 26 26 /** … … 31 31 * @author Alexander Deicke 32 32 */ 33 public enum TaskT reeNodeTypeFilter implements TaskTreeNodeFilter<ITaskTreeNode> {33 public enum TaskTypeFilter implements TaskFilter<ITask> { 34 34 35 35 EVENT_TASK_NODE(IEventTask.class), … … 41 41 SELECTION(ISelection.class),; 42 42 43 private Class<? extends ITask TreeNode> nodeTypeClazz;43 private Class<? extends ITask> taskTypeClazz; 44 44 45 private TaskT reeNodeTypeFilter(Class<? extends ITaskTreeNode> nodeTypeClazz) {46 this. nodeTypeClazz = nodeTypeClazz;45 private TaskTypeFilter(Class<? extends ITask> taskTypeClazz) { 46 this.taskTypeClazz = taskTypeClazz; 47 47 } 48 48 49 49 @SuppressWarnings("unchecked") 50 50 @Override 51 public Class<ITask TreeNode> clazz() {52 return (Class<ITask TreeNode>) this.nodeTypeClazz;51 public Class<ITask> clazz() { 52 return (Class<ITask>) this.taskTypeClazz; 53 53 } 54 54 … … 56 56 @Override 57 57 public Predicate filterPredicate() { 58 return Predicates.instanceOf( nodeTypeClazz);58 return Predicates.instanceOf(taskTypeClazz); 59 59 } 60 60
Note: See TracChangeset
for help on using the changeset viewer.