Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -ref1856fa9aad85d21a7a72900bb93040c821032b --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 250486f86b66ac04cece0001879c3dc39c96ed98) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision ef1856fa9aad85d21a7a72900bb93040c821032b) @@ -624,8 +624,8 @@ activity.setActivityUIID(WDDXProcessor.convertToInteger(activityDetails,WDDXTAGS.ACTIVITY_UIID)); if (keyExists(activityDetails, WDDXTAGS.DESCRIPTION)) activity.setDescription(WDDXProcessor.convertToString(activityDetails,WDDXTAGS.DESCRIPTION)); - if (keyExists(activityDetails, WDDXTAGS.TITLE)) - activity.setTitle(WDDXProcessor.convertToString(activityDetails,WDDXTAGS.TITLE)); + if (keyExists(activityDetails, WDDXTAGS.ACTIVITY_TITLE)) + activity.setTitle(WDDXProcessor.convertToString(activityDetails,WDDXTAGS.ACTIVITY_TITLE)); if (keyExists(activityDetails, WDDXTAGS.HELP_TEXT)) activity.setHelpText(WDDXProcessor.convertToString(activityDetails,WDDXTAGS.HELP_TEXT)); if (keyExists(activityDetails, WDDXTAGS.XCOORD)) Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r9b61c8c869247e61798d7e2303c5f12f6c3ce46c -ref1856fa9aad85d21a7a72900bb93040c821032b Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u -r64f3c42cf2bf0f73d35618cc3a11f7945782b3ac -ref1856fa9aad85d21a7a72900bb93040c821032b --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision 64f3c42cf2bf0f73d35618cc3a11f7945782b3ac) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (.../AuthoringActivityDTO.java) (revision ef1856fa9aad85d21a7a72900bb93040c821032b) @@ -58,7 +58,7 @@ private String description; /** Title of the activity*/ - private String title; + private String activityTitle; /** Help text for the activity*/ private String helpText; @@ -214,7 +214,7 @@ this.activityID = activityID; this.activityUIID = activityUIID; this.description = description; - this.title = title; + this.activityTitle = title; this.helpText = helpText; this.xCoord = xcoord; this.yCoord = ycoord; @@ -257,7 +257,7 @@ this.activityID = activity.getActivityId(); this.activityUIID = activity.getActivityUIID(); this.description = activity.getDescription(); - this.title = activity.getTitle(); + this.activityTitle = activity.getTitle(); this.helpText = activity.getHelpText(); this.xCoord = activity.getXcoord(); this.yCoord = activity.getYcoord(); @@ -545,8 +545,8 @@ /** * @return Returns the title. */ - public String getTitle() { - return title; + public String getActivityTitle() { + return activityTitle; } /** * @return Returns the toolContentID. @@ -778,9 +778,9 @@ /** * @param title The title to set. */ - public void setTitle(String title) { + public void setActivityTitle(String title) { if(!title.equals(WDDXTAGS.STRING_NULL_VALUE)) - this.title = title; + this.activityTitle = title; } /** * @param toolContentID The toolContentID to set. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -r51079e2223d1b2a85453024ce4e17afd870be14a -ref1856fa9aad85d21a7a72900bb93040c821032b --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 51079e2223d1b2a85453024ce4e17afd870be14a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision ef1856fa9aad85d21a7a72900bb93040c821032b) @@ -320,7 +320,7 @@ if(activity.getActivityTypeID().intValue() != Activity.TOOL_ACTIVITY_TYPE) continue; ToolContentManager contentManager = (ToolContentManager) findToolService(toolDAO.getToolByID(activity.getToolID())); - log.debug("Tool export content : " + activity.getTitle() +" by contentID :" + activity.getToolContentID()); + log.debug("Tool export content : " + activity.getActivityTitle() +" by contentID :" + activity.getToolContentID()); try{ contentManager.exportToolContent(activity.getToolContentID(),contentDir); }catch (Exception e) { @@ -452,7 +452,7 @@ //Invoke tool's importToolContent() method. try{ ToolContentManager contentManager = (ToolContentManager) findToolService(newTool); - log.debug("Tool begin to import content : " + activity.getTitle() +" by contentID :" + activity.getToolContentID()); + log.debug("Tool begin to import content : " + activity.getActivityTitle() +" by contentID :" + activity.getToolContentID()); contentManager.importToolContent(newContent.getToolContentId(),importer.getUserId(),toolPath); log.debug("Tool content import success."); }catch (Exception e) { @@ -998,7 +998,7 @@ act.setParentUIID(actDto.getParentUIID()); act.setRunOffline(actDto.getRunOffline()); - act.setTitle(actDto.getTitle()); + act.setTitle(actDto.getActivityTitle()); //relation will be decide in Transition object. // act.setTransitionFrom(); Index: lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -ref1856fa9aad85d21a7a72900bb93040c821032b --- lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java (.../WDDXTAGS.java) (revision ef1856fa9aad85d21a7a72900bb93040c821032b) @@ -74,6 +74,7 @@ /*Activity specific tags*/ public static final String ACTIVITY_ID ="activityID"; public static final String ACTIVITY_UIID ="activityUIID"; + public static final String ACTIVITY_TITLE = "activityTitle"; public static final String PARENT_ACTIVITY_ID ="parentActivityID"; public static final String PARENT_UIID ="parentUIID";