Changeset 1294 for trunk/autoquest-test-utils/src/main/java/de/ugoe/cs/autoquest/tasktrees/TaskTreeEncoder.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/TaskTreeEncoder.java (modified) (7 diffs)

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

@@ -24 +24 @@
 import java.util.Map;
 
+import de.ugoe.cs.autoquest.eventcore.Event;
 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.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.ITask;
@@ -141 +145 @@
         else if (task instanceof IEventTask) {
             out.print(indent);
-            out.print(((IEventTask) task).getEventType());
-            out.print(" ");
-            out.print(((IEventTask) task).getEventTarget().getStringIdentifier());
-//            if (((IEventTask) node).getEventTarget() instanceof IGUIElement) {
-//              out.print(" ");
-//              out.print(((IGUIElement) ((IEventTask) node).getEventTarget()).getSpecification());
-//            }
+            out.print(task);
         }
         else {
@@ -154 +152 @@
 
         int i = 0;
-        for (ITaskInstance child : taskInstance.getChildren()) {
-            encode(child, out, indent + "  ", i++);
+        
+        if (taskInstance instanceof ITaskInstanceList) {
+            for (ITaskInstance child : (ITaskInstanceList) taskInstance) {
+                encode(child, out, indent + "  ", i++);
+            }
+        }
+        else if (taskInstance instanceof ISelectionInstance) {
+            encode(((ISelectionInstance) taskInstance).getChild(), out, indent + "  ", i++);
+        }
+        else if (taskInstance instanceof IOptionalInstance) {
+            encode(((IOptionalInstance) taskInstance).getChild(), out, indent + "  ", i++);
         }
 
@@ -221 +228 @@
         }
         else if (task instanceof IEventTask) {
-            if (((IEventTask) task).getEventType() instanceof TextInput) {
+            Event event = ((IEventTaskInstance) taskInstance).getEvent();
+            if (event.getType() instanceof TextInput) {
                 if (id == null) {
                     id = "textInput" + typeCounters[3]++;
@@ -229 +237 @@
                 System.out.print(id);
                 System.out.print(" \"");
-                System.out.print(((TextInput) ((IEventTask) task).getEventType()).getEnteredText());
+                System.out.print(((TextInput) event.getType()).getEnteredText());
                 System.out.print("\"");
             }
@@ -240 +248 @@
                 System.out.print(id);
                 System.out.print(' ');
-                System.out.print(((IEventTask) task).getEventType().getName());
+                System.out.print(event.getType().getName());
             }
             System.out.print(" {}\" +");
@@ -250 +258 @@
         taskIds.put(task, id);
         
-        for (ITaskInstance child : taskInstance.getChildren()) {
-            dumpTaskInstanceAsCheckString(child, typeCounters, taskIds, indent + "  ");
+        if (taskInstance instanceof ITaskInstanceList) {
+            for (ITaskInstance child : (ITaskInstanceList) taskInstance) {
+                dumpTaskInstanceAsCheckString(child, typeCounters, taskIds, indent + "  ");
+            }
+        }
+        else if (taskInstance instanceof ISelectionInstance) {
+            dumpTaskInstanceAsCheckString
+                (((ISelectionInstance) taskInstance).getChild(), typeCounters, taskIds, indent + "  ");
+        }
+        else if (taskInstance instanceof IOptionalInstance) {
+            dumpTaskInstanceAsCheckString
+                (((IOptionalInstance) taskInstance).getChild(), typeCounters, taskIds, indent + "  ");
         }