Changeset 1291 for trunk

Timestamp:

08/10/13 10:25:38 (11 years ago)

Author:

adeicke

Message:

Added new filter.

Location:

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types

Files:

• EventTargetFilter.java (modified) (2 diffs)
• EventTypeFilter.java (modified) (2 diffs)
• TaskTypeFilter.java (modified) (1 diff)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/EventTargetFilter.java

@@ -22 +22 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextArea;
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextField;
+import de.ugoe.cs.autoquest.plugin.html.guimodel.HTMLText;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
@@ -36 +37 @@
     TEXT_FIELD(ITextField.class),
 
-    TEXT_AREA(ITextArea.class);
+    TEXT_AREA(ITextArea.class),
+    
+    SPAN(HTMLText.class);
 
     private Class<? extends IEventTarget> eventTargetClazz;

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/EventTypeFilter.java

@@ -21 +21 @@
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.eventcore.gui.IInteraction;
+import de.ugoe.cs.autoquest.eventcore.gui.KeyPressed;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseButtonInteraction;
 import de.ugoe.cs.autoquest.eventcore.gui.MouseClick;
@@ -38 +39 @@
 public enum EventTypeFilter implements TaskFilter<IEventType> {
 
+        KEY_PRESSED(KeyPressed.class),
+        
     MOUSE_BUTTON_INTERACTION(MouseButtonInteraction.class),
 

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/taskmodel/filter/types/TaskTypeFilter.java

@@ -33 +33 @@
 public enum TaskTypeFilter implements TaskFilter<ITask> {
 
+        ANY(ITask.class),
+        
     EVENT_TASK_NODE(IEventTask.class),