Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v diff -u -r1.33 -r1.34 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 3 Oct 2006 06:55:27 -0000 1.33 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 4 Oct 2006 00:15:41 -0000 1.34 @@ -95,6 +95,8 @@ import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.audit.IAuditService; +import org.lamsfoundation.lams.util.wddx.WDDXProcessor; +import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -1113,6 +1115,16 @@ chat.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); chat.setToolContentId(toolContentId); chat.setUpdateDate(now); + + try { + Boolean isReusable = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_REUSABLE); + chat.setLockOnFinished(isReusable != null ? ! isReusable.booleanValue() : true); + } catch (WDDXProcessorConversionException e) { + logger.error("Unable to content for activity "+chat.getTitle()+"properly due to a WDDXProcessorConversionException.",e); + throw new ToolException("Invalid import data format for activity "+chat.getTitle()+"- WDDX caused an exception. Some data from the design will have been lost. See log for more details."); + } + + // leave as empty, no need to set them to anything. //setChatAttachments(Set chatAttachments); //setChatSessions(Set chatSessions); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.49 -r1.50 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 3 Oct 2006 07:00:36 -0000 1.49 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 4 Oct 2006 00:12:49 -0000 1.50 @@ -2222,7 +2222,7 @@ Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_VOTE_ALLOW_POLL_NOMINATIONS); toolContentObj.setAllowText(bool!=null?bool:false); - bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_MB_REUSABLE); + bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_REUSABLE); toolContentObj.setLockOnFinish(bool!=null?bool:true); Integer maxCount = WDDXProcessor.convertToInteger(importValues, ToolContentImport102Manager.CONTENT_VOTE_MAXCHOOSE);