Changeset 1294 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/TaskInstance.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-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/TaskInstance.java (modified) (5 diffs)

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

@@ -14 +14 @@
 
 package de.ugoe.cs.autoquest.tasktrees.treeimpl;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
@@ -64 +59 @@
     /**
      * <p>
-     * the children of this task instance which are task instances, as well
-     * </p>
-     */
-    private List<ITaskInstance> children;
-
-    /**
-     * <p>
      * instantiated the task instance with the task that is instantiated by the instance. It also
      * assigns a unique id to the instance using {@link #getNewId()}.
@@ -102 +90 @@
     public ITask getTask() {
         return task;
-    }
-
-    /* (non-Javadoc)
-     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance#getChildren()
-     */
-    public synchronized List<ITaskInstance> getChildren() {
-        if (children == null) {
-            children = new LinkedList<ITaskInstance>();
-        }
-
-        return Collections.unmodifiableList(children);
-    }
-
-    /* (non-Javadoc)
-     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList#get(int)
-     */
-    @Override
-    public ITaskInstance get(int index) {
-        if (children == null) {
-            throw new IndexOutOfBoundsException(Integer.toString(index));
-        }
-        else {
-            return children.get(index);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList#size()
-     */
-    @Override
-    public int size() {
-        if (children == null) {
-            return 0;
-        }
-        else {
-            return children.size();
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see java.lang.Iterable#iterator()
-     */
-    @Override
-    public Iterator<ITaskInstance> iterator() {
-        return getChildren().iterator();
     }
 
@@ -203 +146 @@
         try {
             clone = (TaskInstance) super.clone();
-
-            if (children != null) {
-                clone.children = new LinkedList<ITaskInstance>();
-
-                for (ITaskInstance child : children) {
-                    clone.children.add(child.clone());
-                }
-            }
-
         }
         catch (CloneNotSupportedException e) {
@@ -219 +153 @@
 
         return clone;
-    }
-
-    /**
-     * <p>
-     * used to add a child to this task instance
-     * </p>
-     * 
-     * @param child the new child of this instance
-     */
-    synchronized void addChild(ITaskInstance child) {
-        if (children == null) {
-            children = new LinkedList<ITaskInstance>();
-        }
-
-        children.add(child);
-    }
-
-    /**
-     * <p>
-     * used to add a child to this task instance at a specific position
-     * </p>
-     * 
-     * @param index the position of the new child in the list of children
-     * @param child the new child of this instance
-     */
-    synchronized void addChild(int index, ITaskInstance child) {
-        if (children == null) {
-            children = new LinkedList<ITaskInstance>();
-        }
-
-        children.add(index, child);
-    }
-
-    /**
-     * <p>
-     * removes a child from this task instance at a specific position
-     * </p>
-     * 
-     * @param index the position of the child to be removed
-     * 
-     * @return the child remove from the children of this instance
-     */
-    synchronized ITaskInstance removeChild(int index) {
-        if (children != null) {
-            return children.remove(index);
-        }
-        else {
-            throw new IllegalArgumentException
-                ("this task instance does not have children that can be removed");
-        }
     }