Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java,v
diff -u -r1.3 -r1.4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	17 Feb 2005 05:32:58 -0000	1.3
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	18 Feb 2005 05:11:46 -0000	1.4
@@ -29,7 +29,7 @@
      * @param user the user who owns the learner progress data.
      * @return the user's progress data
      */
-    public LearnerProgress getLearnerProgressByLeaner(final User learner,
+    public LearnerProgress getLearnerProgressByLearner(final User learner,
                                                       final Lesson lesson);
         
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	17 Feb 2005 05:32:57 -0000	1.4
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	18 Feb 2005 05:11:46 -0000	1.5
@@ -58,7 +58,7 @@
     /**
      * @see org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO#getLearnerProgressByLeaner(org.lamsfoundation.lams.usermanagement.User)
      */
-    public LearnerProgress getLearnerProgressByLeaner(final User learner, final Lesson lesson)
+    public LearnerProgress getLearnerProgressByLearner(final User learner, final Lesson lesson)
     {
         HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory());
 
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/dao/Attic/TestLearnerProgressDAO.java,v
diff -u -r1.3 -r1.4
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java	18 Feb 2005 01:14:48 -0000	1.3
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java	18 Feb 2005 05:14:18 -0000	1.4
@@ -67,15 +67,15 @@
 
     public void testGetNullLearnerProgressByLearner()
     {
-        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson);
         assertNull("should not get any progress data",progress);
     }
 
     public void testSaveLearnerProgress() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
         
-        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson);
         assertLearnerProgressInitialization(progress);
         
         super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
@@ -91,14 +91,14 @@
         
         super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
         super.getSession().flush();
-        LearnerProgress nullProgress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+        LearnerProgress nullProgress= learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson);
         assertNull("should not get any progress data",nullProgress);
 
     }
     public void testGetLearnerProgressByLeaner() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
-        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson);
         assertLearnerProgressInitialization(progress);
         super.learnerProgressDao.deleteLearnerProgress(testLearnerProgress);
         super.getSession().flush();
@@ -121,7 +121,7 @@
     public void testUpdateLearnerProgress() throws HibernateException
     {
         super.learnerProgressDao.saveLearnerProgress(this.testLearnerProgress);
-        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+        LearnerProgress progress= learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson);
 
         Activity firstActivity = this.testLesson.getLearningDesign().getFirstActivity();
         
@@ -131,7 +131,7 @@
         
         super.learnerProgressDao.updateLearnerProgress(progress);
         
-        LearnerProgress updatedProgress= learnerProgressDao.getLearnerProgressByLeaner(testUser,testLesson);
+        LearnerProgress updatedProgress= learnerProgressDao.getLearnerProgressByLearner(testUser,testLesson);
         assertLearnerProgressInitialization(progress);
         assertEquals("verify completed activity",2,updatedProgress.getCompletedActivities().size());
         assertEquals("verify attempted activity",1,updatedProgress.getAttemptedActivities().size());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.5 -r1.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	17 Feb 2005 03:00:36 -0000	1.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	18 Feb 2005 05:15:20 -0000	1.6
@@ -76,12 +76,12 @@
      */
     public LearnerProgress getProgress(User learner, Lesson lesson)
     {
-        return lessonDAO.getLearnerProgress(learner, lesson);
+        return learnerProgressDAO.getLearnerProgressByLearner(learner, lesson);
     }
     
 
     public LearnerProgress chooseActivity(User learner, Lesson lesson, Activity activity) {
-    	LearnerProgress progress = lessonDAO.getLearnerProgress(learner, lesson);
+    	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learner, lesson);
     	progress.setProgressState(activity, LearnerProgress.ACTIVITY_ATTEMPTED);
     	learnerProgressDAO.saveLearnerProgress(progress);
     	return progress;