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

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

@@ -16 +16 @@
 
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 
 /**
@@ -24 +24 @@
  * @author 2012, last modified by $Author: patrick$
  */
-public class Optional extends TaskTreeNode implements IOptional {
+class Optional extends MarkingTemporalRelationship implements IOptional {
+
+    /**  */
+    private static final long serialVersionUID = 1L;
 
     /**
@@ -30 +33 @@
      */
     Optional() {
-        super("Optional");
+        super("optionality");
     }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see de.ugoe.cs.tasktree.treeifc.TaskTreeNode#addChild(TaskTreeNode)
+    
+    /* (non-Javadoc)
+     * @see MarkingTemporalRelationship#setMarkedTask(ITask)
      */
     @Override
-    public void addChild(ITaskTreeNode child) {
-        // adding more children is not allowed
-        throw new UnsupportedOperationException
-            ("optionalities may not have a list of children. Use setChild() instead.");
-    }
-
-    /**
-     * TODO: comment
-     * 
-     * @param selection
-     * @return
-     */
-    public void setChild(ITaskTreeNode child) {
-        if (super.getChildren().size() > 0) {
-            super.removeChild(0);
+    protected void setMarkedTask(ITask markedTask) {
+        if (markedTask instanceof IOptional) {
+            throw new IllegalArgumentException
+                ("the marked task of an optional must not be an optional");
         }
-        super.addChild(child);
+        
+        super.setMarkedTask(markedTask);
     }
 
@@ -67 +58 @@
         return (Optional) super.clone();
     }
-
 }