Changeset 699 for trunk

Timestamp:

08/29/12 16:12:50 (12 years ago)

Author:

pharms

Message:

• moved text input detection from task tree generation to dedicated command to be run on sequences

File:

• trunk/quest-core-usability/src/main/java/de/ugoe/cs/quest/usability/TextInputStatisticsRule.java (modified) (5 diffs)

trunk/quest-core-usability/src/main/java/de/ugoe/cs/quest/usability/TextInputStatisticsRule.java

@@ -7 +7 @@
 import java.util.Map;
 
+import de.ugoe.cs.quest.eventcore.gui.TextInput;
 import de.ugoe.cs.quest.eventcore.guimodel.ITextArea;
 import de.ugoe.cs.quest.eventcore.guimodel.ITextField;
+import de.ugoe.cs.quest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTree;
 import de.ugoe.cs.quest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.quest.tasktrees.treeifc.ITextInputEventTask;
 
 /**
@@ -216 +217 @@
      */
     private void calculateStatistics(ITaskTreeNode node, TextInputStatistics statistics) {
-        if (node instanceof ITextInputEventTask) {
-            calculateStatistics((ITextInputEventTask) node, statistics);
+        if ((node instanceof IEventTask) &&
+            (((IEventTask) node).getEventType() instanceof TextInput))
+        {
+            calculateStatistics((IEventTask) node, statistics);
         }
         else {
@@ -237 +240 @@
      * @param statistics
      */
-    private void calculateStatistics(ITextInputEventTask node, TextInputStatistics statistics) {
-        String[] fragments = determineTextFragments(node.getEnteredText());
+    private void calculateStatistics(IEventTask node, TextInputStatistics statistics) {
+        String[] fragments =
+            determineTextFragments(((TextInput) node.getEventType()).getEnteredText());
 
         if (node.getEventTarget() instanceof ITextField) {
@@ -322 +326 @@
          * 
          */
-        public void addTextFieldInput(ITextInputEventTask node, String[] fragments) {
+        public void addTextFieldInput(IEventTask node, String[] fragments) {
             textFieldInputs.add(new Object[] { node, fragments });
         }
@@ -333 +337 @@
          * 
          */
-        public void addTextAreaInput(ITextInputEventTask node, String[] fragments) {
+        public void addTextAreaInput(IEventTask node, String[] fragments) {
             textAreaInputs.add(new Object[] { node, fragments });
         }