Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r660fde180a1b4dbfbe304df8eeef71459aa91f95 -rcdf95bbd0cba419e84788d06369e02c4704283ab --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 660fde180a1b4dbfbe304df8eeef71459aa91f95) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision cdf95bbd0cba419e84788d06369e02c4704283ab) @@ -567,11 +567,11 @@ if ( languageFilename != null ) { MessageSource toolMessageSource = toolActMessageService.getMessageService(languageFilename); if ( toolMessageSource != null ) { - activity.setTitle(toolMessageSource.getMessage(Activity.I18N_TITLE,null,activity.getTitle(),locale)); + activity.setActivityTitle(toolMessageSource.getMessage(Activity.I18N_TITLE,null,activity.getActivityTitle(),locale)); activity.setDescription(toolMessageSource.getMessage(Activity.I18N_DESCRIPTION,null,activity.getDescription(),locale)); activity.setHelpText(toolMessageSource.getMessage(Activity.I18N_HELP_TEXT,null,activity.getHelpText(),locale)); } else { - log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle() + log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getActivityTitle() +" message file "+activity.getLanguageFile()+". Activity Message source not available"); } @@ -582,12 +582,12 @@ if ( toolMessageSource != null ) { activity.setToolDisplayName(toolMessageSource.getMessage(Tool.I18N_DISPLAY_NAME,null,activity.getToolDisplayName(),locale)); } else { - log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle() + log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getActivityTitle() +" message file "+activity.getLanguageFile()+". Tool Message source not available"); } } } else { - log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle() + log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getActivityTitle() +". No message file supplied."); } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java =================================================================== diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -rcdf95bbd0cba419e84788d06369e02c4704283ab --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision 34b959260a0f8f8285793a4481a95ca3580eabc5) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (.../LibraryActivityDTO.java) (revision cdf95bbd0cba419e84788d06369e02c4704283ab) @@ -53,7 +53,7 @@ private Long groupingID; private Integer groupingUIID; private String description; - private String title; + private String activityTitle; private String helpText; private Integer xCoord; private Integer yCoord; @@ -110,7 +110,7 @@ this.groupingID = activity.getGrouping()!= null? activity.getGrouping().getGroupingId(): null; this.groupingUIID = activity.getGroupingUIID(); this.description = activity.getDescription(); - this.title = activity.getTitle(); + this.activityTitle = activity.getTitle(); this.helpText = activity.getHelpText(); this.xCoord = activity.getXcoord(); this.yCoord = activity.getYcoord(); @@ -324,8 +324,8 @@ /** * @return Returns the title. */ - public String getTitle() { - return title; + public String getActivityTitle() { + return activityTitle; } /** @@ -471,8 +471,8 @@ } /** Set the activity's title */ - public void setTitle(String title) { - this.title = title; + public void setActivityTitle(String title) { + this.activityTitle = title; } /** Set the tool's display name (similar to title) */