Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java
===================================================================
diff -u -rc8cc5634569081a7155793f609254e41fd632933 -r4c43b6fe5f48045c572b50bb279484abd09dcdda
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision c8cc5634569081a7155793f609254e41fd632933)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java	(.../Transition.java)	(revision 4c43b6fe5f48045c572b50bb279484abd09dcdda)
@@ -172,7 +172,7 @@
 		return this.toActivity;
 	}
 
-	public void setActivityByToActivityId(
+	public void setToActivity(
 			org.lamsfoundation.lams.learningdesign.Activity toActivity) {
 		this.toActivity = toActivity;
 	}
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -r4c43b6fe5f48045c572b50bb279484abd09dcdda
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java	(.../TestActivityDAO.java)	(revision 4c43b6fe5f48045c572b50bb279484abd09dcdda)
@@ -50,11 +50,11 @@
 		System.out.print("SIZE:" + list.size());
 	}
 	public void test(){
-		activity = activityDAO.getActivityByActivityId(new Long(18));
+		activity = activityDAO.getActivityByActivityId(new Long(18));		
 		Transition transition = activity.getTransitionTo();
 		System.out.println("Transition TO:" + transition.getTransitionId());
 		transition = activity.getTransitionFrom();
-		System.out.println("Transition FROM:" + transition.getActivityByToActivityId());
+		System.out.println("Transition FROM:" + transition.getToActivity());
 	}
 	public void testGetFirstDesignActivity(){
 		Activity activity = activityDAO.getActivityByUIID(new Integer(3),learningDesignDAO.getLearningDesignById(new Long(1)));
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
===================================================================
diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -r4c43b6fe5f48045c572b50bb279484abd09dcdda
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49)
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java	(.../TestLearningDesignDAO.java)	(revision 4c43b6fe5f48045c572b50bb279484abd09dcdda)
@@ -49,7 +49,7 @@
 		learningDesign = learningDesignDAO.getLearningDesignById(new Long(1));
 		Activity activity = learningDesign.calculateFirstActivity();
 		assertNotNull(activity.getActivityId());
-		long x = 15;
+		long x = 20;
 		assertEquals(activity.getActivityId().longValue(),x);
 	}
 	/* (non-Javadoc)