Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	16 May 2006 02:45:45 -0000	1.6
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java	8 Jun 2006 02:18:42 -0000	1.7
@@ -364,20 +364,13 @@
 	 * @return
 	 */
 	private void populateChat(Chat chat, AuthoringForm authForm) {
-		// Extract data from AuthoringForm
-		String title = (String) authForm.getTitle();
-		String instructions = (String) authForm.getInstructions();
-		String online_instruction = (String) authForm.getOnlineInstruction();
-		String offline_instruction = (String) authForm.getOfflineInstruction();
-		String value = (String) authForm.getLockOnFinished();
-		boolean lock_on_finished = StringUtils.isEmpty(value) ? false : true;
-
-		// update chat object.
-		chat.setTitle(title);
-		chat.setInstructions(instructions);
-		chat.setOfflineInstructions(offline_instruction);
-		chat.setOnlineInstructions(online_instruction);
-		chat.setLockOnFinished(lock_on_finished);
+		chat.setTitle(authForm.getTitle());
+		chat.setInstructions(authForm.getInstructions());
+		chat.setOfflineInstructions(authForm.getOnlineInstruction());
+		chat.setOnlineInstructions(authForm.getOfflineInstruction());
+		chat.setLockOnFinished(authForm.isLockOnFinished());
+		chat.setFilteringEnabled(authForm.isFilteringEnabled());
+		chat.setFilterKeywords(authForm.getFilterKeywords());
 	}
 
 	/**
@@ -393,6 +386,9 @@
 		authForm.setInstructions(chat.getInstructions());
 		authForm.setOnlineInstruction(chat.getOnlineInstructions());
 		authForm.setOfflineInstruction(chat.getOfflineInstructions());
+		authForm.setLockOnFinished(chat.getLockOnFinished());
+		authForm.setFilteringEnabled(chat.getFilteringEnabled());
+		authForm.setFilterKeywords(chat.getFilterKeywords());
 		// TODO add the rest.
 	}