Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java	1 Feb 2005 23:51:09 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java	7 Feb 2005 03:43:22 -0000	1.3
@@ -79,4 +79,7 @@
 	public void setActivities(Set activities) {
 		this.activities = activities;
 	}
+	public void addActivity(Activity activity){
+		this.activities.add(activity);
+	}
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	1 Feb 2005 23:48:24 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java	7 Feb 2005 03:41:01 -0000	1.3
@@ -17,9 +17,15 @@
 	 * @param activityId The activityId of the activity
 	 * @return Activity populated Activity object
 	 */
-	public Activity getActivityById(Long activityId);
+	public Activity getActivityByActivityId(Long activityId);
 	
 	/**
+	 * @param id The id of the activity
+	 * @return Activity populated Activity object
+	 */
+	public List getActivityByID(Integer id);
+	
+	/**
 	 * @param parentActivityId The activityId of the parent activity
 	 * @return Activity populated Activity object
 	 */
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	1 Feb 2005 23:49:28 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java	7 Feb 2005 03:45:24 -0000	1.3
@@ -17,6 +17,8 @@
 		
 	private static final String FIND_BY_PARENT = "from " + TABLENAME +" in class " + Activity.class.getName() + " where parent_activity_id=?" ;
 	
+	private static final String FIND_BY_ID = "from " + TABLENAME +" in class " + Activity.class.getName() + " where id=?" ;
+	
 	private static final String FIND_BY_LEARNING_DESIGN_ID = "from " + TABLENAME +
 															 " in class " + Activity.class.getName() +
 															 " where learning_design_id=?" ;
@@ -25,7 +27,7 @@
 	/* 
 	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivityById(java.lang.Long)
 	 */
-	public Activity getActivityById(Long activityId) {
+	public Activity getActivityByActivityId(Long activityId) {
 		return (Activity) super.find(Activity.class,activityId);		
 	}
 
@@ -48,7 +50,7 @@
 	 * @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IActivityDAO#getActivitiesByLearningDesignId(java.lang.Long)
 	 */
 	public List getActivitiesByLearningDesignId(Long learningDesignId) {
-		return this.getHibernateTemplate().find(FIND_BY_LEARNING_DESIGN_ID,learningDesignId);		
+		return this.getHibernateTemplate().find(FIND_BY_LEARNING_DESIGN_ID,learningDesignId);
 	}
 
 	/* 
@@ -76,4 +78,11 @@
 		this.getHibernateTemplate().delete(activity);
 	}
 
+	/* (non-Javadoc)
+	 * @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getActivityByID(java.lang.Integer)
+	 */
+	public List getActivityByID(Integer id) {
+		return this.getHibernateTemplate().find(FIND_BY_ID,id);		
+	}
+
 }