Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r556a2d03d689f554188fc28061dc18b5f7f96fc7 -r407214d77fc0fb7b0d7ba0c2eeaaadb404b8b1d2
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
diff -u -r03392c988a23f5e9129967f8ae692488213632fe -r407214d77fc0fb7b0d7ba0c2eeaaadb404b8b1d2
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision 03392c988a23f5e9129967f8ae692488213632fe)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision 407214d77fc0fb7b0d7ba0c2eeaaadb404b8b1d2)
@@ -328,14 +328,14 @@
 	 * This method ensures that the order id of the optional activities
 	 * start from 1, are sequential and do not contain any duplicates.
 	 * It will iterate through the child activities of the OptionalActivity,
-	 * and compare the current activity id with the previous activity id.
-	 * The currentActivityId should be 1 greater than the previous activity id.
+	 * and compare the current activity order id with the previous activity order id.
+	 * The currentActivityId should be 1 greater than the previous activity order id.
 	 * @param parentActivity
 	 */
 	private void validateOptionsActivityOrderId(Activity parentActivity, Vector listOfValidationErrorDTOs)
 	{
-		Long thisActivityId = null;
-		Long previousActivityId = null;
+		Integer thisActivityOrderId = null;
+		Integer previousActivityOrderId = null;
 		boolean validOrderId = true;
 		if(parentActivity.isOptionsActivity())
 		{
@@ -345,21 +345,21 @@
 			while (i.hasNext())
 			{
 				Activity childActivity = (Activity)i.next();
-				thisActivityId= childActivity.getActivityId();
-				if (previousActivityId != null)
+				thisActivityOrderId= childActivity.getOrderId();
+				if (previousActivityOrderId != null)
 				{
 					//compare the two numbers
-					if (thisActivityId.longValue() != (previousActivityId.longValue() + 1))
+					if (thisActivityOrderId.longValue() != (previousActivityOrderId.longValue() + 1))
 						validOrderId = validOrderId && false;
 					
 				}
 				else
 				{
 					//this is the first activity, since the previousActivityId is null
-					if(thisActivityId.longValue()!= 1)
+					if(thisActivityOrderId.longValue()!= 1)
 						validOrderId = validOrderId && false;
 				}
-				previousActivityId = thisActivityId; 
+				previousActivityOrderId = thisActivityOrderId; 
 			}
 			
 			if (!validOrderId)