Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java
===================================================================
diff -u -r86a0f186099637fc974445894c5462d60420f10d -r071487f6899af05f193e86bb2602446837921c17
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java	(.../LearningLibraryDTO.java)	(revision 86a0f186099637fc974445894c5462d60420f10d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java	(.../LearningLibraryDTO.java)	(revision 071487f6899af05f193e86bb2602446837921c17)
@@ -22,11 +22,13 @@
  */
 package org.lamsfoundation.lams.learningdesign.dto;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Vector;
 import java.util.List;
 
 import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.ComplexActivity;
 import org.lamsfoundation.lams.learningdesign.LearningLibrary;
 import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 
@@ -111,14 +113,39 @@
 		return templateActivities;
 	} 
 	
-	public Vector populateActivities(Iterator iterator){		
+  /* public Vector populateActivities(Iterator iterator){		
 		Vector activities = new Vector();
 		while(iterator.hasNext()){
 			Activity activity = (Activity)iterator.next();
 			activities.add(activity.getLibraryActivityDTO());
 		}		
 		return activities;		
 	}
+	*/
 	
+	public Vector populateActivities(Iterator iterator)
+	{
+	    Vector activities = new Vector();
+	    Vector childActivities = null;
+		while(iterator.hasNext()){
+			Activity object = (Activity) iterator.next();
+			
+			if(object.isComplexActivity()){ //parallel, sequence or options activity
+				ComplexActivity complexActivity = (ComplexActivity)object;
+				Iterator childIterator = complexActivity.getActivities().iterator();
+				childActivities = new Vector();
+				while(childIterator.hasNext()){
+					Activity activity =(Activity)childIterator.next();
+					childActivities.add(activity.getLibraryActivityDTO());					
+				}				
+				activities.add(complexActivity.getLibraryActivityDTO());
+				activities.addAll(childActivities);
+			}else{
+				activities.add(object.getLibraryActivityDTO());
+			}			
+		}
+		return activities;
+	}
 	
+	
 }