Changeset 1300 for trunk/autoquest-core-usability

Timestamp:

08/23/13 14:35:29 (11 years ago)

Author:

pharms

Message:

• rework of task model to move event instance stuff to task instances
• introduction of sequence, selection, iteration and optional instances

File:

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

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

@@ -22 +22 @@
 import java.util.Map;
 
+import de.ugoe.cs.autoquest.eventcore.IEventTarget;
+import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextArea;
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITextField;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IMarkingTemporalRelationship;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IStructuringTemporalRelationship;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 
@@ -247 +251 @@
     private void calculateStatistics(ITask task, TextInputStatistics statistics) {
         
-        if ((task instanceof IEventTask) &&
-            (((IEventTask) task).getEventType() instanceof TextInput))
-        {
+        if (isTextInput(task)) {
             calculateStatistics((IEventTask) task, statistics);
         }
@@ -269 +271 @@
 
     /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     * @param task
+     * @return
+     */
+    private boolean isTextInput(ITask task) {
+        if (task.getInstances().size() > 0) {
+            ITaskInstance instance = task.getInstances().iterator().next();
+            if (instance instanceof IEventTaskInstance) {
+                return ((IEventTaskInstance) instance).getEvent().getType() instanceof TextInput;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * TODO: comment
      * 
@@ -275 +296 @@
      */
     private void calculateStatistics(IEventTask node, TextInputStatistics statistics) {
-        String[] fragments =
-            determineTextFragments(((TextInput) node.getEventType()).getEnteredText());
-
-        if (node.getEventTarget() instanceof ITextField) {
-            statistics.addTextFieldInput(node, fragments);
-        }
-        else if (node.getEventTarget() instanceof ITextArea) {
-            statistics.addTextAreaInput(node, fragments);
+        
+        for (ITaskInstance instance : node.getInstances()) {
+            IEventType type = ((IEventTaskInstance) instance).getEvent().getType();
+            IEventTarget target = ((IEventTaskInstance) instance).getEvent().getTarget();
+
+            if (type instanceof TextInput) {
+                String[] fragments =
+                    determineTextFragments(((TextInput) type).getEnteredText());
+                
+                if (target instanceof ITextField) {
+                    statistics.addTextFieldInput(node, fragments);
+                }
+                else if (target instanceof ITextArea) {
+                    statistics.addTextAreaInput(node, fragments);
+                }
+            }
         }
     }