Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	16 Feb 2005 22:03:26 -0000	1.4
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	17 Feb 2005 01:02:17 -0000	1.5
@@ -82,26 +82,30 @@
 			  transitionFrom,
               activities);
     }
+    /**
+     * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment 
+     * 
+     * @param originalActivity The activity that needs to be deep-copied
+     * @return ParallelActivity Returns a deep-copy of the originalActivity
+     */
     public static ParallelActivity createCopy(ParallelActivity originalActivity){
     	
     	ParallelActivity newParallelActivity = new ParallelActivity();
     	
     	newParallelActivity.setActivityUIID(originalActivity.getActivityUIID());
     	newParallelActivity.setDescription(originalActivity.getDescription());
     	newParallelActivity.setTitle(originalActivity.getTitle());
+    	newParallelActivity.setHelpText(originalActivity.getHelpText());
     	newParallelActivity.setXcoord(originalActivity.getXcoord());
     	newParallelActivity.setYcoord(originalActivity.getYcoord());
+    	newParallelActivity.setActivityTypeId(originalActivity.getActivityTypeId());
     	newParallelActivity.setDefineLater(originalActivity.getDefineLater());
+    	newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary());
     	newParallelActivity.setCreateDateTime(new Date());
     	newParallelActivity.setOfflineInstructions(originalActivity.getOfflineInstructions());
-    	newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary());
-    	newParallelActivity.setActivityTypeId(originalActivity.getActivityTypeId());
-    	newParallelActivity.setActivities(new HashSet());
-    	
-    	/** TODO */
-    	//newParallelActivity.setTransitionTo();
-		//newParallelActivity.setTransitionFrom();
-    	
+    	newParallelActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());    	
+    	newParallelActivity.setLibraryActivity(originalActivity.getLibraryActivity());		
+    	newParallelActivity.setActivities(new HashSet());    	
     	return newParallelActivity;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java,v
diff -u -r1.3 -r1.4
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	16 Feb 2005 22:03:26 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	17 Feb 2005 01:06:05 -0000	1.4
@@ -84,25 +84,30 @@
 			  transitionFrom,
               activities);
     }
+    
+    /**
+     * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment
+     * 
+     * @param originalActivity The activity that needs to be deep-copied
+     * @return SequenceActivity Returns a deep-copy of the originalActivity
+     */
     public static SequenceActivity createCopy(SequenceActivity originalActivity){
     	SequenceActivity newSequenceActivity = new SequenceActivity();
     	
     	newSequenceActivity.setActivityUIID(originalActivity.getActivityUIID());
     	newSequenceActivity.setDescription(originalActivity.getDescription());
     	newSequenceActivity.setTitle(originalActivity.getTitle());
+    	newSequenceActivity.setHelpText(originalActivity.getHelpText());
     	newSequenceActivity.setXcoord(originalActivity.getXcoord());
     	newSequenceActivity.setYcoord(originalActivity.getYcoord());
+    	newSequenceActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary());
     	newSequenceActivity.setDefineLater(originalActivity.getDefineLater());
     	newSequenceActivity.setCreateDateTime(new Date());
     	newSequenceActivity.setOfflineInstructions(originalActivity.getOfflineInstructions());
-    	newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary());
-    	newSequenceActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newSequenceActivity.setLibraryActivity(originalActivity.getLibraryActivity());
+		newSequenceActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());    	
     	newSequenceActivity.setActivities(new HashSet());
-    	
-    	/** TODO */
-    	//newSequenceActivity.setTransitionTo();
-		//newSequenceActivity.setTransitionFrom();
-    	
     	return newSequenceActivity;
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	16 Feb 2005 22:07:09 -0000	1.5
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	17 Feb 2005 00:56:08 -0000	1.6
@@ -2,10 +2,10 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
-
 import org.lamsfoundation.lams.tool.Tool;
 
 /**
@@ -14,19 +14,15 @@
 public class ToolActivity extends SimpleActivity implements Serializable
 {
     
-    /**
-     * Holds value of property toolContentId.
-     */
+    /** Holds value of property toolContentId. */
     private Long toolContentId;
     
-    /**
-     * Holds value of property tool.
-     */
+    /** Holds value of property tool.*/
     private Tool tool;
     
     /** List of sessions associated with this ToolActivity */
     private Set toolSessions;
-    
+       
     /** full constructor */
     public ToolActivity(Long activityId,
             Integer id,
@@ -74,8 +70,7 @@
     }
     
     /** default constructor */
-    public ToolActivity()
-    {
+    public ToolActivity(){
     }
     
     /** minimal constructor */
@@ -105,28 +100,40 @@
         this.tool = tool;
         this.toolContentId = toolContentId;
     }
-    public static ToolActivity createCopy(ToolActivity originalActivity){
-    	
+    
+    /**
+     * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment 
+     * 
+     * @param originalActivity The activity that needs to be deep-copied
+     * @return ToolActivity Returns a deep-copy of the originalActivity
+     */
+    public static ToolActivity createCopy(ToolActivity originalActivity){    	
     	ToolActivity newToolActivity = new ToolActivity();
-    	newToolActivity.setActivityUIID(originalActivity.getActivityUIID());
+    	 
+		newToolActivity.setTool(originalActivity.getTool());
+		
+		/* TODO Generate a new toolContentID for this new ToolActivity
+		*  For now setting it to the contentID of the old activity
+		*/
+		newToolActivity.setToolContentId(originalActivity.getToolContentId());
+    	
+		newToolActivity.setActivityUIID(originalActivity.getActivityUIID());
     	newToolActivity.setDescription(originalActivity.getDescription());
     	newToolActivity.setTitle(originalActivity.getTitle());
+    	newToolActivity.setHelpText(originalActivity.getHelpText());
     	newToolActivity.setXcoord(originalActivity.getXcoord());
     	newToolActivity.setYcoord(originalActivity.getYcoord());
+    	newToolActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+    	newToolActivity.setOrderId(originalActivity.getOrderId());
     	newToolActivity.setDefineLater(originalActivity.getDefineLater());
+    	newToolActivity.setLearningLibrary(originalActivity.getLearningLibrary());
     	newToolActivity.setCreateDateTime(new Date());
     	newToolActivity.setOfflineInstructions(originalActivity.getOfflineInstructions());
-    	newToolActivity.setLearningLibrary(originalActivity.getLearningLibrary());
-    	newToolActivity.setActivityTypeId(originalActivity.getActivityTypeId());
-    	/**
-    	 * TODO calculate how these two values would be set for COPY 
-    	 * */
-    	//newToolActivity.setTransitionTo();
-    	//newToolActivity.setTransitionFrom();
-    	newToolActivity.setTool(originalActivity.getTool());    	
+    	newToolActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage());
+    	newToolActivity.setLibraryActivity(originalActivity.getLibraryActivity());
+    	newToolActivity.setToolSessions(new HashSet());    	    	
     	return newToolActivity;
-    }
-    
+    }    
     public String toString()
     {
         return new ToStringBuilder(this)
@@ -185,5 +192,5 @@
 	 */
 	public void setToolSessions(Set toolSessions) {
 		this.toolSessions = toolSessions;
-	}
+	}	
 }