Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	14 Jul 2005 02:23:18 -0000	1.1
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerAction.java	15 Jul 2005 07:06:00 -0000	1.2
@@ -84,8 +84,8 @@
     public ActionForward finish(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
 		
 	  NbLearnerForm learnerForm = (NbLearnerForm)form;
-	  Long toolSessionID = learnerForm.getToolSessionID();
-	  Long userID = learnerForm.getUserID();
+	  Long toolSessionID = learnerForm.getToolSessionId();
+	  Long userID = learnerForm.getUserId();
 	  INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
 	 /** TODO: learnerServiceProxy causes an exception, fix this up later */
 	  // ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
@@ -103,7 +103,7 @@
 		  
 		  //Notify the progress engine of the user's completion
 		  User user = new User();
-		  user.setUserId(new Integer(learnerForm.getUserID().toString()));
+		  user.setUserId(new Integer(learnerForm.getUserId().toString()));
 		  /** TODO: cannot use this yet as learnerservice causes an exception, fix this up later */
 		 // learnerService.completeToolSession(learnerForm.getToolSessionID(), user);
 		  
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java	14 Jul 2005 02:23:18 -0000	1.1
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerForm.java	15 Jul 2005 07:06:00 -0000	1.2
@@ -48,11 +48,11 @@
     
     private String content;
     
-    private Long userID;
+    private Long userId;
     
-    private Long toolSessionID;
+    private Long toolSessionId;
     
-    private Long toolContentID;
+    private Long toolContentId;
     
     private String method;
     
@@ -63,38 +63,38 @@
     /**
      * @return Returns the toolContentID.
      */
-    public Long getToolContentID() {
-        return toolContentID;
+    public Long getToolContentId() {
+        return toolContentId;
     }
     /**
      * @param toolContentID The toolContentID to set.
      */
-    public void setToolContentID(Long toolContentID) {
-        this.toolContentID = toolContentID;
+    public void setToolContentId(Long toolContentID) {
+        this.toolContentId = toolContentID;
     }
     /**
      * @return Returns the toolSessionID.
      */
-    public Long getToolSessionID() {
-        return toolSessionID;
+    public Long getToolSessionId() {
+        return toolSessionId;
     }
     /**
      * @param toolSessionID The toolSessionID to set.
      */
-    public void setToolSessionID(Long toolSessionID) {
-        this.toolSessionID = toolSessionID;
+    public void setToolSessionId(Long toolSessionID) {
+        this.toolSessionId = toolSessionID;
     }
     /**
      * @return Returns the userID.
      */
-    public Long getUserID() {
-        return userID;
+    public Long getUserId() {
+        return userId;
     }
     /**
      * @param userID The userID to set.
      */
-    public void setUserID(Long userID) {
-        this.userID = userID;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
     /**
      * @return Returns the content.
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	14 Jul 2005 02:23:18 -0000	1.1
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbLearnerStarterAction.java	15 Jul 2005 07:06:00 -0000	1.2
@@ -90,9 +90,9 @@
         ActionMessages message = new ActionMessages();
         INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext());
         
-        Long userId = learnerForm.getUserID();
-        Long toolSessionId = learnerForm.getToolSessionID();
-        Long toolContentId = learnerForm.getToolContentID();
+        Long userId = learnerForm.getUserId();
+        Long toolSessionId = learnerForm.getToolSessionId();
+        Long toolContentId = learnerForm.getToolContentId();
         
         if(userId == null || toolSessionId ==null || toolContentId==null)
 		{
@@ -163,7 +163,7 @@
         /* will show a different screen if defineLater flag is set and running in preview mode */
         NbLearnerForm nbForm = (NbLearnerForm)form;
         NbLearnerUtil.cleanSession(request);
-        Long toolContentId = nbForm.getToolContentID();
+        Long toolContentId = nbForm.getToolContentId();
         saveMessages(request, null);
         
         ActionMessages message = new ActionMessages();