Changeset 1146 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java

Timestamp:

04/04/13 16:06:07 (11 years ago)

Author:

pharms

Message:

• complete refactoring of task tree model with a separation of task models and task instances
• appropriate adaptation of task tree generation process
• appropriate adaptation of commands and task tree visualization

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java (modified) (3 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.temporalrelation;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeBuilder;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNodeFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory;
 
 /**
@@ -35 +36 @@
      * 
      */
-    static ISequence getSubSequenceInRange(ITaskTreeNode         parent,
-                                           int                   startIndex,
-                                           int                   endIndex,
-                                           String                description,
-                                           ITaskTreeNodeFactory  nodeFactory,
-                                           ITaskTreeBuilder      builder)
+    static ITaskInstance getSubSequenceInRange(ITaskInstanceList parent,
+                                               int               startIndex,
+                                               int               endIndex,
+                                               ITask             model,
+                                               ITaskFactory      taskFactory,
+                                               ITaskBuilder      taskBuilder)
     {
-        ISequence sequence = nodeFactory.createNewSequence();
-        if (description != null) {
-            builder.setDescription(sequence, description);
+        ITaskInstance subsequence = taskFactory.createNewTaskInstance(model);
+
+        for (int i = startIndex; i <= endIndex; i++) {
+            taskBuilder.addChild(subsequence, parent.get(i));
         }
 
-        for (int i = startIndex; i <= endIndex; i++) {
-            builder.addChild(sequence, parent.getChildren().get(i));
-        }
-
-        return sequence;
+        return subsequence;
     }
 
@@ -57 +55 @@
      * 
      */
-    static ISequence createNewSubSequenceInRange(ITaskTreeNode         parent,
-                                                 int                   startIndex,
-                                                 int                   endIndex,
-                                                 String                description,
-                                                 ITaskTreeNodeFactory  nodeFactory,
-                                                 ITaskTreeBuilder      builder)
+    static ITaskInstance createNewSubSequenceInRange(ITaskInstanceList parent,
+                                                     int               startIndex,
+                                                     int               endIndex,
+                                                     ITask             model,
+                                                     ITaskFactory      taskFactory,
+                                                     ITaskBuilder      taskBuilder)
     {
-        ISequence sequence = nodeFactory.createNewSequence();
-        if (description != null) {
-            builder.setDescription(sequence, description);
+        ITaskInstance subsequence = taskFactory.createNewTaskInstance(model);
+
+        for (int i = startIndex; i <= endIndex; i++) {
+            taskBuilder.addChild(subsequence, parent.get(startIndex));
+            taskBuilder.removeTaskInstance(parent, startIndex);
         }
 
-        for (int i = startIndex; i <= endIndex; i++) {
-            builder.addChild(sequence, parent.getChildren().get(startIndex));
-            builder.removeChild((ISequence) parent, startIndex);
-        }
 
-        builder.addChild((ISequence) parent, startIndex, sequence);
+        taskBuilder.addTaskInstance(parent, startIndex, subsequence);
 
-        return sequence;
+        return subsequence;
     }