Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.7 -r1.8
--- lams_learning/conf/language/lams/ApplicationResources.properties	15 Sep 2007 05:11:20 -0000	1.7
+++ lams_learning/conf/language/lams/ApplicationResources.properties	13 Nov 2007 11:50:26 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.7 -r1.8
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	15 Sep 2007 05:11:20 -0000	1.7
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	13 Nov 2007 11:50:26 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java,v
diff -u -r1.4 -r1.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java	12 Jul 2007 00:59:02 -0000	1.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java	13 Nov 2007 11:50:18 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.28 -r1.29
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	27 Jul 2007 05:13:41 -0000	1.28
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	13 Nov 2007 11:50:44 -0000	1.29
@@ -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 1.2 refers to a dead (removed) revision in file `lams_learning/web/sequence/empty.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?