Changeset 1152 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/util

Timestamp:

04/08/13 16:50:21 (11 years ago)

Author:

pharms

Message:

• complete refactoring of task tree model with a separation of task models and task instances

Location:

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/util

Files:

• NullNode.java (modified) (3 diffs)
• PatternsVisitorUtil.java (modified) (4 diffs)
• TextInputUtil.java (modified) (2 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/util/NullNode.java

@@ -20 +20 @@
 import org.apache.commons.lang.StringUtils;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.NodeVisitor;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 
 /**
@@ -30 +29 @@
  * @author Alexander Deicke
  */
-public class NullNode implements ITaskTreeNode {
+public class NullNode implements ITask {
 
     /* (non-Javadoc)
@@ -47 +46 @@
 
     /* (non-Javadoc)
-     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode#getChildren()
-     */
-    public List<ITaskTreeNode> getChildren() {
-        return Collections.emptyList();
-    }
-
-    /* (non-Javadoc)
      * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode#equals(de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode)
      */
-    public boolean equals(ITaskTreeNode taskTreeNode) {
+    public boolean equals(ITask task) {
         return false;
     }

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/util/PatternsVisitorUtil.java

@@ -19 +19 @@
 import com.google.common.collect.Iterables;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
-import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskTreeNodeFactory;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
+import de.ugoe.cs.autoquest.tasktrees.treeimpl.TaskFactory;
 
 /**
@@ -44 +44 @@
      * @return
      */
-    public static ITaskTree createTaskTreeFromNode(ITaskTreeNode taskTreeNode) {
-        return new TaskTreeNodeFactory().createTaskTree(taskTreeNode);
+    public static ITaskModel createTaskModelFromNode(ITask task) {
+        return new TaskFactory().createTaskTree(task);
     }
     
@@ -56 +56 @@
      * @return
      */
-    public static ITaskTreeNode firstNodeOf(List<ITaskTreeNode> taskTreeNodes) {
-        return Iterables.getFirst(taskTreeNodes, new NullNode());
+    public static ITask firstNodeOf(List<ITask> tasks) {
+        return Iterables.getFirst(tasks, new NullNode());
     }
 
@@ -68 +68 @@
      * @return
      */
-    public static ITaskTreeNode lastNodeOf(List<ITaskTreeNode> taskTreeNodes) {
-        return Iterables.getLast(taskTreeNodes, new NullNode());
+    public static ITask lastNodeOf(List<ITask> tasks) {
+        return Iterables.getLast(tasks, new NullNode());
     }
     

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/util/TextInputUtil.java

@@ -27 +27 @@
 import de.ugoe.cs.autoquest.eventcore.gui.TextInput;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 
 /**
@@ -42 +42 @@
     }
 
-    public static Multiset<String> aggregateEnteredTextFromTextInputs(List<ITaskTreeNode> nodesWithTextInputEvents)
+    public static Multiset<String> aggregateEnteredTextFromTextInputs(List<ITask> tasksWithTextInputEvents)
     {
         List<Iterable<String>> allTextInputs = Lists.newArrayList();
-        for (ITaskTreeNode nodeWithTextInput : nodesWithTextInputEvents) {
-            TextInput textInput = (TextInput) ((IEventTask) nodeWithTextInput).getEventType();
+        for (ITask taskWithTextInput : tasksWithTextInputEvents) {
+            TextInput textInput = (TextInput) ((IEventTask) taskWithTextInput).getEventType();
             allTextInputs.add(splitTextIntoWordsAndSigns(textInput.getEnteredText()));
         }