Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeImpl.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeImpl.java	(revision 467)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeImpl.java	(revision 469)
@@ -104,54 +104,21 @@
   //-----------------------------------------------------------------------------------------------
   /* (non-Javadoc)
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  //-----------------------------------------------------------------------------------------------
-  @Override
-  public synchronized boolean equals(Object other)
-  {
-    if (!this.getClass().isInstance(other))
-    {
-      return false;
-    }
-    else
-    {
-      return equals((TaskTreeNodeImpl) other);
-    }
-  }
-    
-  //-----------------------------------------------------------------------------------------------
-  /* (non-Javadoc)
-   * @see de.ugoe.cs.tasktree.treeifc.TaskTreeNode#equals(de.ugoe.cs.tasktree.treeifc.TaskTreeNode)
-   */
-  //-----------------------------------------------------------------------------------------------
-  @Override
-  public boolean equals(TaskTreeNode other)
-  {
-    if (!this.getClass().isInstance(other))
-    {
-      return false;
-    }
-    else
-    {
-      return equals((TaskTreeNodeImpl) other);
-    }
-  }
-
-  //-----------------------------------------------------------------------------------------------
-  /* (non-Javadoc)
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  //-----------------------------------------------------------------------------------------------
-  public synchronized boolean equals(TaskTreeNodeImpl other)
-  {
-    if (!this.getClass().isInstance(other))
-    {
-      return false;
-    }
-    
-    if (other.hashCode() != hashCode())
-    {
-      return false;
-    }
+   * @see de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode#equals(TaskTreeNode)
+   */
+  //-----------------------------------------------------------------------------------------------
+  @Override
+  public boolean equals(TaskTreeNode taskTreeNode)
+  {
+    if (!this.getClass().isInstance(taskTreeNode))
+    {
+      return false;
+    }
+    
+    if (taskTreeNode.hashCode() != hashCode())
+    {
+      return false;
+    }
+    
+    TaskTreeNodeImpl other = (TaskTreeNodeImpl) taskTreeNode;
     
     if (mId != other.mId)
@@ -167,12 +134,11 @@
     synchronized (other)
     {
-      if ((other.mChildren == null) && (mChildren == null))
-      {
-        return true;
-      }
-      else if (((other.mChildren == null) && (mChildren != null)) ||
-               ((other.mChildren != null) && (mChildren == null)))
-      {
-        return false;
+      if (mChildren == null)
+      {
+        return (other.mChildren == null);
+      }
+      else if (other.mChildren == null)
+      {
+        return (mChildren == null);
       }
       else if (other.mChildren.size() != mChildren.size())