Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
===================================================================
diff -u -r06dd563d92f6e9e88c76b708f5d9aeb3a61d4dcb -rff293679fc8795a794ba6226076e1775f5aa0f1f
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	(.../ActivityAction.java)	(revision 06dd563d92f6e9e88c76b708f5d9aeb3a61d4dcb)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	(.../ActivityAction.java)	(revision ff293679fc8795a794ba6226076e1775f5aa0f1f)
@@ -23,8 +23,6 @@
 
 import javax.servlet.http.*;
 
-import java.util.*;
-
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
 import org.lamsfoundation.lams.learning.web.bean.SessionBean;
@@ -105,7 +103,7 @@
 		{
 			Long activityId = form.getActivityId();
 			if (activityId != null) 
-				activity = getActivity(activityId.longValue(), learnerProgress);
+			    activity = getLearnerService().getActivity(activityId);
 		}
 		return activity;
 	}
@@ -122,22 +120,6 @@
 	}
 	
 	
-	/** TODO: replace method
-	 * A quick method to get an activity from within a progress. This method is
-	 * temporary.
-	 */
-	private Activity getActivity(long activityId, LearnerProgress progress) {
-		Set activities = progress.getLesson().getLearningDesign().getActivities();
-		Iterator i = activities.iterator();
-		while (i.hasNext()) {
-			Activity activity = (Activity)i.next();
-			if (activity.getActivityId().longValue() == activityId) {
-				return activity;
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * Gets the session bean from session.
 	 * @return SessionBean for this request, null if no session.