Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java =================================================================== diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java (.../ImageGalleryUtils.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryUtils.java (.../ImageGalleryUtils.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -8,23 +8,17 @@ import org.lamsfoundation.lams.tool.imageGallery.web.form.MultipleImagesForm; import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.MessageService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.multipart.MultipartFile; public class ImageGalleryUtils { - @Autowired - @Qualifier("laimagMessageService") - private static MessageService messageService; - /** * Validate imageGallery item. */ public static MultiValueMap validateImageGalleryItem(ImageGalleryItemForm itemForm, - boolean largeFile) { + boolean largeFile, MessageService messageService) { MultiValueMap errorMap = new LinkedMultiValueMap<>(); @@ -51,7 +45,7 @@ * Validate imageGallery item. */ public static MultiValueMap validateMultipleImages(MultipleImagesForm multipleForm, - boolean largeFile) { + boolean largeFile, MessageService messageService) { MultiValueMap errorMap = new LinkedMultiValueMap<>(); @@ -109,4 +103,4 @@ return isContentTypeForbidden; } -} +} \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java =================================================================== diff -u -r230b4867ed4f106ca02b646ea23b36469452de3c -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 230b4867ed4f106ca02b646ea23b36469452de3c) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -87,7 +87,7 @@ @Autowired @Qualifier("laimagMessageService") - private static MessageService messageService; + private MessageService messageService; /** * Read imageGallery data from database and put them into HttpSession. It will redirect to init.do directly after @@ -119,11 +119,12 @@ request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER.toString()); return readDatabaseData(imageGalleryForm, request); } - + /** * Common method for "start" and "defineLater" */ - private String readDatabaseData(ImageGalleryForm imageGalleryForm, HttpServletRequest request) throws ServletException { + private String readDatabaseData(ImageGalleryForm imageGalleryForm, HttpServletRequest request) + throws ServletException { // save toolContentID into HTTPSession Long contentId = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_TOOL_CONTENT_ID); @@ -145,7 +146,7 @@ if (imageGallery == null) { imageGallery = igService.getDefaultContent(contentId); if (imageGallery.getImageGalleryItems() != null) { - items = new ArrayList(imageGallery.getImageGalleryItems()); + items = new ArrayList<>(imageGallery.getImageGalleryItems()); } else { items = null; } @@ -267,8 +268,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - ImageGalleryUser imageGalleryUser = igService.getUserByIDAndContent(user.getUserID().longValue(), - contentId); + ImageGalleryUser imageGalleryUser = igService.getUserByIDAndContent(user.getUserID().longValue(), contentId); if (imageGalleryUser == null) { imageGalleryUser = new ImageGalleryUser(user, imageGalleryPO); } @@ -398,7 +398,8 @@ public String saveOrUpdateImage(@ModelAttribute ImageGalleryItemForm imageGalleryItemForm, HttpServletRequest request, HttpServletResponse response) { - MultiValueMap errorMap = ImageGalleryUtils.validateImageGalleryItem(imageGalleryItemForm, true); + MultiValueMap errorMap = ImageGalleryUtils.validateImageGalleryItem(imageGalleryItemForm, true, + messageService); try { if (errorMap.isEmpty()) { @@ -492,7 +493,8 @@ public String saveMultipleImages(@ModelAttribute MultipleImagesForm multipleImagesForm, HttpServletRequest request, HttpServletResponse response) { - MultiValueMap errorMap = ImageGalleryUtils.validateMultipleImages(multipleImagesForm, true); + MultiValueMap errorMap = ImageGalleryUtils.validateMultipleImages(multipleImagesForm, true, + messageService); try { if (errorMap.isEmpty()) { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java =================================================================== diff -u -r3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -260,7 +260,7 @@ //validate form boolean isLargeFilesAllowed = mode.isTeacher(); MultiValueMap errorMap = ImageGalleryUtils.validateImageGalleryItem(imageGalleryItemForm, - isLargeFilesAllowed); + isLargeFilesAllowed, messageService); try { if (errorMap.isEmpty()) { @@ -300,7 +300,7 @@ //validate form boolean isLargeFilesAllowed = mode.isTeacher(); MultiValueMap errorMap = ImageGalleryUtils.validateMultipleImages(multipleForm, - isLargeFilesAllowed); + isLargeFilesAllowed, messageService); try { if (errorMap.isEmpty()) { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java =================================================================== diff -u -rb294a4ad71917a3740ef2250a5929d6de43866cf -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java (.../MonitoringController.java) (revision b294a4ad71917a3740ef2250a5929d6de43866cf) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -68,7 +68,7 @@ @Autowired @Qualifier("laimagMessageService") - private static MessageService messageService; + private MessageService messageService; @RequestMapping("/summary") public String summary(HttpServletRequest request) { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java =================================================================== diff -u -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java (.../AdminForm.java) (revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/AdminForm.java (.../AdminForm.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -33,10 +33,8 @@ @Autowired @Qualifier("laimagMessageService") - private static MessageService messageService; + private MessageService messageService; - private static final long serialVersionUID = 414425664356226L; - private String mediumImageDimensions; private String thumbnailImageDimensions; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java =================================================================== diff -u -r3b0e49dde2f5aed2b2cc53e70ae8fd8b30298315 -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision 3b0e49dde2f5aed2b2cc53e70ae8fd8b30298315) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java (.../McLearningController.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -89,7 +89,7 @@ @Autowired @Qualifier("lamcMessageService") - private static MessageService messageService; + private MessageService messageService; @RequestMapping("/displayMc") public String displayMc(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request, Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java =================================================================== diff -u -r6ec43132d9df310eebff50fac6fca9f095757bd7 -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java (.../McMonitoringController.java) (revision 6ec43132d9df310eebff50fac6fca9f095757bd7) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java (.../McMonitoringController.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -71,7 +71,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.util.HtmlUtils; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -92,7 +91,7 @@ @Autowired @Qualifier("lamcMessageService") - private static MessageService messageService; + private MessageService messageService; @RequestMapping("/monitoring") public String execute(HttpServletRequest request) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java (.../McPedagogicalPlannerController.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -60,7 +60,7 @@ @Autowired @Qualifier("lamcMessageService") - private static MessageService messageService; + private MessageService messageService; protected String unspecified(@ModelAttribute McPedagogicalPlannerForm plannerForm, HttpServletRequest request) { return initPedagogicalPlannerForm(plannerForm, request); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java =================================================================== diff -u -rd03a1456d2d0ee7a482273fe35412c67054f133d -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java (.../McPedagogicalPlannerForm.java) (revision d03a1456d2d0ee7a482273fe35412c67054f133d) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java (.../McPedagogicalPlannerForm.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -51,7 +51,7 @@ @Autowired @Qualifier("lamcMessageService") - private static MessageService messageService; + private MessageService messageService; private List question; private List candidateAnswerCount; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java =================================================================== diff -u -r20aa6cbca9fc96d341080e6ad39f82593443f792 -r190c89f5332a6fa6da4d16fd4e0eb668a6d930f7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision 20aa6cbca9fc96d341080e6ad39f82593443f792) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java (.../LearnerController.java) (revision 190c89f5332a6fa6da4d16fd4e0eb668a6d930f7) @@ -72,7 +72,6 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.context.WebApplicationContext; import org.springframework.web.multipart.MultipartFile; /** @@ -89,18 +88,15 @@ @Autowired @Qualifier("sbmtMessageService") - private static MessageService messageService; + private MessageService messageService; - @Autowired - private WebApplicationContext applicationContext; - /** * The initial page of learner in Submission tool. This page will list all uploaded files and learn */ @RequestMapping("/learner") public String learner(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) { // initial session Map - SessionMap sessionMap = new SessionMap(); + SessionMap sessionMap = new SessionMap<>(); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); @@ -280,7 +276,8 @@ @RequestMapping("/refresh") public String refresh(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) { String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(sessionMapID); learnerForm.setSessionMapID(sessionMap.getSessionID()); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID); @@ -309,7 +306,8 @@ @RequestMapping("/uploadFile") public String uploadFile(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) { String sessionMapID = learnerForm.getSessionMapID(); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(sessionMapID); request.setAttribute("sessionMapID", sessionMapID); Long sessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); @@ -365,7 +363,8 @@ @RequestMapping("/finish") public String finish(HttpServletRequest request, HttpServletResponse response) { String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(sessionMapID); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); @@ -566,7 +565,8 @@ String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(sessionMapID); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); // check for existing notebook entry @@ -587,9 +587,10 @@ return finish(request, response); } - public static void validateBeforeFinish(HttpServletRequest request, ISubmitFilesService submitFilesService) { + public void validateBeforeFinish(HttpServletRequest request, ISubmitFilesService submitFilesService) { String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(sessionMapID); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); HttpSession ss = SessionManager.getSession();