Index: lams_central/src/java/org/lamsfoundation/lams/authoring/LearningDesignValidator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/Attic/LearningDesignValidator.java,v
diff -u -r1.4 -r1.5
--- lams_central/src/java/org/lamsfoundation/lams/authoring/LearningDesignValidator.java	24 Jan 2006 23:04:53 -0000	1.4
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/LearningDesignValidator.java	17 Feb 2006 02:06:18 -0000	1.5
@@ -12,6 +12,8 @@
 import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
+
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.wddx.FlashMessage;
 
 /**
@@ -32,14 +34,16 @@
 	protected LearningDesignDAO learningDesignDAO = null;
 	private Vector listOfValidationErrorDTOs = null;
 	private FlashMessage flashMessage;
+	protected MessageService messageService;
 	
 	/*
 	 * Default constructor
 	 * initialises the list of validation messages.
 	 */
-	public LearningDesignValidator(LearningDesignDAO learningDesignDAO)
+	public LearningDesignValidator(LearningDesignDAO learningDesignDAO, MessageService messageService)
 	{
 		this.learningDesignDAO = learningDesignDAO;
+		this.messageService = messageService;
 		listOfValidationErrorDTOs = new Vector();
 	}
 
@@ -200,11 +204,15 @@
 		Iterator activityIterator = activities.iterator();
 		while (activityIterator.hasNext())
 		{
+			String errorMessage = null;
 			Activity activity = (Activity)activityIterator.next();
 			checkIfGroupingRequired(activity);
 			validateGroupingIfGroupingIsApplied(activity);	
 			validateOptionalActivity(activity);
-			validateOptionsActivityOrderId(activity);			
+			validateOptionsActivityOrderId(activity);
+			if((errorMessage = activity.validateActivity()) != null) {
+				listOfValidationErrorDTOs.add(new ValidationErrorDTO(errorMessage, activity.getActivityUIID()));
+			}
 		}
 	}