Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r9795b2550b232127bf3b88f05a760d6b5ee5a082 -r2c1bd1d2babb133e68dd1b56f41f2d06897084c4
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9795b2550b232127bf3b88f05a760d6b5ee5a082)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2c1bd1d2babb133e68dd1b56f41f2d06897084c4)
@@ -79,7 +79,6 @@
 label.branching.refresh.message  =Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute.
 label.branching.preview.message  =You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching.
 label.branching.title  =Branching
-label.sequence.empty.message  =There are no activities to complete in this part of the lesson. Click Next to continue.
 
 
 #======= End labels: Exported 74 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r9795b2550b232127bf3b88f05a760d6b5ee5a082 -r2c1bd1d2babb133e68dd1b56f41f2d06897084c4
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 9795b2550b232127bf3b88f05a760d6b5ee5a082)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2c1bd1d2babb133e68dd1b56f41f2d06897084c4)
@@ -79,7 +79,6 @@
 label.branching.refresh.message  =Click Next if you are told that the branch has been selected. This page will refresh automatically in 1 minute.
 label.branching.preview.message  =You have reached a branching activity. As you are in preview you can select which branch to preview then click Choose. Click Finish to skip the branching and continue with the next activity after the branching.
 label.branching.title  =Branching
-label.sequence.empty.message  =There are no activities to complete in this part of the lesson. Click Next to continue.
 
 
 #======= End labels: Exported 74 labels for en AU =====
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
===================================================================
diff -u -r5863520d75343b47f77b05ad3bd7045a9a39af49 -r2c1bd1d2babb133e68dd1b56f41f2d06897084c4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java	(.../SequenceActivityAction.java)	(revision 5863520d75343b47f77b05ad3bd7045a9a39af49)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java	(.../SequenceActivityAction.java)	(revision 2c1bd1d2babb133e68dd1b56f41f2d06897084c4)
@@ -24,13 +24,16 @@
 /* $$Id$$ */	
 package org.lamsfoundation.lams.learning.web.action;
 
+import java.io.UnsupportedEncodingException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
+import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 
 import org.lamsfoundation.lams.learningdesign.Activity;
@@ -39,7 +42,6 @@
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
-import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * Action class to display a sequence activity.
@@ -51,21 +53,21 @@
  * @struts:action path="/SequenceActivity" name="activityForm"
  *                validate="false" scope="request"
  * 
- * @struts:action-forward name="empty" path=".sequenceActivityEmpty"
- * 
  */
 public class SequenceActivityAction extends ActivityAction {
 	
 
 	/**
 	 * Gets an sequence activity from the request (attribute) and forwards to
 	 * either the first activity in the sequence activity or the "empty" JSP.
+	 * @throws UnsupportedEncodingException 
+	 * @throws LearnerServiceException 
 	 */
 	public ActionForward execute(
 			ActionMapping mapping,
 			ActionForm actionForm,
 			HttpServletRequest request,
-			HttpServletResponse response) {
+			HttpServletResponse response) throws LearnerServiceException, UnsupportedEncodingException {
 
 		ActivityForm form = (ActivityForm)actionForm;
 		ActivityMapping actionMappings = LearningWebUtil.getActivityMapping(this.getServlet().getServletContext());
@@ -88,16 +90,15 @@
 			learnerProgress = learnerService.chooseActivity(learnerId, learnerProgress.getLesson().getLessonId(), firstActivityInSequence);
 			forward = actionMappings.getActivityForward(firstActivityInSequence, learnerProgress, true);
 			LearningWebUtil.putActivityInRequest(request, firstActivityInSequence, learnerService);
+			LearningWebUtil.setupProgressInRequest(form, request, learnerProgress);
+	        return forward;
 		} else {
-			request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activity.getActivityId());
-			request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
-			request.setAttribute(AttributeNames.PARAM_LESSON_ID, learnerProgress.getLesson().getLessonId());
-			request.setAttribute(AttributeNames.PARAM_LEARNER_PROGRESS_ID, learnerProgress.getLearnerProgressId());
-			forward = mapping.findForward("empty");
+		    // No activities exist in the sequence, so go to the next activity.
+	        return LearningWebUtil.completeActivity(request, response,
+			    		actionMappings, learnerProgress, activity, 
+			    		learnerId, learnerService, true);
 		}
 
-		LearningWebUtil.setupProgressInRequest(form, request, learnerProgress);
-        return forward;
        	
 	}
 	
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r0d3e22cf043f3f9498e1aae50704cd5cb5449c63 -r2c1bd1d2babb133e68dd1b56f41f2d06897084c4
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 0d3e22cf043f3f9498e1aae50704cd5cb5449c63)
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 2c1bd1d2babb133e68dd1b56f41f2d06897084c4)
@@ -143,8 +143,5 @@
 		<put name="pageTitleKey" value="label.branching.title" />
 		<put name="body" value="/branching/preview.jsp"/>
 	</definition>
-	<definition name=".sequenceActivityEmpty" extends=".layout">
-		<put name="body" value="/sequence/empty.jsp"/>
-	</definition>
 
 </tiles-definitions>
\ No newline at end of file
Fisheye: Tag 2c1bd1d2babb133e68dd1b56f41f2d06897084c4 refers to a dead (removed) revision in file `lams_learning/web/sequence/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?