Changeset 1126

Timestamp:

03/18/13 11:50:04 (12 years ago)

Author:

pharms

Message:

• extended task tree model with support for optionalities
• improved performance of task tree handling
• improved visualization of task trees

Location:

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

Files:

• treeifc/IOptional.java (added)
• treeifc/ITaskTreeBuilder.java (modified) (3 diffs)
• treeifc/ITaskTreeNodeFactory.java (modified) (1 diff)
• treeimpl/EventTask.java (modified) (1 diff)
• treeimpl/Iteration.java (modified) (1 diff)
• treeimpl/Optional.java (added)
• treeimpl/TaskTreeBuilder.java (modified) (5 diffs)
• treeimpl/TaskTreeNode.java (modified) (6 diffs)
• treeimpl/TaskTreeNodeFactory.java (modified) (2 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeifc/ITaskTreeBuilder.java

@@ -34 +34 @@
 
     /**
+     * 
+     * @param parent
+     * @param i
+     */
+    void setChild(ISequence parent, int index, ITaskTreeNode child);
+
+    /**
      * @param sequence
      * @param task
@@ -45 +52 @@
      */
     void setChild(IIteration iteration, ITaskTreeNode newChild);
+
+    /**
+     * 
+     * @param optional
+     * @param newChild
+     */
+    void setChild(IOptional optional, ITaskTreeNode newChild);
 
     /**
@@ -61 +75 @@
 
     /**
+     *
+     * @param parent
+     * @param i
+     */
+    void replaceChild(ISelection parent, ITaskTreeNode oldChild, ITaskTreeNode newChild);
+
+    /**
      * 
      * @param parent

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeifc/ITaskTreeNodeFactory.java

@@ -51 +51 @@
    * @return
    */
+  IOptional createNewOptional();
+
+  /**
+   *
+   * @return
+   */
   ISelection createNewSelection();
 

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/EventTask.java

@@ -39 +39 @@
      */
     EventTask(IEventType eventType, IEventTarget eventTarget) {
-        super(eventType.getName() + "(" + eventTarget + ")");
-        super.setDescription(eventType + " on " + eventTarget);
+        super(eventType.toString());
+        super.setDescription("executed on " + eventTarget);
         this.eventType = eventType;
         this.eventTarget = eventTarget;

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/Iteration.java

@@ -42 +42 @@
         // adding more children is not allowed
         throw new UnsupportedOperationException
-          ("iterations may not have a list of children. Use setChild() instead.");
+            ("iterations may not have a list of children. Use setChild() instead.");
     }
 

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/TaskTreeBuilder.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.treeimpl;
 
+import java.util.List;
+
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
@@ -59 +62 @@
     }
 
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeBuilder#setChild(de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence, int, de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode)
+     */
+    @Override
+    public void setChild(ISequence parent, int index, ITaskTreeNode child) {
+        if (!(parent instanceof Sequence)) {
+            throw new IllegalArgumentException
+                ("illegal type of task tree node provided: " + parent.getClass());
+        }
+
+        ((TaskTreeNode) parent).removeChild(index);
+        addChildInternal(parent, index, child);
+    }
+
     /*
      * (non-Javadoc)
@@ -94 +111 @@
     }
 
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeBuilder#setChild(de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional, de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode)
+     */
+    @Override
+    public void setChild(IOptional optional, ITaskTreeNode newChild) {
+        if (!(optional instanceof Optional)) {
+            throw new IllegalArgumentException
+                ("illegal type of optional provided: " + optional.getClass());
+        }
+
+        if (!(newChild instanceof TaskTreeNode)) {
+            throw new IllegalArgumentException
+                ("illegal type of task tree node provided: " + newChild.getClass());
+        }
+
+        ((Optional) optional).setChild(newChild);
+    }
+
     /*
      * (non-Javadoc)
@@ -121 +156 @@
         }
 
-        for (int i = 0; i < parent.getChildren().size(); i++) {
-            if ((parent.getChildren().get(i) == child) ||
-                ((parent.getChildren().get(i) != null) &&
-                 (parent.getChildren().get(i).equals(child))))
+        List<ITaskTreeNode> children = parent.getChildren();
+        
+        for (int i = 0; i < children.size(); i++) {
+            if ((children.get(i) == child) ||
+                ((children.get(i) != null) && (children.get(i).equals(child))))
             {
                 ((TaskTreeNode) parent).removeChild(i);
@@ -132 +168 @@
     }
 
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeBuilder#replaceChild(de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection, de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode, de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode)
+     */
+    @Override
+    public void replaceChild(ISelection parent, ITaskTreeNode oldChild, ITaskTreeNode newChild) {
+        if (!(parent instanceof TaskTreeNode)) {
+            throw new IllegalArgumentException
+                ("illegal type of task tree node provided: " + parent.getClass());
+        }
+
+        List<ITaskTreeNode> children = parent.getChildren();
+        
+        for (int i = 0; i < children.size(); i++) {
+            if ((children.get(i) == oldChild) ||
+                ((children.get(i) != null) && (children.get(i).equals(oldChild))))
+            {
+                ((TaskTreeNode) parent).removeChild(i);
+                ((TaskTreeNode) parent).addChild(i, newChild);
+                break;
+            }
+        }
+    }
+
     /*
      * (non-Javadoc)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/TaskTreeNode.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.treeimpl;
 
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -85 +86 @@
     public synchronized List<ITaskTreeNode> getChildren() {
         if ((children == null) || (children.size() == 0)) {
-            return new ArrayList<ITaskTreeNode>();
-        }
-
-        return children.subList(0, children.size());
+            return new LinkedList<ITaskTreeNode>();
+        }
+
+        return Collections.unmodifiableList(children);
     }
 
@@ -154 +155 @@
     @Override
     public synchronized String toString() {
-        if (children == null) {
-            return name + "(" + id + ")";
-        }
-        else {
-            return name + "(" + id + ", " + children.size() + " children)";
-        }
+        StringBuffer result = new StringBuffer();
+        result.append(name);
+        result.append('(');
+        result.append(id);
+        
+        if (description != null) {
+            result.append(", ");
+            result.append(description);
+        }
+        
+        if (children != null) {
+            result.append(", ");
+            result.append(children.size());
+            result.append(" children");
+        }
+        
+        result.append(')');
+        return result.toString();
     }
 
@@ -177 +190 @@
     synchronized void addChild(ITaskTreeNode child) {
         if (children == null) {
-            children = new ArrayList<ITaskTreeNode>();
+            children = new LinkedList<ITaskTreeNode>();
         }
 
@@ -188 +201 @@
     synchronized void addChild(int index, ITaskTreeNode child) {
         if (children == null) {
-            children = new ArrayList<ITaskTreeNode>();
+            children = new LinkedList<ITaskTreeNode>();
         }
 
@@ -216 +229 @@
 
             if (children != null) {
-                clone.children = new ArrayList<ITaskTreeNode>();
+                clone.children = new LinkedList<ITaskTreeNode>();
 
                 for (ITaskTreeNode child : children) {

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/TaskTreeNodeFactory.java

@@ -19 +19 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
@@ -63 +64 @@
     }
 
+    /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNodeFactory#createNewOptional()
+     */
+    @Override
+    public IOptional createNewOptional() {
+        return new Optional();
+    }
+
     /*
      * (non-Javadoc)