Changeset 1165 for trunk

Timestamp:

04/19/13 19:51:55 (12 years ago)

Author:

adeicke

Message:

• Adjustments due to change from TaskTree? to TaskModel?.
• Renaming from *Tree to *Model.

File:

• trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/GenerateTaskModelUtil.java (copied) (copied from trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/GenerateTaskTreeUtil.java) (6 diffs)

trunk/autoquest-core-usability-evaluation-test/src/main/java/de/ugoe/cs/autoquest/usability/testutil/GenerateTaskModelUtil.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.usability.testutil;
 
+import java.util.List;
 import java.util.logging.Level;
+
+import com.google.common.collect.Lists;
 
 import de.ugoe.cs.autoquest.commands.sequences.CMDcondenseGuiModel;
@@ -25 +28 @@
 import de.ugoe.cs.autoquest.plugin.jfc.commands.CMDparseJFC;
 import de.ugoe.cs.autoquest.tasktrees.TaskTreeDecoder;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeBuilder;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeNodeFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IUserSession;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskBuilder;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskFactory;
 import de.ugoe.cs.autoquest.test.CommandRunner;
 import de.ugoe.cs.util.console.GlobalDataContainer;
@@ -40 +45 @@
  * @author Alexander Deicke
  */
-public class GenerateTaskTreeUtil {
+public class GenerateTaskModelUtil {
 
     private static final String seqName = "sequences";
@@ -46 +51 @@
     private static final String taskTreeName = "taskTree";
     
-    public static ITaskTree getTaskTreeFromSpec(String spec) {
-        TaskTreeNodeFactory factory = new TaskTreeNodeFactory();
-        ITaskTreeNode taskTree = new TaskTreeDecoder(new TaskTreeNodeFactory(), new TaskTreeBuilder()).instantiateTaskTree(spec);
-        return factory.createTaskTree(taskTree);
+    public static ITaskModel getTaskModelFromSpec(String spec) {
+        ITaskFactory factory = new TaskFactory();
+        ITaskInstanceList taskInstances = new TaskTreeDecoder(factory, new TaskBuilder()).decode(spec);
+        List<IUserSession> userSessions = Lists.newArrayList();
+        userSessions.add((IUserSession) taskInstances);
+        return factory.createTaskModel(userSessions);
     }
     
-    public static ITaskTree getTaskTreeFromFile(String filename) {
+    public static ITaskModel getTaskTreeFromFile(String filename) {
         new TextConsole(Level.OFF);
         parseTraceFile(filename);
@@ -60 +67 @@
         detectTextInputEvents();
         condenseMouseClicks();
-        return generateTaskTree();
+        return generateTaskModel();
     }
 
@@ -88 +95 @@
     }
 
-    private static ITaskTree generateTaskTree() {
+    private static ITaskModel generateTaskModel() {
         CommandRunner.runCommand(CMDgenerateTaskTree.class, seqName, taskTreeName);
         GlobalDataContainer dataContainer = GlobalDataContainer.getInstance();
-        return (ITaskTree) dataContainer.getData(taskTreeName);
+        return (ITaskModel) dataContainer.getData(taskTreeName);
     }