Changeset 467

Timestamp:

07/25/12 11:58:00 (12 years ago)

Author:

pharms

Message:

corrected implementation of clone

Location:

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl

Files:

• InteractionTaskImpl.java (modified) (1 diff)
• IterationImpl.java (modified) (1 diff)
• SelectionImpl.java (modified) (2 diffs)
• SequenceImpl.java (modified) (2 diffs)
• TaskTreeImpl.java (modified) (1 diff)
• TaskTreeNodeImpl.java (modified) (2 diffs)
• TextInputInteractionTaskImpl.java (modified) (2 diffs)

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/InteractionTaskImpl.java

@@ -98 +98 @@
   //-----------------------------------------------------------------------------------------------
   @Override
-  public TaskTreeNode clone()
+  public InteractionTaskImpl clone()
   {
-    return new InteractionTaskImpl(mGUIElement, mInteraction);
+    // GUI element and interaction are unchangeable and do not need to be cloned
+    return (InteractionTaskImpl) super.clone();
   }
 

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/IterationImpl.java

@@ -67 +67 @@
   //-----------------------------------------------------------------------------------------------
   @Override
-  public TaskTreeNode clone()
+  public IterationImpl clone()
   {
-    IterationImpl clone = new IterationImpl();
-    clone.setDescription(super.getDescription());
-    
-    if (super.getChildren().size() > 0)
-    {
-      clone.setChild(super.getChildren().get(0));
-    }
-    return clone;
+    return (IterationImpl) super.clone();
   }
 

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/SelectionImpl.java

@@ -9 +9 @@
 
 import de.ugoe.cs.quest.tasktrees.treeifc.Selection;
-import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 
 //-------------------------------------------------------------------------------------------------
@@ -40 +39 @@
   //-----------------------------------------------------------------------------------------------
   @Override
-  public TaskTreeNode clone()
+  public SelectionImpl clone()
   {
-    SelectionImpl clone = new SelectionImpl();
-    clone.setDescription(super.getDescription());
-    
-    for (TaskTreeNode child : getChildren())
-    {
-      clone.addChild(child);
-    }
-    
-    return clone;
+    return (SelectionImpl) super.clone();
   }
 

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/SequenceImpl.java

@@ -9 +9 @@
 
 import de.ugoe.cs.quest.tasktrees.treeifc.Sequence;
-import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 
 //-------------------------------------------------------------------------------------------------
@@ -53 +52 @@
   public SequenceImpl clone()
   {
-    SequenceImpl clone = new SequenceImpl();
-    clone.setDescription(super.getDescription());
-    
-    for (TaskTreeNode child : getChildren())
-    {
-      clone.addChild(child);
-    }
-    
-    return clone;
+    return (SequenceImpl) super.clone();
   }
 

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeImpl.java

@@ -101 +101 @@
   }
 
+  //-----------------------------------------------------------------------------------------------
+  /* (non-Javadoc)
+   * @see java.lang.Object#clone()
+   */
+  //-----------------------------------------------------------------------------------------------
+  @Override
+  public TaskTreeImpl clone()
+  {
+    TaskTreeImpl clone = null;
+    try
+    {
+      clone = (TaskTreeImpl) super.clone();
+      
+      clone.mRootNode = mRootNode.clone();
+      
+      // the clone will create the task map itself, when it is first retrieved
+      clone.mTaskMap = null;
+      
+    }
+    catch (CloneNotSupportedException e)
+    {
+      // this should never happen. Therefore simply dump the exception
+      e.printStackTrace();
+    }
+    
+    return clone;
+  }
+
 }

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeImpl.java

@@ -23 +23 @@
  */
 //-------------------------------------------------------------------------------------------------
-public abstract class TaskTreeNodeImpl implements TaskTreeNode
+public class TaskTreeNodeImpl implements TaskTreeNode
 {
   /** */
@@ -282 +282 @@
   //-----------------------------------------------------------------------------------------------
   @Override
-  public abstract TaskTreeNode clone();
+  public TaskTreeNode clone()
+  {
+    TaskTreeNodeImpl clone = null;
+    try
+    {
+      clone = (TaskTreeNodeImpl) super.clone();
+      
+      clone.mChildren = new ArrayList<TaskTreeNode>();
+      
+      for (TaskTreeNode child : mChildren)
+      {
+        clone.mChildren.add(child.clone());
+      }
+      
+    }
+    catch (CloneNotSupportedException e)
+    {
+      // this should never happen. Therefore simply dump the exception
+      e.printStackTrace();
+    }
+    
+    return clone;
+  }
 
 }

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TextInputInteractionTaskImpl.java

@@ -10 +10 @@
 import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
 import de.ugoe.cs.quest.eventcore.userinteraction.TextInput;
-import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.TextInputInteractionTask;
 
@@ -48 +47 @@
   public TextInputInteractionTaskImpl clone()
   {
-    TextInputInteractionTaskImpl clone = new TextInputInteractionTaskImpl(super.getGUIElement());
-    clone.setDescription(super.getDescription());
-    clone.setEnteredText(this.getEnteredText());
-    
-    for (TaskTreeNode child : getChildren())
-    {
-      clone.addChild(child);
-    }
-    
-    return clone;
+    // entered text is unchangeable and does not need to be cloned
+    return (TextInputInteractionTaskImpl) super.clone();
   }