Changeset 1146 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/Task.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/treeimpl/Task.java (moved) (moved from trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/TaskTreeNode.java) (8 diffs)

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.treeimpl;
 
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 
 /**
@@ -27 +23 @@
  * @author 2011, last modified by $Author: $
  */
-public class TaskTreeNode implements ITaskTreeNode {
+class Task implements ITask {
+
+    /**  */
+    private static final long serialVersionUID = 1L;
+
     /** */
     private static int temporalId = 0;
 
     /** */
-    private String name;
+    private int id;
 
     /** */
     private String description;
 
-    /** */
-    private int id;
-
-    /** children */
-    private List<ITaskTreeNode> children;
-
     /**
      * 
      */
-    public TaskTreeNode(String name) {
-        this.name = name;
+    Task() {
         id = getNewId();
     }
@@ -67 +60 @@
      * @return Returns the name.
      */
-    public String getName() {
-        return name;
+    public int getId() {
+        return id;
     }
 
@@ -81 +74 @@
     }
 
-    /**
-     * 
-     */
-    public synchronized List<ITaskTreeNode> getChildren() {
-        if ((children == null) || (children.size() == 0)) {
-            return new LinkedList<ITaskTreeNode>();
-        }
-
-        return Collections.unmodifiableList(children);
-    }
-
     /*
      * (non-Javadoc)
@@ -98 +80 @@
      */
     @Override
-    public boolean equals(ITaskTreeNode taskTreeNode) {
-        if (!this.getClass().isInstance(taskTreeNode)) {
-            return false;
-        }
-
-        if (taskTreeNode.hashCode() != hashCode()) {
-            return false;
-        }
-
-        TaskTreeNode other = (TaskTreeNode) taskTreeNode;
-
-        if (id != other.id) {
-            return false;
-        }
-
-        if (!name.equals(other.name)) {
-            return false;
-        }
-
-        synchronized (other) {
-            if (children == null) {
-                return (other.children == null);
-            }
-            else if (other.children == null) {
-                return (children == null);
-            }
-            else if (other.children.size() != children.size()) {
-                return false;
-            }
-
-            for (int i = 0; i < children.size(); i++) {
-                if (!children.get(i).equals(other.children.get(i))) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
+    public final boolean equals(ITask task) {
+        // tasks are only equal if they are identical or if they have the same id
+        // (may happen, if they are cloned)
+        return (this == task) || (this.hashCode() == task.hashCode());
     }
 
@@ -145 +93 @@
     @Override
     public synchronized int hashCode() {
-        return getClass().getSimpleName().hashCode();
+        return id;
     }
 
@@ -156 +104 @@
     public synchronized String toString() {
         StringBuffer result = new StringBuffer();
-        result.append(name);
-        result.append('(');
+        result.append("task ");
         result.append(id);
         
         if (description != null) {
-            result.append(", ");
+            result.append(" (");
             result.append(description);
+            result.append(')');
         }
         
-        if (children != null) {
-            result.append(", ");
-            result.append(children.size());
-            result.append(" children");
+        return result.toString();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#clone()
+     */
+    @Override
+    public synchronized ITask clone() {
+        Task clone = null;
+        try {
+            clone = (Task) super.clone();
         }
-        
-        result.append(')');
-        return result.toString();
+        catch (CloneNotSupportedException e) {
+            // this should never happen. Therefore simply dump the exception
+            e.printStackTrace();
+        }
+
+        return clone;
     }
 
@@ -185 +145 @@
     }
 
-    /**
-     * 
-     */
-    synchronized void addChild(ITaskTreeNode child) {
-        if (children == null) {
-            children = new LinkedList<ITaskTreeNode>();
-        }
-
-        children.add(child);
-    }
-
-    /**
-     * 
-     */
-    synchronized void addChild(int index, ITaskTreeNode child) {
-        if (children == null) {
-            children = new LinkedList<ITaskTreeNode>();
-        }
-
-        children.add(index, child);
-    }
-
-    /**
-     * TODO: comment
-     * 
-     * @param i
-     * @return
-     */
-    synchronized ITaskTreeNode removeChild(int index) {
-        return children.remove(index);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public synchronized ITaskTreeNode clone() {
-        TaskTreeNode clone = null;
-        try {
-            clone = (TaskTreeNode) super.clone();
-
-            if (children != null) {
-                clone.children = new LinkedList<ITaskTreeNode>();
-
-                for (ITaskTreeNode child : children) {
-                    clone.children.add(child.clone());
-                }
-            }
-
-        }
-        catch (CloneNotSupportedException e) {
-            // this should never happen. Therefore simply dump the exception
-            e.printStackTrace();
-        }
-
-        return clone;
-    }
-
 }