Changeset 1294 for trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeDecoder.java

Timestamp:

08/14/13 17:04:42 (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-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeDecoder.java (modified) (4 diffs)

trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeDecoder.java

@@ -26 +26 @@
 import de.ugoe.cs.autoquest.eventcore.StringEventType;
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IIterationInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptionalInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelectionInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequenceInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
@@ -173 +179 @@
             }
             else {
-                task = createUserInteractionTask(matcher);
+                task = createUserInteractionTaskInstance(matcher).getTask();
             }  
             tasks.put(id, task);
         }
         
-        if ((matcher.group(5) != null) && (!"".equals(matcher.group(5).trim()))) {
-            taskBuilder.setDescription(task, matcher.group(5).trim());
-        }
-
-        ITaskInstance instance = taskFactory.createNewTaskInstance(task);
+        ITaskInstance instance;
+        
+        if (task instanceof ISequence) {
+            instance = taskFactory.createNewTaskInstance((ISequence) task);
+        }
+        else if (task instanceof ISelection) {
+            instance = taskFactory.createNewTaskInstance((ISelection) task);
+        }
+        else if (task instanceof IIteration) {
+            instance = taskFactory.createNewTaskInstance((IIteration) task);
+        }
+        else if (task instanceof IOptional) {
+            instance = taskFactory.createNewTaskInstance((IOptional) task);
+        }
+        else {
+            instance = taskFactory.createNewTaskInstance
+                 ((IEventTask) task,
+                  ((IEventTaskInstance) task.getInstances().iterator().next()).getEvent());
+        }  
         
         while (taskMatcher.find() && !"}".equals(taskMatcher.group(0))) {
@@ -216 +236 @@
             }
             
-            taskBuilder.addChild(instance, childInstance);
+            if (instance instanceof ISequenceInstance) {
+                taskBuilder.addChild((ISequenceInstance) instance, childInstance);
+            }
+            else if (instance instanceof ISelectionInstance) {
+                taskBuilder.setChild((ISelectionInstance) instance, childInstance);
+            }
+            else if (instance instanceof IIterationInstance) {
+                taskBuilder.addChild((IIterationInstance) instance, childInstance);
+            }
+            else if (instance instanceof IOptionalInstance) {
+                taskBuilder.setChild((IOptionalInstance) instance, childInstance);
+            }
         }
 
@@ -229 +260 @@
      * @return
      */
-    private ITask createUserInteractionTask(Matcher matcher) {
+    private ITaskInstance createUserInteractionTaskInstance(Matcher matcher) {
         String evenType = matcher.group(1);
         String id = matcher.group(2);
-        IEventTarget evenTarget = targets.get(id);
-        if (evenTarget == null) {
-            evenTarget = determineTarget(evenType, id, matcher.group(4));
-            targets.put(id, evenTarget);
+        IEventTarget eventTarget = targets.get(id);
+        if (eventTarget == null) {
+            eventTarget = determineTarget(evenType, id, matcher.group(4));
+            targets.put(id, eventTarget);
         }
         IEventType eventType = determineType(evenType, matcher.group(4));
-        return taskFactory.createNewEventTask(eventType, evenTarget);
+        IEventTask task = taskFactory.createNewEventTask(eventType + " --> " + eventTarget);
+        
+        return taskFactory.createNewTaskInstance(task, new Event(eventType, eventTarget));
     }