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

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

@@ -18 +18 @@
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
 
 /**
@@ -26 +25 @@
  * @author 2011, last modified by $Author: $
  */
-public class EventTask extends TaskTreeNode implements IEventTask {
+class EventTask extends Task implements IEventTask {
     
+    /**  */
+    private static final long serialVersionUID = 1L;
+
     /** */
     private IEventType eventType;
@@ -39 +41 @@
      */
     EventTask(IEventType eventType, IEventTarget eventTarget) {
-        super(eventType.toString());
-        super.setDescription("executed on " + eventTarget);
+        super.setDescription(eventType.toString() + " executed on " + eventTarget);
         this.eventType = eventType;
         this.eventTarget = eventTarget;
@@ -62 +63 @@
      * (non-Javadoc)
      * 
-     * @see de.harms.ctte.Task#equals(de.harms.ctte.Task)
-     */
-    @Override
-    public boolean equals(ITaskTreeNode task) {
-        if (!(task instanceof IEventTask)) {
-            return false;
-        }
-
-        IEventType otherType = ((IEventTask) task).getEventType();
-        IEventTarget otherTarget = ((IEventTask) task).getEventTarget();
-
-        if (((eventType == otherType) ||
-             ((eventType != null) && (eventType.equals(otherType)))) &&
-            ((eventTarget == otherTarget) ||
-             ((eventTarget != null) && (eventTarget.equals(otherTarget)))))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
      * @see de.harms.tasktrees.TreeNode#clone()
      */