Index: lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java (.../IndexUtils.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java (.../IndexUtils.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -44,7 +44,7 @@ for (String idString : idList) { try { - Long id = new Long(Long.parseLong(idString)); + Long id = Long.valueOf(Long.parseLong(idString)); if (map.containsKey(id)) { orderedList.add(map.get(id)); map.remove(id); @@ -64,4 +64,4 @@ return orderedList; } -} +} \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java (.../EmailUserController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_central/src/java/org/lamsfoundation/lams/web/EmailUserController.java (.../EmailUserController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -150,7 +150,7 @@ if (StringUtils.isBlank(orgId)) { String lessonId = request.getParameter(AttributeNames.PARAM_LESSON_ID); if (!StringUtils.isBlank(lessonId)) { - Lesson lesson = (Lesson) userManagementService.findById(Lesson.class, new Long(lessonId)); + Lesson lesson = (Lesson) userManagementService.findById(Lesson.class, Long.valueOf(lessonId)); if (lesson != null) { orgId = lesson.getOrganisation().getOrganisationId().toString(); } Index: lams_central/src/java/org/lamsfoundation/lams/web/LessonOrderServlet.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_central/src/java/org/lamsfoundation/lams/web/LessonOrderServlet.java (.../LessonOrderServlet.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/web/LessonOrderServlet.java (.../LessonOrderServlet.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -102,7 +102,7 @@ List lessons = userManagementService.findByProperty(Lesson.class, "organisation", org); for (String id : idList) { try { - Long l = new Long(Long.parseLong(id)); + Long l = Long.valueOf(Long.parseLong(id)); if (!contains(lessons, l)) { log.warn("Lesson with id " + l + " doesn't belong in org with id " + orgId); response.sendError(HttpServletResponse.SC_BAD_REQUEST); Index: lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java (.../LtiController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java (.../LtiController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -279,7 +279,7 @@ // 1. init lesson Boolean liveEditEnabled = extServer.getLiveEditEnabled() == null ? false : extServer.getLiveEditEnabled(); - Lesson lesson = monitoringService.initializeLesson(title, desc, new Long(ldIdStr), + Lesson lesson = monitoringService.initializeLesson(title, desc, Long.valueOf(ldIdStr), organisation.getOrganisationId(), user.getUserId(), null, false, enableLessonIntro, extServer.getLearnerPresenceAvailable(), extServer.getLearnerImAvailable(), liveEditEnabled, extServer.getEnableLessonNotifications(), extServer.getForceLearnerRestart(), Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -184,7 +184,7 @@ FolderContentDTO dummyOrgFolder = new FolderContentDTO(centralMessageService.getMessage("organisations"), centralMessageService.getMessage("folder"), null, null, FolderContentDTO.FOLDER, - new Long(WorkspaceController.ORG_FOLDER_ID.longValue()), WorkspaceFolder.READ_ACCESS, null); + Long.valueOf(WorkspaceController.ORG_FOLDER_ID.longValue()), WorkspaceFolder.READ_ACCESS, null); ContentTreeNode dummyOrgNode = new ContentTreeNode(dummyOrgFolder); // tried using service.getAccessibleOrganisationWorkspaceFolders(userId) // api, Index: lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java (.../WorkspaceController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java (.../WorkspaceController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -130,7 +130,7 @@ @ResponseBody @RequestMapping(path = "/deleteResource", method = RequestMethod.POST) public void deleteResource(HttpServletRequest request) throws ServletException, IOException { - Long resourceID = new Long(WebUtil.readLongParam(request, WorkspaceController.RESOURCE_ID)); + Long resourceID = Long.valueOf(WebUtil.readLongParam(request, WorkspaceController.RESOURCE_ID)); String resourceType = WebUtil.readStrParam(request, WorkspaceController.RESOURCE_TYPE); boolean isDummyValue = checkResourceDummyValue(resourceID, FolderContentDTO.FOLDER); @@ -198,7 +198,7 @@ public void renameResource(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException, UserException, WorkspaceFolderException { Integer userID = getUserId(); - Long resourceID = new Long(WebUtil.readLongParam(request, WorkspaceController.RESOURCE_ID)); + Long resourceID = Long.valueOf(WebUtil.readLongParam(request, WorkspaceController.RESOURCE_ID)); String resourceType = WebUtil.readStrParam(request, WorkspaceController.RESOURCE_TYPE); boolean isDummyValue = checkResourceDummyValue(resourceID, FolderContentDTO.FOLDER); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java (.../Grouper.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java (.../Grouper.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -23,16 +23,17 @@ package org.lamsfoundation.lams.learningdesign; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.lamsfoundation.lams.learningdesign.exception.GroupingException; +import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.util.MessageService; + import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.lamsfoundation.lams.learningdesign.exception.GroupingException; -import org.lamsfoundation.lams.usermanagement.User; -import org.lamsfoundation.lams.util.MessageService; - /** * This is interface that defines the contract for performing grouping algorithm. * @@ -41,9 +42,8 @@ * Malikoff) * * @author Jacky Fang - * @since 2005-3-24 * @version 1.1 - * + * @since 2005-3-24 */ public abstract class Grouper { @@ -69,11 +69,11 @@ * system generated name. * * @param grouping - * the grouping that is used to perform groups creation. + * the grouping that is used to perform groups creation. * @param name - * for this group (optional) + * for this group (optional) * @param learners - * the list of learners that the teacher requested. + * the list of learners that the teacher requested. */ public abstract void doGrouping(Grouping grouping, String groupName, List learners) throws GroupingException; @@ -82,11 +82,11 @@ * don't supply a name, you may get a system generated name. * * @param grouping - * the grouping that is used to perform groups creation. + * the grouping that is used to perform groups creation. * @param name - * for this group (optional) + * for this group (optional) * @param learner - * the learner teacher want to add. + * the learner teacher want to add. */ public abstract void doGrouping(Grouping grouping, String groupName, User learner) throws GroupingException; @@ -95,13 +95,13 @@ * with a system generated name. * * @param grouping - * the grouping that is used to perform groups creation. + * the grouping that is used to perform groups creation. * @param id - * of the group (optional) + * of the group (optional) * @param learner - * the learner teacher want to add. + * the learner teacher want to add. * @throws GroupingException - * if the group does not exist. + * if the group does not exist. */ public abstract void doGrouping(Grouping chosenGrouping, Long groupId, List learners) throws GroupingException; @@ -112,8 +112,8 @@ * @return default group name prefix */ public String getPrefix() { - String prefix = commonMessageService != null ? commonMessageService.getMessage(DEFAULT_GROUP_NAME_PREFIX_I18N) - : ""; + String prefix = + commonMessageService != null ? commonMessageService.getMessage(DEFAULT_GROUP_NAME_PREFIX_I18N) : ""; prefix = prefix.trim(); return prefix.length() > 0 ? prefix : "Group"; } @@ -125,11 +125,11 @@ * Trims the name of the group before checking if it is null or before matching to a group. * * @param grouping - * (mandatory) + * (mandatory) * @param groupID - * if not null only remove user from this group, if null remove learner from any group. + * if not null only remove user from this group, if null remove learner from any group. * @param learner - * the learner to be removed (mandatory) + * the learner to be removed (mandatory) */ public void removeLearnersFromGroup(Grouping grouping, Long groupID, List learners) throws GroupingException { Set groups = grouping.getGroups(); @@ -153,8 +153,9 @@ } } else { - String error = "Tried to remove a group which cannot be removed (tool sessions probably exist). Group " - + group + " grouping " + grouping + ". Not removing the group."; + String error = + "Tried to remove a group which cannot be removed (tool sessions probably exist). Group " + + group + " grouping " + grouping + ". Not removing the group."; log.error(error); throw new GroupingException(error); } @@ -165,13 +166,12 @@ /** * Remove all the learners from the given grouping. Cannot remove learners if any of the groups are already in use - * (i.e. a tool - * session exists) + * (i.e. a tool session exists) * * @param grouping - * (mandatory) + * (mandatory) * @param groupID - * (mandatory) + * (mandatory) */ public void removeAllLearnersFromGrouping(Grouping grouping) throws GroupingException { @@ -180,8 +180,9 @@ continue; } if (!group.mayBeDeleted()) { - String error = "Tried to clear a group which cannot be removed (tool sessions probably exist). Grouping " - + grouping + ". Not removing the groupings."; + String error = + "Tried to clear a group which cannot be removed (tool sessions probably exist). Grouping " + + grouping + ". Not removing the groupings."; log.error(error); throw new GroupingException(error); } @@ -206,11 +207,11 @@ * Throws a GroupingException if name is null or blank. * * @param grouping - * (mandatory) + * (mandatory) * @param name - * (mandatory) + * (mandatory) * @param forceName - * (mandatory) + * (mandatory) */ public Group createGroup(Grouping grouping, String name) throws GroupingException { String trimmedName = name.trim(); @@ -222,7 +223,7 @@ Group newGroup = Group.createLearnerGroup(grouping, trimmedName, emptySet); if (newGroup == null) { - trimmedName = trimmedName + " " + new Long(System.currentTimeMillis()).toString(); + trimmedName = trimmedName + " " + System.currentTimeMillis(); newGroup = Group.createLearnerGroup(grouping, trimmedName, emptySet); } @@ -262,9 +263,9 @@ * Also throws a GroupingException if groupName is null or blank. * * @param grouping - * (mandatory) + * (mandatory) * @param groupID - * (mandatory) + * (mandatory) */ public void removeGroup(Grouping grouping, Long groupID) throws GroupingException { @@ -285,8 +286,9 @@ groupDeleted = true; } else { - String error = "Tried to remove a group which cannot be removed (tool sessions probably exist). Group " - + group + " grouping " + grouping + ". Not removing the group."; + String error = + "Tried to remove a group which cannot be removed (tool sessions probably exist). Group " + + group + " grouping " + grouping + ". Not removing the group."; log.error(error); throw new GroupingException(error); } Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java =================================================================== diff -u -re71845f3bb0d02540f9c16bcc783a71ee924de51 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java (.../RatingDAO.java) (revision e71845f3bb0d02540f9c16bcc783a71ee924de51) +++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java (.../RatingDAO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -370,7 +370,7 @@ userIds.remove(excludeUserId); //count how many userIds is rated and commented item - itemIdToRatedUsersCountMap.put(itemId, new Long(userIds.size())); + itemIdToRatedUsersCountMap.put(itemId, Long.valueOf(userIds.size())); } return itemIdToRatedUsersCountMap; @@ -400,4 +400,4 @@ .setParameterList("ratingCriteriaIds", ratingCriteriaIds).setParameterList("itemIds", itemIds).list(); } -} +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputValue.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputValue.java (.../ToolOutputValue.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputValue.java (.../ToolOutputValue.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -60,7 +60,7 @@ */ public ToolOutputValue(Integer val) { this.type = OutputType.OUTPUT_LONG; - this.value = new Long(val.longValue()); + this.value = Long.valueOf(val.longValue()); } /** @@ -207,7 +207,7 @@ return (Long) value; case OUTPUT_DOUBLE: - return new Long(((Double) value).longValue()); + return Long.valueOf(((Double) value).longValue()); case OUTPUT_BOOLEAN: return ((Boolean) value).booleanValue() ? 1L : 0L; Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -709,7 +709,7 @@ try { ToolSessionManager sessionManager = (ToolSessionManager) findToolService(tool); - Long longLearnerId = learnerId != null ? new Long(learnerId.longValue()) : null; + Long longLearnerId = learnerId != null ? Long.valueOf(learnerId.longValue()) : null; return sessionManager.getToolOutput(names, toolSession.getToolSessionId(), longLearnerId); } catch (NoSuchBeanDefinitionException e) { String message = Index: lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java (.../TransactionAwareSessionContext.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java (.../TransactionAwareSessionContext.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -1,14 +1,10 @@ package org.lamsfoundation.lams.util.hibernate; -import java.util.Arrays; -import java.util.List; - import jakarta.persistence.FlushModeType; import jakarta.transaction.Synchronization; - import org.apache.commons.lang3.Validate; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.FlushMode; import org.hibernate.HibernateException; import org.hibernate.Session; @@ -22,6 +18,9 @@ import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; +import java.util.Arrays; +import java.util.List; + /** * Session context that determines whether there exist a transaction in progress in the current thread, and if not, it * opens the {@link Session}. @@ -91,10 +90,11 @@ Session session; session = sessionFactory.openSession(); - TransactionAwareSessionContext.logger.warn( - "No Session bound to current Thread. Opened new Session [" + session + "]. Transaction: " - + session.getTransaction()); - + if (logger.isDebugEnabled()) { + TransactionAwareSessionContext.logger.debug( + "No Session bound to current Thread. Opened new Session [" + session + "]. Transaction: " + + session.getTransaction()); + } if (registerSynchronization(session)) { // Normalizes Session flush mode, defaulting it to AUTO. Required for // synchronization. LDEV-4696 Updated for Hibernate 5.3. See SPR-14364. Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java (.../FolderContentDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java (.../FolderContentDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -106,8 +106,8 @@ this.lastModifiedDateTime = workspaceFolder.getLastModifiedDate(); this.formattedLastModifiedDateTime = formatLastModifiedDateTime(TimeZone.getTimeZone(user.getTimeZone())); this.resourceType = FolderContentDTO.FOLDER; - this.resourceTypeID = new Long(workspaceFolder.getWorkspaceFolderType().intValue()); - this.resourceID = new Long(workspaceFolder.getWorkspaceFolderId().intValue()); + this.resourceTypeID = Long.valueOf(workspaceFolder.getWorkspaceFolderType().intValue()); + this.resourceID = Long.valueOf(workspaceFolder.getWorkspaceFolderId().intValue()); this.permissionCode = permissionCode; this.licenseID = null; this.designType = null; Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java (.../Download.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java (.../Download.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -342,7 +342,7 @@ protected static Long getLong(String longAsString) { try { - return new Long(longAsString); + return Long.valueOf(longAsString); } catch (NumberFormatException e) { return null; } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -366,7 +366,7 @@ securityService.ensureGroupMonitor(organisationId, userID, "intializeLesson"); - LearningDesign originalLearningDesign = learningDesignDAO.getLearningDesignById(new Long(learningDesignId)); + LearningDesign originalLearningDesign = learningDesignDAO.getLearningDesignById(Long.valueOf(learningDesignId)); if (originalLearningDesign == null) { throw new MonitoringServiceException( "Learning design for id=" + learningDesignId + " is missing. Unable to initialize lesson."); @@ -404,7 +404,7 @@ public Lesson initializeLessonForPreview(String lessonName, String lessonDescription, long learningDesignId, Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled) { - LearningDesign originalLearningDesign = learningDesignDAO.getLearningDesignById(new Long(learningDesignId)); + LearningDesign originalLearningDesign = learningDesignDAO.getLearningDesignById(Long.valueOf(learningDesignId)); if (originalLearningDesign == null) { throw new MonitoringServiceException( "Learning design for id=" + learningDesignId + " is missing. Unable to initialize lesson."); @@ -470,7 +470,7 @@ @Override public void createLessonClassForLesson(long lessonId, Organisation organisation, String learnerGroupName, List organizationUsers, String staffGroupName, List staffs, Integer userId) { - Lesson newLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson newLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); // if lesson isn't started recreate the lesson class if (newLesson.isLessonStarted()) { @@ -504,7 +504,7 @@ securityService.ensureLessonMonitor(lessonId, userId, "start lesson on schedule"); // we get the lesson just created - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); if (requestedLesson.isLessonStarted()) { // can't schedule it as it is already started. If the UI is correct, // this should never happen. @@ -539,7 +539,7 @@ requestedLesson.getLessonName() + ":" + (requestedLesson.getUser() == null ? "" : requestedLesson.getUser().getFullName())) - .usingJobData(MonitoringConstants.KEY_LESSON_ID, new Long(lessonId)) + .usingJobData(MonitoringConstants.KEY_LESSON_ID, Long.valueOf(lessonId)) .usingJobData(MonitoringConstants.KEY_USER_ID, Integer.valueOf(userId)).build(); // create customized triggers @@ -571,7 +571,7 @@ @Override public void finishLessonOnSchedule(long lessonId, Date userEnteredEndDate, Integer userId) { securityService.ensureLessonMonitor(lessonId, userId, "finish lesson on schedule"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); if (requestedLesson == null) { String error = "Unable to schedule lesson end as lesson is missing. Lesson Id " + lessonId; MonitoringService.log.error(error); @@ -616,7 +616,7 @@ requestedLesson.getLessonName() + ":" + (requestedLesson.getUser() == null ? "" : requestedLesson.getUser().getFullName())) - .usingJobData(MonitoringConstants.KEY_LESSON_ID, new Long(lessonId)) + .usingJobData(MonitoringConstants.KEY_LESSON_ID, Long.valueOf(lessonId)) .usingJobData(MonitoringConstants.KEY_USER_ID, Integer.valueOf(userId)).build(); finishLessonTrigger = TriggerBuilder.newTrigger().withIdentity(triggerName).startAt(endDate) @@ -660,7 +660,7 @@ public void finishLessonOnSchedule(long lessonId, int scheduledNumberDaysToLessonFinish, Integer userId) { securityService.ensureLessonMonitor(lessonId, userId, "finish lesson on schedule"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); if (requestedLesson == null) { String error = "Unable to schedule lesson end as lesson is missing. Lesson Id " + lessonId; MonitoringService.log.error(error); @@ -704,7 +704,7 @@ MonitoringService.log.debug("=============Starting Lesson " + lessonId + "=============="); } // we get the lesson just created - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); if (!skipSecurityCheck && requestedLesson.getOrganisation() != null) { // preview does not have organisation set, so this security check still needs improvement securityService.ensureLessonMonitor(lessonId, userId, "start lesson"); @@ -961,7 +961,7 @@ @Override public void archiveLesson(long lessonId, Integer userId) { securityService.ensureLessonMonitor(lessonId, userId, "archive lesson"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); Integer lessonState = requestedLesson.getLessonStateId(); // remove any triggers waiting to suspend the lesson @@ -980,7 +980,7 @@ @Override public void unarchiveLesson(long lessonId, Integer userId) { securityService.ensureLessonMonitor(lessonId, userId, "unarchive lesson"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); // remove any triggers waiting to suspend the lesson removeScheduleDisableTrigger(requestedLesson); revertLessonState(requestedLesson, userId); @@ -995,7 +995,7 @@ // https://lamssupport.atlassian.net/browse/LKC-145 securityService.ensureLessonMonitor(lessonId, userId, "suspend lesson"); } - Lesson lesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson lesson = lessonDAO.getLesson(Long.valueOf(lessonId)); if (!Lesson.SUSPENDED_STATE.equals(lesson.getLessonStateId()) && !Lesson.REMOVED_STATE.equals( lesson.getLessonStateId())) { setLessonState(lesson, Lesson.SUSPENDED_STATE, userId); @@ -1018,7 +1018,7 @@ @Override public void unsuspendLesson(long lessonId, Integer userId) { securityService.ensureLessonMonitor(lessonId, userId, "unsuspend lesson"); - Lesson lesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson lesson = lessonDAO.getLesson(Long.valueOf(lessonId)); Integer state = lesson.getLessonStateId(); // only suspend started lesson if (!Lesson.SUSPENDED_STATE.equals(state)) { @@ -1140,7 +1140,7 @@ @Override public void removeLesson(long lessonId, Integer userId) { securityService.ensureLessonMonitor(lessonId, userId, "remove lesson"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); // remove any triggers waiting to suspend the lesson removeScheduleDisableTrigger(requestedLesson); setLessonState(requestedLesson, Lesson.REMOVED_STATE, userId); @@ -1233,7 +1233,7 @@ @Override public Boolean togglePresenceAvailable(long lessonId, Integer userId, Boolean presenceAvailable) { securityService.ensureLessonMonitor(lessonId, userId, "set presence available"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); requestedLesson.setLearnerPresenceAvailable(presenceAvailable != null ? presenceAvailable : Boolean.FALSE); lessonDAO.updateLesson(requestedLesson); return requestedLesson.getLearnerPresenceAvailable(); @@ -1242,7 +1242,7 @@ @Override public Boolean togglePresenceImAvailable(long lessonId, Integer userId, Boolean presenceImAvailable) { securityService.ensureLessonMonitor(lessonId, userId, "set presence instant messaging available"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); requestedLesson.setLearnerImAvailable(presenceImAvailable != null ? presenceImAvailable : Boolean.FALSE); lessonDAO.updateLesson(requestedLesson); return requestedLesson.getLearnerImAvailable(); @@ -1251,7 +1251,7 @@ @Override public Boolean toggleGradebookOnComplete(long lessonId, Integer userId, Boolean gradebookOnComplete) { securityService.ensureLessonMonitor(lessonId, userId, "set gradebook on complete"); - Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); + Lesson requestedLesson = lessonDAO.getLesson(Long.valueOf(lessonId)); requestedLesson.setGradebookOnComplete(gradebookOnComplete != null ? gradebookOnComplete : Boolean.FALSE); lessonDAO.updateLesson(requestedLesson); return requestedLesson.getGradebookOnComplete(); @@ -1499,7 +1499,7 @@ lamsCoreToolService.forceCompleteActivity(toolSession, progress.getUser()); learnerService.completeToolSession(toolSession.getToolSessionId(), - new Long(learner.getUserId().longValue())); + Long.valueOf(learner.getUserId().longValue())); learnerService.completeActivity(learner.getUserId(), activity, progress.getLearnerProgressId()); if (MonitoringService.log.isDebugEnabled()) { MonitoringService.log.debug("Tool activity [" + activity.getActivityId() + "] is completed."); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -650,7 +650,7 @@ String actId = request.getParameter(AttributeNames.PARAM_ACTIVITY_ID); if (actId != null) { try { - activityId = new Long(Long.parseLong(actId)); + activityId = Long.valueOf(Long.parseLong(actId)); } catch (Exception e) { activityId = null; } @@ -973,8 +973,8 @@ throws IOException, LamsToolServiceException { Integer learnerUserID = Integer.valueOf(WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID)); - Long activityID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID)); - Long lessonID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID)); + Long activityID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID)); + Long lessonID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID)); try { String url = monitoringService.getLearnerActivityURL(lessonID, activityID, learnerUserID, getUserId()); return redirectToURL(response, url); @@ -988,8 +988,8 @@ @RequestMapping("/getActivityMonitorURL") public String getActivityMonitorURL(HttpServletRequest request, HttpServletResponse response) throws IOException, LamsToolServiceException { - Long activityID = new Long(WebUtil.readLongParam(request, "activityID")); - Long lessonID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID)); + Long activityID = Long.valueOf(WebUtil.readLongParam(request, "activityID")); + Long lessonID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID)); String contentFolderID = WebUtil.readStrParam(request, "contentFolderID"); try { String url = monitoringService.getActivityMonitorURL(lessonID, activityID, contentFolderID, getUserId()); @@ -1619,7 +1619,7 @@ @RequestMapping(path = "/presenceAvailable", method = RequestMethod.POST) public String presenceAvailable(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); + Long lessonID = Long.valueOf(WebUtil.readLongParam(request, "lessonID")); Integer userID = getUserId(); Boolean presenceAvailable = WebUtil.readBooleanParam(request, "presenceAvailable", false); @@ -1642,7 +1642,7 @@ @RequestMapping(path = "/presenceImAvailable", method = RequestMethod.POST) public String presenceImAvailable(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); + Long lessonID = Long.valueOf(WebUtil.readLongParam(request, "lessonID")); Integer userID = getUserId(); Boolean presenceImAvailable = WebUtil.readBooleanParam(request, "presenceImAvailable", false); @@ -1660,7 +1660,7 @@ */ @RequestMapping(path = "/gradebookOnComplete", method = RequestMethod.POST) public String gradebookOnComplete(HttpServletRequest request, HttpServletResponse response) throws IOException { - Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); + Long lessonID = Long.valueOf(WebUtil.readLongParam(request, "lessonID")); Integer userID = getUserId(); Boolean gradebookOnComplete = WebUtil.readBooleanParam(request, "gradebookOnComplete", false); Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java (.../ChatOutputFactory.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatOutputFactory.java (.../ChatOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -65,7 +65,7 @@ definitionMap.put(ChatConstants.USER_MESSAGES_DEFINITION_NAME, chatMessagesDefinition); } ToolOutputDefinition numberOfPostsDefinition = buildRangeDefinition( - ChatConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, new Long(0), null); + ChatConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, Long.valueOf(0), null); definitionMap.put(ChatConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, numberOfPostsDefinition); break; case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW: @@ -175,7 +175,7 @@ private ToolOutput getNumPosts(IChatService chatService, Long learnerId, Long toolSessionId) { int num = chatService.getTopicsNum(learnerId, toolSessionId); return new ToolOutput(ChatConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, - getI18NText(ChatConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, true), new Long(num)); + getI18NText(ChatConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, true), Long.valueOf(num)); } @Override Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -369,7 +369,7 @@ // reset it to new toolContentId chat.setToolContentId(toolContentId); - chat.setCreateBy(new Long(newUserUid.longValue())); + chat.setCreateBy(Long.valueOf(newUserUid.longValue())); chatDAO.saveOrUpdate(chat); } catch (ImportToolContentException e) { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -77,7 +77,7 @@ MonitoringController.log.info("excuting monitoring action"); - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java (.../DacoUser.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java (.../DacoUser.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -100,7 +100,7 @@ } public DacoUser(UserDTO user, DacoSession session) { - userId = new Long(user.getUserID().intValue()); + userId = Long.valueOf(user.getUserID().intValue()); firstName = user.getFirstName(); lastName = user.getLastName(); loginName = user.getLogin(); @@ -110,7 +110,7 @@ } public DacoUser(UserDTO user, Daco content) { - userId = new Long(user.getUserID().intValue()); + userId = Long.valueOf(user.getUserID().intValue()); firstName = user.getFirstName(); lastName = user.getLastName(); loginName = user.getLogin(); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoOutputFactory.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoOutputFactory.java (.../DacoOutputFactory.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoOutputFactory.java (.../DacoOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -50,7 +50,7 @@ SortedMap definitionMap = new TreeMap(); ToolOutputDefinition numberOfPostsDefinition = buildRangeDefinition( - DacoConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, new Long(0), null); + DacoConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, Long.valueOf(0), null); definitionMap.put(DacoConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, numberOfPostsDefinition); return definitionMap; @@ -79,6 +79,6 @@ private ToolOutput getNumRecords(IDacoService dacoService, Long learnerId, Long toolSessionId) { int num = dacoService.getRecordNum(learnerId, toolSessionId); return new ToolOutput(DacoConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, - getI18NText(DacoConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, true), new Long(num)); + getI18NText(DacoConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, true), Long.valueOf(num)); } -} +} \ No newline at end of file Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -501,7 +501,7 @@ private Long getToolDefaultContentIdBySignature(String toolSignature) throws DacoApplicationException { Long contentId = null; - contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + contentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (contentId == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); DacoServiceImpl.log.error(error); @@ -607,14 +607,14 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); - DacoUser user = dacoUserDao.getUserByUserIdAndContentId(new Long(newUserUid.longValue()), toolContentId); + DacoUser user = dacoUserDao.getUserByUserIdAndContentId(Long.valueOf(newUserUid.longValue()), toolContentId); if (user == null) { user = new DacoUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(Long.valueOf(newUserUid.longValue())); user.setDaco(toolContentObj); } toolContentObj.setCreatedBy(user); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java (.../AuthoringController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -616,7 +616,7 @@ protected String defineLater(@ModelAttribute("authoringForm") DacoForm authoringForm, HttpServletRequest request) throws ServletException { // update define later flag to true - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Daco daco = dacoService.getDacoByContentId(contentId); daco.setDefineLater(true); @@ -633,7 +633,7 @@ throws ServletException { // save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); // get back the daco and question list and display them on page @@ -752,7 +752,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - DacoUser dacoUser = dacoService.getUserByUserIdAndContentId(new Long(user.getUserID().intValue()), + DacoUser dacoUser = dacoService.getUserByUserIdAndContentId(Long.valueOf(user.getUserID().intValue()), authoringForm.getDaco().getContentId()); if (dacoUser == null) { dacoUser = new DacoUser(user, dacoPO); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -124,7 +124,7 @@ // save toolContentID into HTTPSession ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); - Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionId = Long.valueOf(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); @@ -210,7 +210,7 @@ // get sessionId from HttpServletRequest HttpSession httpSession = SessionManager.getSession(); UserDTO user = (UserDTO) httpSession.getAttribute(AttributeNames.USER); - Long userUid = new Long(user.getUserID().longValue()); + Long userUid = Long.valueOf(user.getUserID().longValue()); String nextActivityUrl = dacoService.finishToolSession(sessionId, userUid); response.sendRedirect(nextActivityUrl); @@ -493,7 +493,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - DacoUser dacoUser = service.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), sessionId); + DacoUser dacoUser = service.getUserByUserIdAndSessionId(Long.valueOf(user.getUserID().intValue()), sessionId); if (dacoUser == null) { DacoSession session = service.getSessionBySessionId(sessionId); @@ -505,7 +505,7 @@ } protected DacoUser getSpecifiedUser(IDacoService service, Long sessionId, Integer userId) { - DacoUser dacoUser = service.getUserByUserIdAndSessionId(new Long(userId.intValue()), sessionId); + DacoUser dacoUser = service.getUserByUserIdAndSessionId(Long.valueOf(userId.intValue()), sessionId); if (dacoUser == null) { LearningController.log .error("Unable to find specified user for daco activity. Screens are likely to fail. SessionId=" Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -818,15 +818,15 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); - DokumaranUser user = dokumaranUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), + DokumaranUser user = dokumaranUserDao.getUserByUserIDAndContentID(Long.valueOf(newUserUid.longValue()), toolContentId); if (user == null) { user = new DokumaranUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(Long.valueOf(newUserUid.longValue())); user.setDokumaran(toolContentObj); } toolContentObj.setCreatedBy(user); Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -83,7 +83,7 @@ @RequestMapping(path = "/definelater", method = RequestMethod.POST) private String definelater(@ModelAttribute("authoringForm") DokumaranForm authoringForm, HttpServletRequest request) throws ServletException { - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Dokumaran dokumaran = dokumaranService.getDokumaranByContentId(contentId); dokumaran.setDefineLater(true); @@ -100,7 +100,7 @@ throws ServletException { // save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request, DokumaranConstants.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, DokumaranConstants.PARAM_TOOL_CONTENT_ID)); // get back the dokumaran and item list and display them on page @@ -210,7 +210,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - DokumaranUser dokumaranUser = dokumaranService.getUserByIDAndContent(new Long(user.getUserID().intValue()), + DokumaranUser dokumaranUser = dokumaranService.getUserByIDAndContent(Long.valueOf(user.getUserID().intValue()), dokumaranPO.getContentId()); if (dokumaranUser == null) { dokumaranUser = new DokumaranUser(user, dokumaranPO); Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -121,7 +121,7 @@ user = getSpecifiedUser(toolSessionId, WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false)); } else { currentUserDto = (UserDTO) ss.getAttribute(AttributeNames.USER); - user = dokumaranService.getUserByIDAndSession(new Long(currentUserDto.getUserID().intValue()), + user = dokumaranService.getUserByIDAndSession(Long.valueOf(currentUserDto.getUserID().intValue()), toolSessionId); if (user == null) { user = new DokumaranUser(currentUserDto, session); @@ -303,7 +303,7 @@ // get sessionId from HttpServletRequest HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); String nextActivityUrl = dokumaranService.finishToolSession(sessionId, userID); response.sendRedirect(nextActivityUrl); @@ -314,7 +314,7 @@ // ************************************************************************************* private DokumaranUser getSpecifiedUser(Long sessionId, Integer userId) { - DokumaranUser dokumaranUser = dokumaranService.getUserByIDAndSession(new Long(userId.intValue()), sessionId); + DokumaranUser dokumaranUser = dokumaranService.getUserByIDAndSession(Long.valueOf(userId.intValue()), sessionId); if (dokumaranUser == null) { LearningController.log.error( "Unable to find specified user for dokumaran activity. Screens are likely to fail. SessionId=" Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumUser.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumUser.java (.../ForumUser.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/model/ForumUser.java (.../ForumUser.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -79,7 +79,7 @@ /** Create the user based on the DTO in the session */ public ForumUser(UserDTO user, ForumToolSession session) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = Long.valueOf(user.getUserID().intValue()); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java =================================================================== diff -u -rb71c9cb2f96eb891545d32aaca8904051d1e00d5 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java (.../ForumOutputFactory.java) (revision b71c9cb2f96eb891545d32aaca8904051d1e00d5) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java (.../ForumOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -78,7 +78,7 @@ chosenTopicAnswersDefinition); } ToolOutputDefinition numberOfPostsDefinition = buildRangeDefinition( - ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, new Long(0), null); + ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, Long.valueOf(0), null); definitionMap.put(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, numberOfPostsDefinition); break; case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW: @@ -200,7 +200,7 @@ private ToolOutput getNumPosts(IForumService forumService, Long learnerId, Long toolSessionId) { int num = forumService.getTopicsNum(learnerId, toolSessionId); return new ToolOutput(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, - getI18NText(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, true), new Long(num)); + getI18NText(ForumConstants.LEARNER_NUM_POSTS_DEFINITION_NAME, true), Long.valueOf(num)); } @Override Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -755,7 +755,7 @@ } private Forum getDefaultForum() { - Long defaultForumId = new Long(toolService.getToolDefaultContentIdBySignature(ForumConstants.TOOL_SIGNATURE)); + Long defaultForumId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(ForumConstants.TOOL_SIGNATURE)); if (defaultForumId.equals(0L)) { String error = "Could not retrieve default content id for this tool"; ForumService.log.error(error); @@ -992,14 +992,14 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); - ForumUser user = forumUserDao.getByUserId(new Long(newUserUid.longValue())); + ForumUser user = forumUserDao.getByUserId(Long.valueOf(newUserUid.longValue())); if (user == null) { user = new ForumUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(Long.valueOf(newUserUid.longValue())); this.createUser(user); } toolContentObj.setCreatedBy(user); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java (.../AuthoringConditionController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -294,7 +294,7 @@ for (MessageDTO messageDTO : messageDTOs) { Message topic = messageDTO.getMessage(); - possibleItems.put(topic.getSubject(), new Long(topic.getCreated().getTime()).toString()); + possibleItems.put(topic.getSubject(), Long.valueOf(topic.getCreated().getTime()).toString()); } conditionForm.setPossibleItems(possibleItems); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java (.../AuthoringController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -110,7 +110,7 @@ // update define later flag to true request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER); - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Forum forum = forumService.getForumByContentId(contentId); if (!forum.isContentInUse()) { @@ -252,7 +252,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - forumUser = forumService.getUserByID(new Long(user.getUserID().intValue())); + forumUser = forumService.getUserByID(Long.valueOf(user.getUserID().intValue())); if (forumUser == null) { forumUser = new ForumUser(user, null); forumService.createUser(forumUser); @@ -403,7 +403,7 @@ message.setSequenceId(maxSeq); // check whether this user exist or not - ForumUser forumUser = forumService.getUserByID(new Long(user.getUserID().intValue())); + ForumUser forumUser = forumService.getUserByID(Long.valueOf(user.getUserID().intValue())); String contentFolderID = (String) sessionMap.get(AttributeNames.PARAM_CONTENT_FOLDER_ID); // check whether it is appadmin:LDEV-906 if (forumUser == null && !StringUtils.equals(contentFolderID, "-1")) { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -283,7 +283,7 @@ // get session from shared session. HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); // finish current session for user forumService.finishUserSession(getCurrentUser(request, sessionId)); @@ -783,7 +783,7 @@ @RequestMapping("/updateMessageHideFlag") public String updateMessageHideFlag(HttpServletRequest request) { - Long msgId = new Long(WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID)); + Long msgId = Long.valueOf(WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID)); boolean hideFlag = WebUtil.readBooleanParam(request, "hideFlag"); // TODO Skipping permissions for now, currently having issues with default learning designs not having an @@ -836,7 +836,7 @@ Long responseId = WebUtil.readLongParam(request, "idBox"); Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); - Long userId = new Long(user.getUserID().intValue()); + Long userId = Long.valueOf(user.getUserID().intValue()); AverageRatingDTO averageRatingDTO = forumService.rateMessage(responseId, userId, toolSessionID, rating); @@ -875,7 +875,7 @@ // get session from shared session. HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); if (!forum.isAllowNewTopic()) { List list = forumService.getRootTopics(sessionId); @@ -912,7 +912,7 @@ // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long currUserId = new Long(user.getUserID().intValue()); + Long currUserId = Long.valueOf(user.getUserID().intValue()); Iterator iter = msgDtoList.iterator(); while (iter.hasNext()) { MessageDTO dto = (MessageDTO) iter.next(); @@ -941,7 +941,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - ForumUser forumUser = forumService.getUserByUserAndSession(new Long(user.getUserID().intValue()), sessionId); + ForumUser forumUser = forumService.getUserByUserAndSession(Long.valueOf(user.getUserID().intValue()), sessionId); if (forumUser == null) { // if user not exist, create new one in database ForumToolSession session = forumService.getSessionBySessionId(sessionId); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -113,7 +113,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID); - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentID); request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true)); @@ -131,7 +131,7 @@ * The initial method for monitoring. List all users according to given Content ID. */ private void summary(HttpServletRequest request) { - Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); // create sessionMap SessionMap sessionMap = new SessionMap<>(); @@ -301,7 +301,7 @@ @RequestMapping("/downloadMarks") public String downloadMarks(HttpServletRequest request, HttpServletResponse response) { - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); List topicList = forumService.getAllTopicsFromSession(sessionID); // construct Excel file format and download MultiValueMap errorMap = new LinkedMultiValueMap<>(); @@ -414,7 +414,7 @@ * View activity for content. */ private void viewActivity(HttpServletRequest request) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Forum forum = forumService.getForumByContentId(toolContentID); String title = forum.getTitle(); @@ -430,7 +430,7 @@ * View instruction information for a content. */ private void viewInstructions(HttpServletRequest request) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Forum forum = forumService.getForumByContentId(toolContentID); ForumForm forumForm = new ForumForm(); @@ -444,7 +444,7 @@ */ @RequestMapping("/statistic") public String statistic(HttpServletRequest request) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Map sessionTopicsMap = new TreeMap>(new SessionDTOComparator()); Map sessionAvaMarkMap = new HashMap(); @@ -517,7 +517,7 @@ @RequestMapping("/viewTopic") public String viewTopic(HttpServletRequest request) { - Long msgUid = new Long(WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID)); + Long msgUid = Long.valueOf(WebUtil.readLongParam(request, ForumConstants.ATTR_TOPIC_ID)); Message topic = forumService.getMessage(msgUid); @@ -530,7 +530,7 @@ public String releaseMark(HttpServletRequest request, HttpServletResponse response) { // get service then update report table - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); forumService.releaseMarksForSession(sessionID); try { @@ -558,8 +558,8 @@ */ @RequestMapping("/viewUserMark") public String viewUserMark(@ModelAttribute MarkForm markForm, HttpServletRequest request) { - Long userUid = new Long(WebUtil.readLongParam(request, ForumConstants.USER_UID)); - Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long userUid = Long.valueOf(WebUtil.readLongParam(request, ForumConstants.USER_UID)); + Long sessionId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); // create sessionMap String sessionMapId = WebUtil.readStrParam(request, ForumConstants.ATTR_SESSION_MAP_ID); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java (.../ForumForm.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java (.../ForumForm.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -54,7 +54,7 @@ */ public ForumForm() { - this.toolContentID = new Long(0); + this.toolContentID = Long.valueOf(0); this.forum = new Forum(); this.forum.setTitle(""); this.currentTab = ""; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java (.../Summary.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -86,7 +86,7 @@ : item.getCreateBy().getFirstName() + " " + item.getCreateBy().getLastName(); this.userId = item.getCreateBy() == null ? null : item.getCreateBy().getUserId(); } else { - this.itemUid = new Long(-1); + this.itemUid = Long.valueOf(-1); } } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java =================================================================== diff -u -r2de8f805211b6433aff4efd6fa9275a1b9933033 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java (.../ImageGalleryOutputFactory.java) (revision 2de8f805211b6433aff4efd6fa9275a1b9933033) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java (.../ImageGalleryOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -65,14 +65,14 @@ switch (definitionType) { case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_CONDITION: ToolOutputDefinition definition = buildRangeDefinition( - ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, new Long(0), null); + ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, Long.valueOf(0), null); definitionMap.put(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, definition); definition = buildRangeDefinition(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_COMMENTS, - new Long(0), null); + Long.valueOf(0), null); definitionMap.put(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_COMMENTS, definition); - definition = buildRangeDefinition(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_VOTES, new Long(0), + definition = buildRangeDefinition(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_VOTES, Long.valueOf(0), null); definitionMap.put(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_VOTES, definition); break; @@ -253,4 +253,4 @@ getI18NText(ImageGalleryOutputFactory.OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, true), countVotes); } -} +} \ No newline at end of file Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java (.../MonitoringController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -108,7 +108,7 @@ request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID); Long contentId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_CONTENT_ID); ImageGallery imageGallery = (ImageGallery) sessionMap.get(ImageGalleryConstants.ATTR_IMAGE_GALLERY); - Long imageUid = new Long(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID)); + Long imageUid = Long.valueOf(request.getParameter(ImageGalleryConstants.PARAM_IMAGE_UID)); ImageGalleryItem image = igService.getImageGalleryItemByUid(imageUid); Long toolSessionId = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_TOOL_SESSION_ID); @@ -146,7 +146,7 @@ ImageGallery imageGallery = igService.getImageGalleryByContentId(contentId); int imageUid = NumberUtils.toInt(imageGalleryItemForm.getImageUid(), -1); - ImageGalleryItem image = igService.getImageGalleryItemByUid(new Long(imageUid)); + ImageGalleryItem image = igService.getImageGalleryItemByUid(Long.valueOf(imageUid)); String title = imageGalleryItemForm.getTitle(); if (StringUtils.isBlank(title)) { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/Summary.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/Summary.java (.../Summary.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/Summary.java (.../Summary.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -83,7 +83,7 @@ this.itemTitle = item.getTitle(); this.username = item.getCreateBy() == null ? "" : item.getCreateBy().getLoginName(); } else { - this.itemUid = new Long(-1); + this.itemUid = Long.valueOf(-1); } } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -390,7 +390,7 @@ private Long getToolDefaultContentIdBySignature(String toolSignature) throws CommonCartridgeApplicationException { Long contentId = null; - contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + contentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (contentId == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); log.error(error); @@ -549,14 +549,14 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); CommonCartridgeUser user = commonCartridgeUserDao.getUserByUserIDAndContentID( - new Long(newUserUid.longValue()), toolContentId); + Long.valueOf(newUserUid.longValue()), toolContentId); if (user == null) { user = new CommonCartridgeUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(Long.valueOf(newUserUid.longValue())); user.setCommonCartridge(toolContentObj); } toolContentObj.setCreatedBy(user); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -301,7 +301,7 @@ private String definelater(@ModelAttribute("authoringForm") CommonCartridgeForm authoringForm, HttpServletRequest request) throws ServletException { // update define later flag to true - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); CommonCartridge commonCartridge = commonCartridgeService.getCommonCartridgeByContentId(contentId); commonCartridge.setDefineLater(true); @@ -318,7 +318,7 @@ HttpServletRequest request) throws ServletException { // save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request, CommonCartridgeConstants.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, CommonCartridgeConstants.PARAM_TOOL_CONTENT_ID)); // get back the commonCartridge and item list and display them on page @@ -464,7 +464,7 @@ // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); CommonCartridgeUser commonCartridgeUser = commonCartridgeService.getUserByIDAndContent( - new Long(user.getUserID().intValue()), authoringForm.getCommonCartridge().getContentId()); + Long.valueOf(user.getUserID().intValue()), authoringForm.getCommonCartridge().getContentId()); if (commonCartridgeUser == null) { commonCartridgeUser = new CommonCartridgeUser(user, commonCartridgePO); } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -93,7 +93,7 @@ // save toolContentID into HTTPSession ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); - Long sessionId = new Long(request.getParameter(CommonCartridgeConstants.PARAM_TOOL_SESSION_ID)); + Long sessionId = Long.valueOf(request.getParameter(CommonCartridgeConstants.PARAM_TOOL_SESSION_ID)); request.setAttribute(CommonCartridgeConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); request.setAttribute(AttributeNames.ATTR_MODE, mode); @@ -227,7 +227,7 @@ // get sessionId from HttpServletRequest HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); String nextActivityUrl = commonCartridgeService.finishToolSession(sessionId, userID); response.sendRedirect(nextActivityUrl); @@ -244,7 +244,7 @@ HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); int miniViewFlag = commonCartridgeService.checkMiniView(sessionId, userID); // if current user view less than reqired view count number, then just return error message. @@ -296,7 +296,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - CommonCartridgeUser commonCartridgeUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), + CommonCartridgeUser commonCartridgeUser = service.getUserByIDAndSession(Long.valueOf(user.getUserID().intValue()), sessionId); if (commonCartridgeUser == null) { @@ -308,7 +308,7 @@ } private CommonCartridgeUser getSpecifiedUser(ICommonCartridgeService service, Long sessionId, Integer userId) { - CommonCartridgeUser commonCartridgeUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId); + CommonCartridgeUser commonCartridgeUser = service.getUserByIDAndSession(Long.valueOf(userId.intValue()), sessionId); if (commonCartridgeUser == null) { LearningController.log.error( "Unable to find specified user for commonCartridge activity. Screens are likely to fail. SessionId=" @@ -329,13 +329,13 @@ SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(sessionMapID); - Long commonCartridgeItemUid = new Long(request.getParameter(CommonCartridgeConstants.PARAM_RESOURCE_ITEM_UID)); + Long commonCartridgeItemUid = Long.valueOf(request.getParameter(CommonCartridgeConstants.PARAM_RESOURCE_ITEM_UID)); HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); Long sessionId = (Long) sessionMap.get(CommonCartridgeConstants.ATTR_TOOL_SESSION_ID); - commonCartridgeService.setItemComplete(commonCartridgeItemUid, new Long(user.getUserID().intValue()), + commonCartridgeService.setItemComplete(commonCartridgeItemUid, Long.valueOf(user.getUserID().intValue()), sessionId); // set commonCartridge item complete tag Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ViewItemController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ViewItemController.java (.../ViewItemController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ViewItemController.java (.../ViewItemController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -141,7 +141,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - commonCartridgeService.setItemAccess(item.getUid(), new Long(user.getUserID().intValue()), sessionId); + commonCartridgeService.setItemAccess(item.getUid(), Long.valueOf(user.getUserID().intValue()), sessionId); } if (item == null) { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -79,7 +79,7 @@ UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); Long sessionId = (Long) sessionMap.get(CommonCartridgeConstants.ATTR_TOOL_SESSION_ID); - commonCartridgeService.setItemComplete(commonCartridgeItemUid, new Long(user.getUserID().intValue()), sessionId); + commonCartridgeService.setItemComplete(commonCartridgeItemUid, Long.valueOf(user.getUserID().intValue()), sessionId); // set commonCartridge item complete tag SortedSet commonCartridgeItemList = getCommonCartridgeItemList(sessionMap); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McSessionMarkDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McSessionMarkDTO.java (.../McSessionMarkDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McSessionMarkDTO.java (.../McSessionMarkDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -51,7 +51,7 @@ if (mcSessionMarkDTO == null) { return 1; } else { - return (int) (new Long(sessionId).longValue() - new Long(mcSessionMarkDTO.sessionId).longValue()); + return (int) (Long.valueOf(sessionId).longValue() - Long.valueOf(mcSessionMarkDTO.sessionId).longValue()); } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java (.../McUserMarkDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McUserMarkDTO.java (.../McUserMarkDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -144,7 +144,7 @@ if (mcUserMarkDTO == null) { return 1; } else { - return (int) (new Long(queUsrId).longValue() - new Long(mcUserMarkDTO.queUsrId).longValue()); + return (int) (Long.valueOf(queUsrId).longValue() - Long.valueOf(mcUserMarkDTO.queUsrId).longValue()); } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java =================================================================== diff -u -r9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java (.../MCOutputFactory.java) (revision 9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java (.../MCOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -55,8 +55,8 @@ if (toolContentObject != null) { McContent content = (McContent) toolContentObject; - definition = buildRangeDefinition(McAppConstants.OUTPUT_NAME_LEARNER_MARK, new Long(0), - new Long(content.getTotalMarksPossible().longValue()), true); + definition = buildRangeDefinition(McAppConstants.OUTPUT_NAME_LEARNER_MARK, Long.valueOf(0), + Long.valueOf(content.getTotalMarksPossible().longValue()), true); definition.setWeightable(true); definitionMap.put(McAppConstants.OUTPUT_NAME_LEARNER_MARK, definition); } else { @@ -166,7 +166,7 @@ if (queUser != null && queUser.getLastAttemptTotalMark() != null) { mark = queUser.getLastAttemptTotalMark().longValue(); } else { - mark = new Long(0); + mark = Long.valueOf(0); } return new ToolOutput(McAppConstants.OUTPUT_NAME_LEARNER_MARK, getI18NText(McAppConstants.OUTPUT_NAME_LEARNER_MARK, true), mark); @@ -220,4 +220,4 @@ return correctOptions == correctlearnerOptions; } -} +} \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -230,7 +230,7 @@ @Override public void setDefineLater(String strToolContentID, boolean value) { - McContent mcContent = getMcContent(new Long(strToolContentID)); + McContent mcContent = getMcContent(Long.valueOf(strToolContentID)); if (mcContent != null) { mcContent.setDefineLater(value); updateMc(mcContent); @@ -688,15 +688,15 @@ mcUserMarkDTO.setMarks(userMarks); mcUserMarkDTO.setAnsweredOptions(answeredOptions); mcUserMarkDTO.setAttemptTime(attemptTime); - mcUserMarkDTO.setTotalMark(new Long(totalMark)); + mcUserMarkDTO.setTotalMark(Long.valueOf(totalMark)); } else { int totalMark = mcUsrAttemptDAO.getUserTotalMark(user.getUid()); - mcUserMarkDTO.setTotalMark(new Long(totalMark)); + mcUserMarkDTO.setTotalMark(Long.valueOf(totalMark)); } mapSessionUsersData.put(mapIndex.toString(), mcUserMarkDTO); - mapIndex = new Long(mapIndex.longValue() + 1); + mapIndex = Long.valueOf(mapIndex.longValue() + 1); } mcSessionMarkDTO.setUserMarks(mapSessionUsersData); @@ -1158,7 +1158,7 @@ } cell = row.createCell(count++); - cell.setCellValue(new Long(userMark.getTotalMark())); + cell.setCellValue(Long.valueOf(userMark.getTotalMark())); Double totalPercents = questions.size() != 0 ? (double) numberOfCorrectlyAnsweredByUser / questions.size() : 0d; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java (.../AuthoringUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java (.../AuthoringUtil.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -208,7 +208,7 @@ mcService.updateMc(mcContent); } - mcContent = mcService.getMcContent(new Long(toolContentID)); + mcContent = mcService.getMcContent(Long.valueOf(toolContentID)); return mcContent; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McComparator.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McComparator.java (.../McComparator.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McComparator.java (.../McComparator.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -37,8 +37,8 @@ String s1 = (String) o1; String s2 = (String) o2; - int key1 = new Long(s1).intValue(); - int key2 = new Long(s2).intValue(); + int key1 = Long.valueOf(s1).intValue(); + int key2 = Long.valueOf(s2).intValue(); return key1 - key2; } @@ -47,4 +47,4 @@ String s = (String) o; return compare(this, o) == 0; } -} +} \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -135,13 +135,13 @@ return "McErrorBox"; } - McContent mcContent = mcService.getMcContent(new Long(strToolContentID)); + McContent mcContent = mcService.getMcContent(Long.valueOf(strToolContentID)); // if mcContent does not exist, try to use default content instead. if (mcContent == null) { long defaultContentID = mcService.getToolDefaultContentIdBySignature(McAppConstants.TOOL_SIGNATURE); - mcContent = mcService.getMcContent(new Long(defaultContentID)); - mcContent = McContent.newInstance(mcContent, new Long(strToolContentID)); + mcContent = mcService.getMcContent(Long.valueOf(defaultContentID)); + mcContent = McContent.newInstance(mcContent, Long.valueOf(strToolContentID)); } // prepare form Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -97,7 +97,7 @@ String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); mcLearningForm.setToolSessionID(toolSessionID); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionID)); String toolContentId = mcSession.getMcContent().getMcContentId().toString(); mcLearningForm.setToolContentID(toolContentId); @@ -143,7 +143,7 @@ String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); mcLearningForm.setToolSessionID(toolSessionID); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionID)); /* * by now, we made sure that the passed tool session id exists in the db as a new record Make sure we can @@ -167,7 +167,7 @@ String mode = request.getParameter(McAppConstants.MODE); request.setAttribute(AttributeNames.ATTR_MODE, mode); - request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(new Long(toolSessionID))); + request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(Long.valueOf(toolSessionID))); request.setAttribute(McAppConstants.TOOL_SESSION_ID, toolSessionID); request.setAttribute(McAppConstants.ATTR_CONTENT, mcContent); @@ -227,7 +227,7 @@ McQueUsr groupLeader = null; if (mcContent.isUseSelectLeaderToolOuput()) { - groupLeader = mcService.checkLeaderSelectToolForSessionLeader(user, new Long(toolSessionID)); + groupLeader = mcService.checkLeaderSelectToolForSessionLeader(user, Long.valueOf(toolSessionID)); // forwards to the leaderSelection page if (groupLeader == null && !mode.equals(ToolAccessMode.TEACHER.toString())) { @@ -279,7 +279,7 @@ String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); mcLearningForm.setToolSessionID(toolSessionID); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionID)); String toolContentId = mcSession.getMcContent().getMcContentId().toString(); mcLearningForm.setToolContentID(toolContentId); @@ -292,7 +292,7 @@ String nextUrl = null; try { - nextUrl = mcService.leaveToolSession(new Long(toolSessionID), userDto.getUserID().longValue()); + nextUrl = mcService.leaveToolSession(Long.valueOf(toolSessionID), userDto.getUserID().longValue()); } catch (DataMissingException e) { LearningController.logger.error("failure getting nextUrl: " + e); return "learning/AnswersContent"; @@ -333,7 +333,7 @@ if (questionUid.equals(answeredQuestionUid)) { String answeredOptionUid = answer.substring(hyphenPosition + 1); - answerOption = question.getOptionByUID(new Long(answeredOptionUid)); + answerOption = question.getOptionByUID(Long.valueOf(answeredOptionUid)); answerDto.setAnswerOption(answerOption); break; } @@ -376,9 +376,9 @@ request.getSession().setAttribute(httpSessionID, sessionMap); String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); - McSession session = mcService.getMcSessionById(new Long(toolSessionID)); + McSession session = mcService.getMcSessionById(Long.valueOf(toolSessionID)); String toolContentId = session.getMcContent().getMcContentId().toString(); - McContent content = mcService.getMcContent(new Long(toolContentId)); + McContent content = mcService.getMcContent(Long.valueOf(toolContentId)); List answers = LearningController.parseLearnerAnswers(mcLearningForm, request, content.isQuestionsSequenced()); @@ -444,9 +444,9 @@ HttpServletResponse response) { String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionID)); String toolContentId = mcSession.getMcContent().getMcContentId().toString(); - McContent mcContent = mcService.getMcContent(new Long(toolContentId)); + McContent mcContent = mcService.getMcContent(Long.valueOf(toolContentId)); McQueUsr user = getCurrentUser(toolSessionID); @@ -490,7 +490,7 @@ mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible()); mcGeneralLearnerFlowDTO.setQuestionIndex(questionIndex); request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); - request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(new Long(toolSessionID))); + request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(Long.valueOf(toolSessionID))); request.setAttribute("sessionMapID", sessionMap.getSessionID()); return "learning/AnswersContent"; @@ -504,10 +504,10 @@ HttpServletResponse response) { String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionID)); String toolContentId = mcSession.getMcContent().getMcContentId().toString(); - McContent mcContent = mcService.getMcContent(new Long(toolContentId)); + McContent mcContent = mcService.getMcContent(Long.valueOf(toolContentId)); String sessionMapID = mcLearningForm.getHttpSessionID(); request.setAttribute("sessionMapID", sessionMapID); @@ -532,7 +532,7 @@ while (itMap.hasNext()) { Map.Entry pairs = (Map.Entry) itMap.next(); String currentQuestionUid = pairs.getValue().toString(); - List listQuestionOptions = mcService.findOptionsByQuestionUid(new Long(currentQuestionUid)); + List listQuestionOptions = mcService.findOptionsByQuestionUid(Long.valueOf(currentQuestionUid)); //builds a questions map from questions list Map mapOptsContent = new TreeMap<>(); @@ -546,7 +546,7 @@ } mapStartupGeneralOptionsContent.put(mapIndex.toString(), mapOptsContent); - mapIndex = new Long(mapIndex.longValue() + 1); + mapIndex = Long.valueOf(mapIndex.longValue() + 1); } mcGeneralLearnerFlowDTO.setMapGeneralOptionsContent(mapStartupGeneralOptionsContent); mcGeneralLearnerFlowDTO.setQuestions(questions); @@ -603,7 +603,7 @@ } request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); - request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(new Long(toolSessionID))); + request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, mcService.isLastActivity(Long.valueOf(toolSessionID))); return "learning/ViewAnswers"; } @@ -612,9 +612,9 @@ HttpServletResponse response) { String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionID)); String toolContentId = mcSession.getMcContent().getMcContentId().toString(); - McContent mcContent = mcService.getMcContent(new Long(toolContentId)); + McContent mcContent = mcService.getMcContent(Long.valueOf(toolContentId)); McQueUsr mcQueUsr = getCurrentUser(toolSessionID); //in order to track whether redo button is pressed store this info @@ -683,7 +683,7 @@ HttpServletResponse response) { String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionID)); McContent mcContent = mcSession.getMcContent(); Long userID = mcLearningForm.getUserID(); @@ -777,23 +777,23 @@ // get back login user DTO HttpSession ss = SessionManager.getSession(); UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userId = new Long(toolUser.getUserID().longValue()); + Long userId = Long.valueOf(toolUser.getUserID().longValue()); - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionId)); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionId)); McQueUsr qaUser = mcService.getMcUserBySession(userId, mcSession.getUid()); if (qaUser == null) { - qaUser = mcService.createMcUser(new Long(toolSessionId)); + qaUser = mcService.createMcUser(Long.valueOf(toolSessionId)); } return mcService.getMcUserBySession(userId, mcSession.getUid()); } private McQueUsr getSpecifiedUser(String toolSessionId, Integer userId) { - McSession mcSession = mcService.getMcSessionById(new Long(toolSessionId)); - McQueUsr qaUser = mcService.getMcUserBySession(new Long(userId.intValue()), mcSession.getUid()); + McSession mcSession = mcService.getMcSessionById(Long.valueOf(toolSessionId)); + McQueUsr qaUser = mcService.getMcUserBySession(Long.valueOf(userId.intValue()), mcSession.getUid()); if (qaUser == null) { logger.error( - "Unable to find specified user for Q&A activity. Screens are likely to fail. SessionId=" + new Long( + "Unable to find specified user for Q&A activity. Screens are likely to fail. SessionId=" + Long.valueOf( toolSessionId) + " UserId=" + userId); } return qaUser; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -108,7 +108,7 @@ throw (e); } - McContent mcContent = mcService.getMcContent(new Long(toolContentID)); + McContent mcContent = mcService.getMcContent(Long.valueOf(toolContentID)); mcGeneralMonitoringDTO.setToolContentID(toolContentID); mcGeneralMonitoringDTO.setActivityTitle(mcContent.getTitle()); mcGeneralMonitoringDTO.setActivityInstructions(mcContent.getInstructions()); @@ -156,7 +156,7 @@ DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); } - boolean isGroupedActivity = mcService.isGroupedActivity(new Long(mcContent.getMcContentId())); + boolean isGroupedActivity = mcService.isGroupedActivity(Long.valueOf(mcContent.getMcContentId())); request.setAttribute("isGroupedActivity", isGroupedActivity); /* this section is needed for Edit Activity screen, from here... */ @@ -196,7 +196,7 @@ String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - McContent mcContent = mcService.getMcContent(new Long(strToolContentID)); + McContent mcContent = mcService.getMcContent(Long.valueOf(strToolContentID)); mcContent.setDisplayAnswers(new Boolean(true)); mcContent.setDisplayFeedbackOnly(new Boolean(false)); mcService.updateMc(mcContent); @@ -217,7 +217,7 @@ String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - McContent mcContent = mcService.getMcContent(new Long(strToolContentID)); + McContent mcContent = mcService.getMcContent(Long.valueOf(strToolContentID)); mcContent.setDisplayFeedbackOnly(new Boolean(true)); mcService.updateMc(mcContent); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java =================================================================== diff -u -rf711877b65ec0c82e43fd1fd5b129e0b5b50737d -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision f711877b65ec0c82e43fd1fd5b129e0b5b50737d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java (.../QaQuestionDAO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -101,7 +101,7 @@ @Override public void removeQueContent(long qaQueContentId) { - QaQueContent qaQuestion = getSession().load(QaQueContent.class, new Long(qaQueContentId)); + QaQueContent qaQuestion = getSession().load(QaQueContent.class, Long.valueOf(qaQueContentId)); getSession().delete(qaQuestion); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaMonitoredAnswersDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaMonitoredAnswersDTO.java (.../QaMonitoredAnswersDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaMonitoredAnswersDTO.java (.../QaMonitoredAnswersDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -123,7 +123,7 @@ if (qaMonitoredAnswersDTO == null) { return 1; } else { - return (int) (new Long(questionUid).longValue() - new Long(qaMonitoredAnswersDTO.questionUid).longValue()); + return (int) (Long.valueOf(questionUid).longValue() - Long.valueOf(qaMonitoredAnswersDTO.questionUid).longValue()); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaMonitoredUserDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaMonitoredUserDTO.java (.../QaMonitoredUserDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaMonitoredUserDTO.java (.../QaMonitoredUserDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -106,7 +106,7 @@ if (qaMonitoredUserDTO == null) { return 1; } else { - return (int) (new Long(queUsrId).longValue() - new Long(qaMonitoredUserDTO.queUsrId).longValue()); + return (int) (Long.valueOf(queUsrId).longValue() - Long.valueOf(qaMonitoredUserDTO.queUsrId).longValue()); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -302,10 +302,10 @@ boolean isAutosave) { HttpSession ss = SessionManager.getSession(); UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userId = new Long(toolUser.getUserID().longValue()); - QaQueUsr user = getUserByIdAndSession(userId, new Long(toolSessionID)); + Long userId = Long.valueOf(toolUser.getUserID().longValue()); + QaQueUsr user = getUserByIdAndSession(userId, Long.valueOf(toolSessionID)); - QaSession session = getSessionById(new Long(toolSessionID)); + QaSession session = getSessionById(Long.valueOf(toolSessionID)); QaContent qaContent = session.getQaContent(); QaQueContent question = getQuestionByContentAndDisplayOrder(questionDisplayOrder, qaContent.getUid()); @@ -421,7 +421,7 @@ long defaultContentId = 0; if (fromContentId == null) { defaultContentId = getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); - fromContentId = new Long(defaultContentId); + fromContentId = Long.valueOf(defaultContentId); } if (toContentId == null) { @@ -433,7 +433,7 @@ if (fromContent == null) { defaultContentId = getToolDefaultContentIdBySignature(QaAppConstants.MY_SIGNATURE); - fromContentId = new Long(defaultContentId); + fromContentId = Long.valueOf(defaultContentId); fromContent = qaDAO.getQaByContentId(fromContentId.longValue()); } @@ -513,8 +513,8 @@ HttpSession ss = SessionManager.getSession(); UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userId = new Long(userDto.getUserID().longValue()); - QaQueUsr user = getUserByIdAndSession(userId, new Long(sessionId)); + Long userId = Long.valueOf(userDto.getUserID().longValue()); + QaQueUsr user = getUserByIdAndSession(userId, Long.valueOf(sessionId)); String fullName = user.getFullname(); // add question-answer pairs to email message Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaComparator.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaComparator.java (.../QaComparator.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaComparator.java (.../QaComparator.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -40,8 +40,8 @@ String s1 = (String) o1; String s2 = (String) o2; - int key1 = new Long(s1).intValue(); - int key2 = new Long(s2).intValue(); + int key1 = Long.valueOf(s1).intValue(); + int key2 = Long.valueOf(s2).intValue(); return key1 - key2; } @@ -50,4 +50,4 @@ String s = (String) o; return compare(this, o) == 0; } -} +} \ No newline at end of file Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -105,7 +105,7 @@ String mode = request.getParameter(MODE); qaLearningForm.setMode(mode); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); QaQueUsr user = null; @@ -126,7 +126,7 @@ // forwards to the leaderSelection page if (groupLeader == null && !mode.equals(ToolAccessMode.TEACHER.toString())) { - List groupQaUsers = qaService.getUsersBySessionId(new Long(toolSessionID).longValue()); + List groupQaUsers = qaService.getUsersBySessionId(Long.valueOf(toolSessionID).longValue()); List groupUsers = groupQaUsers.stream().map(qaUser -> { User userI = new User(); userI.setUserId(qaUser.getQueUsrId().intValue()); @@ -171,14 +171,14 @@ qaLearningForm.setSessionMapID(sessionMap.getSessionID()); sessionMap.put(AttributeNames.ATTR_LEARNER_CONTENT_FOLDER, - qaService.getLearnerContentFolder(new Long(toolSessionID), user.getQueUsrId())); + qaService.getLearnerContentFolder(Long.valueOf(toolSessionID), user.getQueUsrId())); } String sessionMapId = sessionMap.getSessionID(); sessionMap.put(IS_DISABLED, qaContent.isLockWhenFinished() && user.isLearnerFinished() || (mode != null) && mode.equals(ToolAccessMode.TEACHER.toString())); sessionMap.put(ATTR_GROUP_LEADER, groupLeader); - boolean isUserLeader = qaService.isUserGroupLeader(user.getQueUsrId(), new Long(toolSessionID)); + boolean isUserLeader = qaService.isUserGroupLeader(user.getQueUsrId(), Long.valueOf(toolSessionID)); boolean lockWhenFinished = qaContent.isLockWhenFinished(); sessionMap.put(ATTR_IS_USER_LEADER, isUserLeader); sessionMap.put(AttributeNames.ATTR_MODE, mode); @@ -343,9 +343,9 @@ } private QaQueUsr getSpecifiedUser(String toolSessionId, Integer userId) { - QaQueUsr qaUser = qaService.getUserByIdAndSession(userId.longValue(), new Long(toolSessionId)); + QaQueUsr qaUser = qaService.getUserByIdAndSession(userId.longValue(), Long.valueOf(toolSessionId)); if (qaUser == null) { - qaUser = qaService.createUser(new Long(toolSessionId), userId); + qaUser = qaService.createUser(Long.valueOf(toolSessionId), userId); } return qaUser; } @@ -360,7 +360,7 @@ LearningUtil.saveFormRequestData(request, qaLearningForm); String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); QaQueUsr qaQueUsr = getCurrentUser(toolSessionID); @@ -454,7 +454,7 @@ // notify teachers on response submit if (errorMap.isEmpty() && qaContent.isNotifyTeachersOnResponseSubmit()) { - qaService.notifyTeachersOnResponseSubmit(new Long(toolSessionID)); + qaService.notifyTeachersOnResponseSubmit(Long.valueOf(toolSessionID)); } return forwardName; } @@ -490,7 +490,7 @@ } LearningUtil.saveFormRequestData(request, qaLearningForm); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); int intTotalQuestionCount = qaContent.getQaQueContents().size(); @@ -524,7 +524,7 @@ LearningUtil.saveFormRequestData(request, qaLearningForm); String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaService, qaContent); @@ -573,11 +573,11 @@ String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); String userID = request.getParameter("userID"); - QaQueUsr user = qaService.getUserByIdAndSession(new Long(userID), new Long(toolSessionID)); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaQueUsr user = qaService.getUserByIdAndSession(Long.valueOf(userID), Long.valueOf(toolSessionID)); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); - // LearningUtil.storeResponses(mapAnswers, qaService, toolContentID, new Long(toolSessionID)); + // LearningUtil.storeResponses(mapAnswers, qaService, toolContentID, Long.valueOf(toolSessionID)); if (qaContent.isShowOtherAnswers()) { GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaService, qaContent); @@ -627,9 +627,9 @@ qaLearningForm.setToolSessionID(toolSessionID); String userID = request.getParameter("userID"); - QaQueUsr user = qaService.getUserByIdAndSession(new Long(userID), new Long(toolSessionID)); + QaQueUsr user = qaService.getUserByIdAndSession(Long.valueOf(userID), Long.valueOf(toolSessionID)); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); @@ -696,7 +696,7 @@ String sessionMapID = qaLearningForm.getSessionMapID(); qaLearningForm.setSessionMapID(sessionMapID); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); QaQueUsr qaQueUsr = getCurrentUser(toolSessionID); @@ -737,9 +737,9 @@ Map mapSequentialAnswers = (Map) sessionMap .get(QaAppConstants.MAP_SEQUENTIAL_ANSWERS_KEY); if (mapSequentialAnswers.size() >= Integer.valueOf(currentQuestionIndex).intValue()) { - mapSequentialAnswers.remove(new Long(currentQuestionIndex).toString()); + mapSequentialAnswers.remove(Long.valueOf(currentQuestionIndex).toString()); } - mapSequentialAnswers.put(new Long(currentQuestionIndex).toString(), newAnswer); + mapSequentialAnswers.put(Long.valueOf(currentQuestionIndex).toString(), newAnswer); mapAnswers.put(currentQuestionIndex, newAnswer); int nextQuestionOffset = getNextQuestion ? 1 : -1; @@ -762,7 +762,7 @@ int intCurrentQuestionIndex = Integer.valueOf(currentQuestionIndex).intValue() + nextQuestionOffset; String currentAnswer = ""; if (mapAnswers.size() >= intCurrentQuestionIndex) { - currentAnswer = mapAnswers.get(new Long(intCurrentQuestionIndex).toString()); + currentAnswer = mapAnswers.get(Long.valueOf(intCurrentQuestionIndex).toString()); } generalLearnerFlowDTO.setCurrentAnswer(currentAnswer); @@ -771,7 +771,7 @@ String totalQuestionCount = qaLearningForm.getTotalQuestionCount(); - int remainingQuestionCount = new Long(totalQuestionCount).intValue() + int remainingQuestionCount = Long.valueOf(totalQuestionCount).intValue() - Integer.valueOf(currentQuestionIndex).intValue(); String userFeedback = ""; if (remainingQuestionCount != 0) { @@ -848,7 +848,7 @@ qaLearningForm.setSessionMapID(sessionMapID); String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); qaLearningForm.setToolSessionID(toolSessionID); - QaSession qaSession = qaService.getSessionById(new Long(toolSessionID).longValue()); + QaSession qaSession = qaService.getSessionById(Long.valueOf(toolSessionID).longValue()); QaContent qaContent = qaSession.getQaContent(); QaQueUsr qaQueUsr = getCurrentUser(toolSessionID); @@ -1203,9 +1203,9 @@ UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); Integer userId = toolUser.getUserID(); - QaQueUsr qaUser = qaService.getUserByIdAndSession(userId.longValue(), new Long(toolSessionId)); + QaQueUsr qaUser = qaService.getUserByIdAndSession(userId.longValue(), Long.valueOf(toolSessionId)); if (qaUser == null) { - qaUser = qaService.createUser(new Long(toolSessionId), userId); + qaUser = qaService.createUser(Long.valueOf(toolSessionId), userId); } return qaUser; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -98,7 +98,7 @@ throw new ServletException("No Tool Content ID found"); } - QaContent qaContent = qaService.getQaContent(new Long(strToolContentID).longValue()); + QaContent qaContent = qaService.getQaContent(Long.valueOf(strToolContentID).longValue()); if (qaContent == null) { throw new ServletException("Data not initialised in Monitoring"); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -383,7 +383,7 @@ HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); int miniViewFlag = resourceService.checkMiniView(sessionId, userID); // if current user view less than reqired view count number, then just return error message. @@ -427,7 +427,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - ResourceUser resourceUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId); + ResourceUser resourceUser = service.getUserByIDAndSession(Long.valueOf(user.getUserID().intValue()), sessionId); if (resourceUser == null) { ResourceSession session = service.getResourceSessionBySessionId(sessionId); @@ -438,7 +438,7 @@ } private ResourceUser getSpecifiedUser(IResourceService service, Long sessionId, Integer userId) { - ResourceUser resourceUser = service.getUserByIDAndSession(new Long(userId.intValue()), sessionId); + ResourceUser resourceUser = service.getUserByIDAndSession(Long.valueOf(userId.intValue()), sessionId); if (resourceUser == null) { LearningController.log.error( "Unable to find specified user for share resources activity. Screens are likely to fail. SessionId=" @@ -491,13 +491,13 @@ SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(sessionMapID); - Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID)); + Long resourceItemUid = Long.valueOf(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID)); HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID); - resourceService.setItemComplete(resourceItemUid, new Long(user.getUserID().intValue()), sessionId); + resourceService.setItemComplete(resourceItemUid, Long.valueOf(user.getUserID().intValue()), sessionId); // set resource item complete tag SortedSet resourceItemList = getResourceItemList(sessionMap); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java (.../CompleteItemServlet.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -84,15 +84,15 @@ String sessionMapID = request.getParameter(ResourceConstants.ATTR_SESSION_MAP_ID); SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - Long resourceItemUid = new Long(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID)); + Long resourceItemUid = Long.valueOf(request.getParameter(ResourceConstants.PARAM_RESOURCE_ITEM_UID)); HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); Long sessionId = (Long) sessionMap.get(ResourceConstants.ATTR_TOOL_SESSION_ID); - resourceService.setItemComplete(resourceItemUid, new Long(user.getUserID().intValue()), sessionId); + resourceService.setItemComplete(resourceItemUid, Long.valueOf(user.getUserID().intValue()), sessionId); // set resource item complete tag SortedSet resourceItemList = getResourceItemList(sessionMap); Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionOutputFactory.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionOutputFactory.java (.../LeaderselectionOutputFactory.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionOutputFactory.java (.../LeaderselectionOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -53,7 +53,7 @@ break; case ToolOutputDefinition.DATA_OUTPUT_DEFINITION_TYPE_DATA_FLOW: ToolOutputDefinition leaderDefinition = buildRangeDefinition( - LeaderselectionConstants.OUTPUT_NAME_LEADER_USERID, new Long(0), null); + LeaderselectionConstants.OUTPUT_NAME_LEADER_USERID, Long.valueOf(0), null); definitionMap.put(LeaderselectionConstants.OUTPUT_NAME_LEADER_USERID, leaderDefinition); break; } @@ -103,4 +103,4 @@ } return null; } -} +} \ No newline at end of file Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -274,7 +274,7 @@ // reset it to new toolContentId content.setToolContentId(toolContentId); - content.setCreateBy(new Long(newUserUid.longValue())); + content.setCreateBy(Long.valueOf(newUserUid.longValue())); leaderselectionDAO.saveOrUpdate(content); } catch (ImportToolContentException e) { Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -79,7 +79,7 @@ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); request.setAttribute(LeaderselectionConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); Leaderselection content = leaderselectionService.getContentByContentId(toolContentID); if (content == null) { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapOutputFactory.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapOutputFactory.java (.../MindmapOutputFactory.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapOutputFactory.java (.../MindmapOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -48,7 +48,7 @@ SortedMap definitionMap = new TreeMap(); - ToolOutputDefinition definition1 = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUM_NODES, new Long(0), null); + ToolOutputDefinition definition1 = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUM_NODES, Long.valueOf(0), null); definitionMap.put(OUTPUT_NAME_LEARNER_NUM_NODES, definition1); return definitionMap; @@ -76,6 +76,6 @@ private ToolOutput getNumNodes(IMindmapService mindmapService, Long learnerId, Long toolSessionId) { int num = mindmapService.getNumNodes(learnerId, toolSessionId); return new ToolOutput(OUTPUT_NAME_LEARNER_NUM_NODES, getI18NText(OUTPUT_NAME_LEARNER_NUM_NODES, true), - new Long(num)); + Long.valueOf(num)); } -} +} \ No newline at end of file Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -584,7 +584,7 @@ // reset it to new toolContentId mindmap.setToolContentId(toolContentId); - // mindmap.setCreateBy(new Long(newUserUid.longValue())); + // mindmap.setCreateBy(Long.valueOf(newUserUid.longValue())); mindmapDAO.saveOrUpdate(mindmap); @@ -640,7 +640,7 @@ @Override public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + toolContentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (toolContentId == null) { String error = "Could not retrieve default content id for this tool"; MindmapService.logger.error(error); Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -536,7 +536,7 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionId - MindmapUser mindmapUser = mindmapService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), + MindmapUser mindmapUser = mindmapService.getUserByUserIdAndSessionId(Long.valueOf(user.getUserID().intValue()), toolSessionId); if (mindmapUser == null && create) { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -68,7 +68,7 @@ @RequestMapping("/monitoring") public String unspecified(HttpServletRequest request, HttpServletResponse response) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentID); @@ -112,7 +112,7 @@ @RequestMapping("/showMindmap") public String showMindmap(HttpServletRequest request, HttpServletResponse response) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentID); request.setAttribute("isMultiUserMode", mindmap.isMultiUserMode()); request.setAttribute("mindmapId", mindmap.getUid()); @@ -121,7 +121,7 @@ request.setAttribute("allowPrinting", true); if (!mindmap.isMultiUserMode()) { - Long userId = new Long(WebUtil.readLongParam(request, "userUID")); + Long userId = Long.valueOf(WebUtil.readLongParam(request, "userUID")); MindmapUser mindmapUser = mindmapService.getUserByUID(userId); MindmapUserDTO userDTO = new MindmapUserDTO(mindmapUser); request.setAttribute("userDTO", userDTO); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java =================================================================== diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -44,9 +44,9 @@ // ------------------------------------------ // DEFAULT IDs for testing purposes // ------------------------------------------ - public static final Long DEFAULT_CONTENT_ID = new Long(2500); - public static final Long DEFAULT_SESSION_ID = new Long(2400); - public static final Long DEFAULT_CREATOR_ID = new Long(2300); + public static final Long DEFAULT_CONTENT_ID = Long.valueOf(2500); + public static final Long DEFAULT_SESSION_ID = Long.valueOf(2400); + public static final Long DEFAULT_CREATOR_ID = Long.valueOf(2300); // ------------------------------------------- // Action Forward names Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -210,7 +210,7 @@ } UserDTO user = getUser(request); - nbContent.setCreatorUserId(new Long(user.getUserID().longValue())); + nbContent.setCreatorUserId(Long.valueOf(user.getUserID().longValue())); // Author has finished editing the content and mark the defineLater flag to false nbContent.setDefineLater(false); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -95,7 +95,7 @@ /** Get the user id from the shared session */ public Long getUserID(HttpServletRequest request) { UserDTO user = getUserDTO(request); - return new Long(user.getUserID().longValue()); + return Long.valueOf(user.getUserID().longValue()); } /** Get the user id from the url - needed for the monitoring mode */ Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -312,7 +312,7 @@ // reset it to new toolContentId notebook.setToolContentId(toolContentId); - notebook.setCreateBy(new Long(newUserUid.longValue())); + notebook.setCreateBy(Long.valueOf(newUserUid.longValue())); notebookDAO.saveOrUpdate(notebook); } catch (ImportToolContentException e) { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -178,7 +178,7 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionId - NotebookUser notebookUser = notebookService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), + NotebookUser notebookUser = notebookService.getUserByUserIdAndSessionId(Long.valueOf(user.getUserID().intValue()), toolSessionId); if (notebookUser == null) { Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -115,7 +115,7 @@ @RequestMapping(value = "/getUsers") public String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException { - Long toolSessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long toolSessionId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); boolean hasSearch = WebUtil.readBooleanParam(request, "_search", false); String searchString = hasSearch ? request.getParameter(NotebookConstants.PARAM_NAME) : null; Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -374,7 +374,7 @@ // reset it to new toolContentId pixlr.setToolContentId(toolContentId); - pixlr.setCreateBy(new Long(newUserUid.longValue())); + pixlr.setCreateBy(Long.valueOf(newUserUid.longValue())); // Copying the image file into lams_www.war/images/pixlr File imageFile = new File(toolContentPath + File.separator + pixlr.getImageFileName()); @@ -455,7 +455,7 @@ @Override public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + toolContentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (toolContentId == null) { String error = "Could not retrieve default content id for this tool"; PixlrService.logger.error(error); Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -354,8 +354,8 @@ int height = imageFile.getHeight(); pixlr.setImageFileName(filename); - pixlr.setImageHeight(new Long(height)); - pixlr.setImageWidth(new Long(width)); + pixlr.setImageHeight(Long.valueOf(height)); + pixlr.setImageWidth(Long.valueOf(width)); } } @@ -364,7 +364,7 @@ public String deleteImage(@ModelAttribute("authoringForm") AuthoringForm authoringForm, HttpServletRequest request) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); // retrieving Pixlr with given toolContentID Pixlr pixlr = pixlrService.getPixlrByContentId(toolContentID); Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -211,8 +211,8 @@ BufferedImage imageBufferedFile = ImageIO.read(imageFile); int width = imageBufferedFile.getWidth(); int height = imageBufferedFile.getHeight(); - pixlrUser.setImageHeight(new Long(height)); - pixlrUser.setImageWidth(new Long(width)); + pixlrUser.setImageHeight(Long.valueOf(height)); + pixlrUser.setImageWidth(Long.valueOf(width)); pixlrService.saveOrUpdatePixlrUser(pixlrUser); success = true; } catch (Exception e) { @@ -228,7 +228,7 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionId - PixlrUser pixlrUser = pixlrService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), + PixlrUser pixlrUser = pixlrService.getUserByUserIdAndSessionId(Long.valueOf(user.getUserID().intValue()), toolSessionId); if (pixlrUser == null) { Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -50,7 +50,7 @@ @RequestMapping("") public String unspecified(@ModelAttribute("monitoringForm")MonitoringForm monitoringForm,HttpServletRequest request) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); @@ -76,7 +76,7 @@ @RequestMapping("/showPixlr") public String showPixlr(@ModelAttribute("monitoringForm")MonitoringForm monitoringForm,HttpServletRequest request) { - Long uid = new Long(WebUtil.readLongParam(request, "userUID")); + Long uid = Long.valueOf(WebUtil.readLongParam(request, "userUID")); PixlrUser user = pixlrService.getUserByUID(uid); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java (.../PeerreviewUser.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java (.../PeerreviewUser.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -86,7 +86,7 @@ } public PeerreviewUser(User user, PeerreviewSession session) { - this.userId = new Long(user.getUserId()); + this.userId = Long.valueOf(user.getUserId()); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -97,7 +97,7 @@ } public PeerreviewUser(UserDTO user, Peerreview content) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = Long.valueOf(user.getUserID().intValue()); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -669,7 +669,7 @@ // ***************************************************************************** private Peerreview getDefaultPeerreview() throws PeerreviewApplicationException { - Long defaultPeerreviewId = new Long( + Long defaultPeerreviewId = Long.valueOf( toolService.getToolDefaultContentIdBySignature(PeerreviewConstants.TOOL_SIGNATURE)); if (defaultPeerreviewId.equals(0L)) { String error = new StringBuilder("Could not retrieve default content id for this tool ").append( @@ -779,15 +779,15 @@ } // reset the user - PeerreviewUser user = peerreviewUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), + PeerreviewUser user = peerreviewUserDao.getUserByUserIDAndContentID(Long.valueOf(newUserUid.longValue()), toolContentId); if (user == null) { user = new PeerreviewUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(Long.valueOf(newUserUid.longValue())); user.setPeerreview(toolContentObj); } toolContentObj.setCreatedBy(user); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -80,7 +80,7 @@ public String defineLater(@ModelAttribute PeerreviewForm peerreviewForm, HttpServletRequest request, HttpSession session) throws ServletException { // update define later flag to true - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Peerreview peerreview = service.getPeerreviewByContentId(contentId); peerreview.setDefineLater(true); @@ -108,7 +108,7 @@ Peerreview peerreview = null; // save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request, PeerreviewConstants.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, PeerreviewConstants.PARAM_TOOL_CONTENT_ID)); // Get contentFolderID and save to form. String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); @@ -211,7 +211,7 @@ // *******************************Handle user******************* // get back login user DTO UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); - PeerreviewUser peerreviewUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()), + PeerreviewUser peerreviewUser = service.getUserByIDAndContent(Long.valueOf(user.getUserID().intValue()), peerreviewForm.getPeerreview().getContentId()); if (peerreviewUser == null) { peerreviewUser = new PeerreviewUser(user, peerreviewPO); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -97,7 +97,7 @@ // save toolContentID into HTTPSession ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); - Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionId = Long.valueOf(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); request.setAttribute(AttributeNames.ATTR_MODE, mode); @@ -122,7 +122,7 @@ } } else { UserDTO userDTO = (UserDTO) session.getAttribute(AttributeNames.USER); - user = service.getUserByIDAndSession(new Long(userDTO.getUserID().intValue()), sessionId); + user = service.getUserByIDAndSession(Long.valueOf(userDTO.getUserID().intValue()), sessionId); } try { @@ -637,7 +637,7 @@ for (String key : request.getParameterMap().keySet()) { if (key.startsWith("comment-textarea-")) { String itemIdString = key.substring(17); - Long itemId = new Long(itemIdString); + Long itemId = Long.valueOf(itemIdString); String comment = request.getParameter(key); if (comment != null) { countCommentsSaved++; @@ -714,7 +714,7 @@ for (String key : request.getParameterMap().keySet()) { if (key.startsWith("mark")) { String itemIdString = key.substring(4); - Long itemId = new Long(itemIdString); + Long itemId = Long.valueOf(itemIdString); Long value = WebUtil.readLongParam(request, key); if (value > 0) { ratings.put(itemId, value.floatValue()); @@ -728,7 +728,7 @@ for (String key : request.getParameterMap().keySet()) { if (key.startsWith("rank")) { String valueString = key.substring(4); - Long value = new Long(valueString); + Long value = Long.valueOf(valueString); Long itemId = WebUtil.readLongParam(request, key, true); if (itemId != null) { ratings.put(itemId, value.floatValue()); @@ -779,7 +779,7 @@ // get sessionId from HttpServletRequest UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); String nextActivityUrl = service.finishToolSession(sessionId, userID); response.sendRedirect(nextActivityUrl); Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java =================================================================== diff -u -r75088f2af7a57bca6d772385fb30c1d6f248bd4f -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 75088f2af7a57bca6d772385fb30c1d6f248bd4f) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -161,7 +161,7 @@ return num.longValue(); } catch (Exception e1) { try { - return new Long((String) value); + return Long.valueOf((String) value); } catch (Exception e2) { } } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/StatusReportDTO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/StatusReportDTO.java (.../StatusReportDTO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/StatusReportDTO.java (.../StatusReportDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -43,7 +43,7 @@ this.login = login; this.fullName = fullName; this.unMarked = unMarked; - this.userID = new Long(userID.intValue()); + this.userID = Long.valueOf(userID.intValue()); } /** @@ -105,4 +105,4 @@ public void setUserID(Long userID) { this.userID = userID; } -} +} \ No newline at end of file Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -390,7 +390,7 @@ String nextActivityUrl; try { - nextActivityUrl = sessionMgrService.leaveToolSession(sessionID, new Long(userID.intValue())); + nextActivityUrl = sessionMgrService.leaveToolSession(sessionID, Long.valueOf(userID.intValue())); return "redirect:" + nextActivityUrl; } catch (DataMissingException e) { throw new SubmitFilesException(e); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java =================================================================== diff -u -rfba7287887f6dd83d3098100af6320cccf1f3e36 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java (.../Summary.java) (revision fba7287887f6dd83d3098100af6320cccf1f3e36) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java (.../Summary.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -66,7 +66,7 @@ // TODO maybe a,b,c,d ? this.itemTitle = item.getQbQuestion().getDescription(); } else { - this.itemUid = new Long(-1); + this.itemUid = Long.valueOf(-1); } this.isInitGroup = isInitGroup; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -2643,7 +2643,7 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); - ScratchieUser user = scratchieUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), + ScratchieUser user = scratchieUserDao.getUserByUserIDAndContentID(Long.valueOf(newUserUid.longValue()), toolContentId); if (user == null) { user = new ScratchieUser(); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java (.../PopulateMarksServlet.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java (.../PopulateMarksServlet.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -78,7 +78,7 @@ if (toolContentId == null) { for (int i = 1; i < 20000; i++) { - ScratchieSession session = scratchieService.getScratchieSessionBySessionId(new Long(i)); + ScratchieSession session = scratchieService.getScratchieSessionBySessionId(Long.valueOf(i)); if (session != null) { sessions.add(session); Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.java (.../ScribeUser.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.java (.../ScribeUser.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -85,7 +85,7 @@ } public ScribeUser(UserDTO user, ScribeSession scribeSession) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = Long.valueOf(user.getUserID().intValue()); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -319,7 +319,7 @@ // reset it to new toolContentId scribe.setToolContentId(toolContentId); - scribe.setCreateBy(new Long(newUserUid.longValue())); + scribe.setCreateBy(Long.valueOf(newUserUid.longValue())); scribeDAO.saveOrUpdate(scribe); } catch (ImportToolContentException e) { @@ -396,7 +396,7 @@ @Override public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + toolContentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (toolContentId == null) { String error = "Could not retrieve default content id for this tool"; ScribeService.logger.error(error); Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -64,7 +64,7 @@ HttpServletRequest request) { log.info("excuting monitoring action"); - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); monitoringForm.setContentFolderID(contentFolderID); @@ -154,7 +154,7 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionID - ScribeUser scribeUser = scribeService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), + ScribeUser scribeUser = scribeService.getUserByUserIdAndSessionId(Long.valueOf(user.getUserID().intValue()), toolSessionID); if (scribeUser == null) { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -80,7 +80,7 @@ @RequestMapping(path = "/definelater", method = RequestMethod.POST) public String defineLater(@ModelAttribute SpreadsheetForm spreadsheetForm, HttpServletRequest request) throws ServletException { - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId); spreadsheet.setDefineLater(true); @@ -98,7 +98,7 @@ */ private String readDatabaseData(SpreadsheetForm spreadsheetForm, HttpServletRequest request) throws ServletException { // save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request, SpreadsheetConstants.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, SpreadsheetConstants.PARAM_TOOL_CONTENT_ID)); Spreadsheet spreadsheet = null; @@ -191,7 +191,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - SpreadsheetUser spreadsheetUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()), + SpreadsheetUser spreadsheetUser = service.getUserByIDAndContent(Long.valueOf(user.getUserID().intValue()), spreadsheetForm.getSpreadsheet().getContentId()); if (spreadsheetUser == null) { spreadsheetUser = new SpreadsheetUser(user, spreadsheetPO); Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -79,7 +79,7 @@ //save toolContentID into HTTPSession ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); - Long sessionId = new Long(request.getParameter(SpreadsheetConstants.PARAM_TOOL_SESSION_ID)); + Long sessionId = Long.valueOf(request.getParameter(SpreadsheetConstants.PARAM_TOOL_SESSION_ID)); request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); request.setAttribute(AttributeNames.ATTR_MODE, mode); @@ -219,7 +219,7 @@ // get sessionId from HttpServletRequest HttpSession ss = SessionManager.getSession(); UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(userDTO.getUserID().longValue()); + Long userID = Long.valueOf(userDTO.getUserID().longValue()); String nextActivityUrl = service.finishToolSession(sessionId, userID); response.sendRedirect(nextActivityUrl); Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -111,7 +111,7 @@ @RequestMapping("/getUsers") @ResponseBody public String getUsers(HttpServletRequest request, HttpServletResponse response) throws IOException { - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); // paging parameters of tablesorter int size = WebUtil.readIntParam(request, "size"); @@ -164,7 +164,7 @@ */ @RequestMapping("/doStatistic") public String doStatistic(HttpServletRequest request) { - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); List statisticList = service.getStatistics(contentId); request.setAttribute(SpreadsheetConstants.ATTR_STATISTIC_LIST, statisticList); @@ -179,7 +179,7 @@ @RequestMapping("/viewAllMarks") public String viewAllMarks(HttpServletRequest request) { - Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); //return FileDetailsDTO list according to the given sessionID List userList = service.getUserListBySessionId(sessionId); @@ -199,7 +199,7 @@ public String releaseMarks(HttpServletRequest request, HttpServletResponse response) { //get service then update report table - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); service.releaseMarksForSession(sessionID); try { @@ -224,7 +224,7 @@ @RequestMapping("/downloadMarks") public String downloadMarks(HttpServletRequest request, HttpServletResponse response) { - Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); //return user list according to the given sessionID List userList = service.getUserListBySessionId(sessionID); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -309,13 +309,13 @@ int count = optMap.get(option.getUid()); double percentage = ((double) count / (double) numberAnswers) * 100d; option.setResponse(percentage); - option.setResponseFormatStr(new Long(Math.round(percentage)).toString()); + option.setResponseFormatStr(Long.valueOf(Math.round(percentage)).toString()); option.setResponseCount(count); } if (numFreeChoice != null) { double percentage = ((double) numFreeChoice / (double) numberAnswers) * 100d; answerDto.setOpenResponse(percentage); - answerDto.setOpenResponseFormatStr(new Long(Math.round(percentage)).toString()); + answerDto.setOpenResponseFormatStr(Long.valueOf(Math.round(percentage)).toString()); answerDto.setOpenResponseCount(numFreeChoice); } @@ -540,7 +540,7 @@ private Long getToolDefaultContentIdBySignature(String toolSignature) throws SurveyApplicationException { Long contentId = null; - contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + contentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (contentId == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); SurveyServiceImpl.log.error(error); @@ -594,7 +594,7 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); - SurveyUser user = surveyUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), + SurveyUser user = surveyUserDao.getUserByUserIDAndContentID(Long.valueOf(newUserUid.longValue()), toolContentId); if (user == null) { UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -352,7 +352,7 @@ @RequestMapping(path = "/definelater", method = RequestMethod.POST) public String definelater(SurveyForm startForm, HttpServletRequest request) throws Exception { // update define later flag to true - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Survey survey = surveyService.getSurveyByContentId(contentId); boolean isEditable = SurveyWebUtils.isSurveyEditable(survey); @@ -379,7 +379,7 @@ private String readDatabaseData(SurveyForm startForm, HttpServletRequest request) throws SurveyApplicationException { // save toolContentID into HTTPSession - Long contentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long contentId = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); // get back the survey and item list and display them on page List questions = null; @@ -516,7 +516,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - SurveyUser surveyUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()), + SurveyUser surveyUser = service.getUserByIDAndContent(Long.valueOf(user.getUserID().intValue()), authoringForm.getSurvey().getContentId()); if (surveyUser == null) { surveyUser = new SurveyUser(user, surveyPO); Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -110,7 +110,7 @@ // save toolContentID into HTTPSession ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); - Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); + Long sessionId = Long.valueOf(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); // it will be use when submissionDeadline or lock on finish page. request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID); @@ -468,7 +468,7 @@ // get sessionId from HttpServletRequest HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userID = new Long(user.getUserID().longValue()); + Long userID = Long.valueOf(user.getUserID().longValue()); String nextActivityUrl = surveyService.finishToolSession(sessionId, userID); response.sendRedirect(nextActivityUrl); @@ -576,7 +576,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - SurveyUser surveyUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId); + SurveyUser surveyUser = service.getUserByIDAndSession(Long.valueOf(user.getUserID().intValue()), sessionId); if (surveyUser == null) { SurveySession session = service.getSurveySessionBySessionId(sessionId); @@ -587,7 +587,7 @@ } private SurveyUser getSpecifiedUser(ISurveyService service, Long sessionId, Integer userId) { - return service.getUserByIDAndSession(new Long(userId.intValue()), sessionId); + return service.getUserByIDAndSession(Long.valueOf(userId.intValue()), sessionId); } } \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java (.../TaskListOutputFactory.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListOutputFactory.java (.../TaskListOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -63,7 +63,7 @@ TreeMap definitionMap = new TreeMap(); ToolOutputDefinition simpleDefinition = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, - new Long(0), null); + Long.valueOf(0), null); definitionMap.put(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, simpleDefinition); if (toolContentObject != null) { @@ -116,7 +116,7 @@ int num = taskListService.getNumTasksCompletedByUser(toolSessionId, learnerId); return new ToolOutput(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, - getI18NText(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, true), new Long(num)); + getI18NText(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, true), Long.valueOf(num)); } else if (name.startsWith(OUTPUT_NAME_TOOL_CONDITION)) { @@ -147,7 +147,7 @@ int num = taskListService.getNumTasksCompletedByUser(toolSessionId, learnerId); ToolOutput toolOutput = new ToolOutput(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, - getI18NText(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, true), new Long(num)); + getI18NText(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, true), Long.valueOf(num)); output.put(OUTPUT_NAME_LEARNER_NUM_TASKS_COMPLETED, toolOutput); String i18nDescription = getI18NText(OUTPUT_NAME_TOOL_CONDITION, true); @@ -162,4 +162,4 @@ return output; } -} +} \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -545,15 +545,15 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); - TaskListUser user = taskListUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), + TaskListUser user = taskListUserDao.getUserByUserIDAndContentID(Long.valueOf(newUserUid.longValue()), toolContentId); if (user == null) { user = new TaskListUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(Long.valueOf(newUserUid.longValue())); user.setTaskList(toolContentObj); } toolContentObj.setCreatedBy(user); @@ -834,7 +834,7 @@ private Long getToolDefaultContentIdBySignature(String toolSignature) throws TaskListException { Long contentId = null; - contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + contentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (contentId == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); TaskListServiceImpl.log.error(error); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java =================================================================== diff -u -rcb01d2d8c064728cb0e2ac524d2f89622a534e39 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java (.../AuthoringController.java) (revision cb01d2d8c064728cb0e2ac524d2f89622a534e39) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -263,7 +263,7 @@ HttpSession ss = SessionManager.getSession(); // get back login user DTO UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - TaskListUser taskListUser = taskListService.getUserByIDAndContent(new Long(user.getUserID().intValue()), + TaskListUser taskListUser = taskListService.getUserByIDAndContent(Long.valueOf(user.getUserID().intValue()), taskListForm.getTaskList().getContentId()); if (taskListUser == null) { taskListUser = new TaskListUser(user, taskListPO); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/SessionDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/SessionDTO.java (.../SessionDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/SessionDTO.java (.../SessionDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -150,7 +150,7 @@ if (sessionDTO == null) { return 1; } else { - return (int) (new Long(sessionId).longValue() - new Long(sessionDTO.sessionId).longValue()); + return (int) (Long.valueOf(sessionId).longValue() - Long.valueOf(sessionDTO.sessionId).longValue()); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredAnswersDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredAnswersDTO.java (.../VoteMonitoredAnswersDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -154,8 +154,8 @@ if (voteMonitoredAnswersDTO == null) { return 1; } else { - return (int) (new Long(questionUid).longValue() - - new Long(voteMonitoredAnswersDTO.questionUid).longValue()); + return (int) (Long.valueOf(questionUid).longValue() + - Long.valueOf(voteMonitoredAnswersDTO.questionUid).longValue()); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredUserDTO.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -105,7 +105,7 @@ if (VoteMonitoredUserDTO == null) { return 1; } else { - return (int) (new Long(queUsrId).longValue() - new Long(VoteMonitoredUserDTO.queUsrId).longValue()); + return (int) (Long.valueOf(queUsrId).longValue() - Long.valueOf(VoteMonitoredUserDTO.queUsrId).longValue()); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -314,7 +314,7 @@ int votesCount = voteUsrAttemptDAO.getStandardAttemptsForQuestionContentAndSessionUid(question.getUid(), toolSessionUid); totalStandardVotesCount += votesCount; - mapStandardUserCount.put(mapIndex, new Long(votesCount)); + mapStandardUserCount.put(mapIndex, Long.valueOf(votesCount)); mapStandardQuestionUid.put(mapIndex, question.getUid()); mapStandardToolSessionUid.put(mapIndex, toolSessionUid); @@ -323,7 +323,7 @@ mapVoteRates.put(mapIndex, voteRate); // mapIndex++ - mapIndex = new Long(mapIndex + 1); + mapIndex = Long.valueOf(mapIndex + 1); } // open votes @@ -334,7 +334,7 @@ mapStandardNominationsContent.put(mapIndex, messageService.getMessage("label.open.vote")); mapStandardNominationsHTMLedContent.put(mapIndex, messageService.getMessage("label.open.vote")); - mapStandardUserCount.put(mapIndex, new Long(userEnteredVotesCount)); + mapStandardUserCount.put(mapIndex, Long.valueOf(userEnteredVotesCount)); /** following are needed just for proper iteration in the summary jsp */ mapStandardQuestionUid.put(mapIndex, 1L); mapStandardToolSessionUid.put(mapIndex, 1L); @@ -384,7 +384,7 @@ int votesCount = voteUsrAttemptDAO.getStandardAttemptsForQuestionContentAndSessionUid(question.getUid(), session.getUid()); totalStandardVotesCount += votesCount; - mapStandardUserCount.put(mapIndex, new Long(votesCount)); + mapStandardUserCount.put(mapIndex, Long.valueOf(votesCount)); mapStandardQuestionUid.put(mapIndex, question.getUid()); mapStandardToolSessionUid.put(mapIndex, session.getUid()); @@ -393,7 +393,7 @@ mapVoteRates.put(mapIndex, voteRate); // mapIndex++ - mapIndex = new Long(mapIndex + 1); + mapIndex = Long.valueOf(mapIndex + 1); } // open votes @@ -403,7 +403,7 @@ mapVoteRates.put(mapIndex, voteRate); mapStandardNominationsHTMLedContent.put(mapIndex, messageService.getMessage("label.open.vote")); - mapStandardUserCount.put(mapIndex, new Long(userEnteredVotesCount)); + mapStandardUserCount.put(mapIndex, Long.valueOf(userEnteredVotesCount)); /** following are needed just for proper iteration in the summary jsp */ mapStandardQuestionUid.put(mapIndex, 1L); mapStandardToolSessionUid.put(mapIndex, 1L); @@ -451,7 +451,7 @@ allSessionsVotesCount += votesCount; // mapIndex++ - mapIndex = new Long(mapIndex + 1); + mapIndex = Long.valueOf(mapIndex + 1); } // open votes @@ -492,7 +492,7 @@ totalStandardVotesCount += votesCount; // mapIndex++ - mapIndex = new Long(mapIndex + 1); + mapIndex = Long.valueOf(mapIndex + 1); } // open votes if (voteContent.isAllowText()) { @@ -832,7 +832,7 @@ long userId = toolUser.getUserID().longValue(); // We get whatever the source tool provides us with and try to create questions out of it - ToolOutput toolInput = getToolInput(voteContent.getVoteContentId(), new Long(userId).intValue()); + ToolOutput toolInput = getToolInput(voteContent.getVoteContentId(), Long.valueOf(userId).intValue()); Object value = toolInput.getValue().getComplex(); short inputsAdded = voteContent.getExternalInputsAdded() == null ? 0 : voteContent.getExternalInputsAdded(); @@ -1085,7 +1085,7 @@ logger.info("In case of question is selected"); for (String key : mapGeneralCheckedOptionsContent.keySet()) { - Long questionDisplayOrder = new Long(key); + Long questionDisplayOrder = Long.valueOf(key); VoteQueContent question = getQuestionByDisplayOrder(questionDisplayOrder, voteContentUid); createAttempt(question, voteQueUsr, attempTime, timeZone, userEntry, voteSession); @@ -1271,7 +1271,7 @@ if (fromContentId == null) { // attempt retrieving tool's default content id with signatute VoteAppConstants.MY_SIGNATURE long defaultContentId = getToolDefaultContentIdBySignature(VoteAppConstants.MY_SIGNATURE); - fromContentId = new Long(defaultContentId); + fromContentId = Long.valueOf(defaultContentId); } if (toContentId == null) { @@ -1284,7 +1284,7 @@ if (fromContent == null) { // attempt retrieving tool's default content id with signatute VoteAppConstants.MY_SIGNATURE long defaultContentId = getToolDefaultContentIdBySignature(VoteAppConstants.MY_SIGNATURE); - fromContentId = new Long(defaultContentId); + fromContentId = Long.valueOf(defaultContentId); fromContent = voteContentDAO.getVoteContentByContentId(fromContentId); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteComparator.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteComparator.java (.../VoteComparator.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteComparator.java (.../VoteComparator.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -54,8 +54,8 @@ String s1 = (String) o1; String s2 = (String) o2; - key1 = new Long(s1).intValue(); - key2 = new Long(s2).intValue(); + key1 = Long.valueOf(s1).intValue(); + key2 = Long.valueOf(s2).intValue(); } return key1 - key2; @@ -65,4 +65,4 @@ public boolean equals(Object o) { return compare(this, o) == 0; } -} +} \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java (.../VoteUtils.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java (.../VoteUtils.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -87,7 +87,7 @@ public static void setDefineLater(HttpServletRequest request, boolean value, String strToolContentID, IVoteService voteService) { - VoteContent voteContent = voteService.getVoteContent(new Long(strToolContentID)); + VoteContent voteContent = voteService.getVoteContent(Long.valueOf(strToolContentID)); if (voteContent != null) { voteContent.setDefineLater(value); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -420,7 +420,7 @@ if (!duplicates) { VoteQuestionDTO voteQuestionDTO = new VoteQuestionDTO(); - voteQuestionDTO.setDisplayOrder(new Long(listSize + 1).toString()); + voteQuestionDTO.setDisplayOrder(Long.valueOf(listSize + 1).toString()); voteQuestionDTO.setNomination(newNomination); questionDTOs.add(voteQuestionDTO); @@ -616,11 +616,11 @@ int optionCount = 0; boolean isNominationsDuplicate = false; for (long i = 1; i <= VoteAppConstants.MAX_OPTION_COUNT; i++) { - String currentOption = mapQuestion.get(new Long(i).toString()); + String currentOption = mapQuestion.get(Long.valueOf(i).toString()); optionCount = 0; for (long j = 1; j <= VoteAppConstants.MAX_OPTION_COUNT; j++) { - String backedOption = mapQuestion.get(new Long(j).toString()); + String backedOption = mapQuestion.get(Long.valueOf(j).toString()); if (currentOption != null && backedOption != null) { if (currentOption.equals(backedOption)) { @@ -644,7 +644,7 @@ DataFlowObject assignedDataFlowObject = null; - List dataFlowObjects = voteService.getDataFlowObjects(new Long(strToolContentID)); + List dataFlowObjects = voteService.getDataFlowObjects(Long.valueOf(strToolContentID)); List dataFlowObjectNames = null; if (dataFlowObjects != null) { dataFlowObjectNames = new ArrayList<>(dataFlowObjects.size()); @@ -680,7 +680,7 @@ request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); - VoteContent voteContentTest = voteService.getVoteContent(new Long(strToolContentID)); + VoteContent voteContentTest = voteService.getVoteContent(Long.valueOf(strToolContentID)); if (errorMap.isEmpty()) { ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); @@ -696,7 +696,7 @@ VoteUtils.setDefineLater(request, false, strToolContentID, voteService); // audit log the teacher has started editing activity in monitor - voteService.auditLogStartEditingActivityInMonitor(new Long(strToolContentID)); + voteService.auditLogStartEditingActivityInMonitor(Long.valueOf(strToolContentID)); // recalculate User Answers voteService.recalculateUserAnswers(voteContentTest, oldQuestions, questionDTOs, deletedQuestionDTOs); @@ -817,8 +817,8 @@ /* the authoring url must be passed a tool content id */ String strToolContentId = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); - voteAuthoringForm.setToolContentID(new Long(strToolContentId).toString()); - voteGeneralAuthoringDTO.setToolContentID(new Long(strToolContentId).toString()); + voteAuthoringForm.setToolContentID(Long.valueOf(strToolContentId).toString()); + voteGeneralAuthoringDTO.setToolContentID(Long.valueOf(strToolContentId).toString()); if (strToolContentId == null || strToolContentId.equals("")) { errorMap.add("GLOBAL", messageService.getMessage("error.contentId.required")); @@ -828,13 +828,13 @@ request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - VoteContent voteContent = voteService.getVoteContent(new Long(strToolContentId)); + VoteContent voteContent = voteService.getVoteContent(Long.valueOf(strToolContentId)); // if mcContent does not exist, try to use default content instead. if (voteContent == null) { long defaultContentID = voteService.getToolDefaultContentIdBySignature(VoteAppConstants.MY_SIGNATURE); voteContent = voteService.getVoteContent(defaultContentID); - voteContent = VoteContent.newInstance(voteContent, new Long(strToolContentId)); + voteContent = VoteContent.newInstance(voteContent, Long.valueOf(strToolContentId)); } AuthoringController.prepareDTOandForm(request, voteContent, voteAuthoringForm, voteGeneralAuthoringDTO); @@ -857,7 +857,7 @@ sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, voteGeneralAuthoringDTO.getActivityTitle()); sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, voteGeneralAuthoringDTO.getActivityInstructions()); - List dataFlowObjects = voteService.getDataFlowObjects(new Long(strToolContentId)); + List dataFlowObjects = voteService.getDataFlowObjects(Long.valueOf(strToolContentId)); if (dataFlowObjects != null) { List dataFlowObjectNames = new ArrayList<>(dataFlowObjects.size()); int objectIndex = 1; @@ -932,7 +932,7 @@ try { //retrieve uid of the content based on default content id determined above defaultContentID - VoteContent voteContent = voteService.getVoteContent(new Long(defaultContentID)); + VoteContent voteContent = voteService.getVoteContent(Long.valueOf(defaultContentID)); if (voteContent == null) { logger.error("Exception occured: No default content"); errorMap.add("GLOBAL", messageService.getMessage("error.defaultContent.notSetup")); @@ -1204,7 +1204,7 @@ newContent = true; } - voteContent.setVoteContentId(new Long(strToolContentID)); + voteContent.setVoteContentId(Long.valueOf(strToolContentID)); voteContent.setTitle(richTextTitle); voteContent.setInstructions(richTextInstructions); voteContent.setUpdateDate(new Date(System.currentTimeMillis())); @@ -1227,7 +1227,7 @@ voteService.updateVote(voteContent); } - voteContent = voteService.getVoteContent(new Long(strToolContentID)); + voteContent = voteService.getVoteContent(Long.valueOf(strToolContentID)); return voteContent; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -107,7 +107,7 @@ String userID = request.getParameter(USER_ID); voteLearningForm.setUserID(userID); - VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); VoteContent voteContent = voteSession.getVoteContent(); voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); @@ -117,7 +117,7 @@ Long toolSessionUid = voteSession.getUid(); - VoteQueUsr existingVoteQueUsr = voteService.getVoteUserBySession(new Long(userID), voteSession.getUid()); + VoteQueUsr existingVoteQueUsr = voteService.getVoteUserBySession(Long.valueOf(userID), voteSession.getUid()); existingVoteQueUsr.setFinalScreenRequested(true); voteService.updateVoteUser(existingVoteQueUsr); @@ -132,7 +132,7 @@ request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); - boolean isLastActivity = voteService.isLastActivity(new Long(toolSessionID)); + boolean isLastActivity = voteService.isLastActivity(Long.valueOf(toolSessionID)); request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, isLastActivity); return "/learning/AllNominations"; } @@ -162,7 +162,7 @@ String revisitingUser = request.getParameter(REVISITING_USER); voteLearningForm.setRevisitingUser(revisitingUser); - VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); VoteContent voteContent = voteSession.getVoteContent(); voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); @@ -197,7 +197,7 @@ voteLearningForm.resetCommands(); request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); - boolean isLastActivity = voteService.isLastActivity(new Long(toolSessionID)); + boolean isLastActivity = voteService.isLastActivity(Long.valueOf(toolSessionID)); request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, isLastActivity); return "/learning/ViewAnswers"; } @@ -228,7 +228,7 @@ voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); - VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); VoteContent voteContent = voteSession.getVoteContent(); voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); @@ -257,12 +257,12 @@ logger.info("Tool Session id :" + toolSessionID); voteLearningForm.setToolSessionID(toolSessionID); - VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); String userID = request.getParameter(USER_ID); logger.info("User id:" + userID); voteLearningForm.setUserID(userID); - VoteQueUsr voteQueUsr = voteService.getVoteUserBySession(new Long(userID), voteSession.getUid()); + VoteQueUsr voteQueUsr = voteService.getVoteUserBySession(Long.valueOf(userID), voteSession.getUid()); voteQueUsr.setResponseFinalised(true); if (!voteSession.getVoteContent().isShowResults()) { @@ -283,7 +283,7 @@ String nextUrl = null; try { - nextUrl = voteService.leaveToolSession(new Long(toolSessionID), new Long(userID)); + nextUrl = voteService.leaveToolSession(Long.valueOf(toolSessionID), Long.valueOf(userID)); } catch (DataMissingException e) { logger.error("failure getting nextUrl: " + e); voteLearningForm.resetCommands(); @@ -331,7 +331,7 @@ String userEntry = request.getParameter(USER_ENTRY); voteLearningForm.setUserEntry(userEntry); - VoteSession session = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteSession session = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); @@ -378,7 +378,7 @@ Long toolSessionUid = session.getUid(); - VoteQueUsr user = voteService.getVoteUserBySession(new Long(userID), session.getUid()); + VoteQueUsr user = voteService.getVoteUserBySession(Long.valueOf(userID), session.getUid()); if (user == null) { throw new VoteApplicationException( "User with userId= " + userID + " and sessionUid= " + session.getUid() + " doesn't exist."); @@ -445,7 +445,7 @@ String revisitingUser = request.getParameter(REVISITING_USER); voteLearningForm.setRevisitingUser(revisitingUser); - VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); VoteContent voteContent = voteSession.getVoteContent(); @@ -571,7 +571,7 @@ * retrieve it and the relavent content */ - VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); if (voteSession == null) { @@ -623,7 +623,7 @@ user = getCurrentUser(toolSessionID); } - boolean isLastActivity = voteService.isLastActivity(new Long(toolSessionID)); + boolean isLastActivity = voteService.isLastActivity(Long.valueOf(toolSessionID)); request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, isLastActivity); // check if there is submission deadline @@ -651,7 +651,7 @@ //process group leader VoteQueUsr groupLeader = null; if (voteContent.isUseSelectLeaderToolOuput()) { - groupLeader = voteService.checkLeaderSelectToolForSessionLeader(user, new Long(toolSessionID)); + groupLeader = voteService.checkLeaderSelectToolForSessionLeader(user, Long.valueOf(toolSessionID)); // forwards to the leaderSelection page if (groupLeader == null && !mode.equals(ToolAccessMode.TEACHER.toString())) { @@ -686,7 +686,7 @@ voteLearningForm.setGroupLeaderName(groupLeader.getFullname()); voteLearningForm.setGroupLeaderUserId( groupLeader.getQueUsrId() != null ? groupLeader.getQueUsrId().toString() : ""); - boolean isUserLeader = voteService.isUserGroupLeader(user.getQueUsrId(), new Long(toolSessionID)); + boolean isUserLeader = voteService.isUserGroupLeader(user.getQueUsrId(), Long.valueOf(toolSessionID)); voteLearningForm.setIsUserLeader(isUserLeader); } @@ -704,7 +704,7 @@ voteService.prepareChartData(request, voteContent.getVoteContentId(), voteSession.getUid(), voteGeneralLearnerFlowDTO); - boolean isGroupedActivity = voteService.isGroupedActivity(new Long(voteLearningForm.getToolContentID())); + boolean isGroupedActivity = voteService.isGroupedActivity(Long.valueOf(voteLearningForm.getToolContentID())); request.setAttribute("isGroupedActivity", isGroupedActivity); return "/learning/ExitLearning"; @@ -861,8 +861,8 @@ return false; } else { try { - toolSessionID = new Long(strToolSessionId).longValue(); - voteLearningForm.setToolSessionID(new Long(toolSessionID).toString()); + toolSessionID = Long.valueOf(strToolSessionId).longValue(); + voteLearningForm.setToolSessionID(Long.valueOf(toolSessionID).toString()); } catch (NumberFormatException e) { // persistInRequestError(request, "error.sessionId.numberFormatException"); @@ -895,9 +895,9 @@ // get back login user DTO HttpSession ss = SessionManager.getSession(); UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); - Long userId = new Long(toolUser.getUserID().longValue()); + Long userId = Long.valueOf(toolUser.getUserID().longValue()); - VoteSession session = voteService.getSessionBySessionId(new Long(toolSessionId)); + VoteSession session = voteService.getSessionBySessionId(Long.valueOf(toolSessionId)); VoteQueUsr user = voteService.getVoteUserBySession(userId, session.getUid()); if (user == null) { String userName = toolUser.getLogin(); @@ -911,11 +911,11 @@ } private VoteQueUsr getSpecifiedUser(String toolSessionId, Integer userId) { - VoteSession session = voteService.getSessionBySessionId(new Long(toolSessionId)); - VoteQueUsr user = voteService.getVoteUserBySession(new Long(userId.intValue()), session.getUid()); + VoteSession session = voteService.getSessionBySessionId(Long.valueOf(toolSessionId)); + VoteQueUsr user = voteService.getVoteUserBySession(Long.valueOf(userId.intValue()), session.getUid()); if (user == null) { logger.error("Unable to find specified user for Vote activity. Screens are likely to fail. SessionId=" - + new Long(toolSessionId) + " UserId=" + userId); + + Long.valueOf(toolSessionId) + " UserId=" + userId); } return user; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -303,7 +303,7 @@ Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); logger.warn("Make sure ToolContentId is passed" + toolContentID); - VoteContent voteContent = voteService.getVoteContent(new Long(toolContentID)); + VoteContent voteContent = voteService.getVoteContent(Long.valueOf(toolContentID)); if (voteContent == null) { logger.error("Vote Content does not exist"); @@ -316,7 +316,7 @@ /* this section is related to summary tab. Starts here. */ - SortedSet sessionDTOs = voteService.getMonitoringSessionDTOs(new Long(toolContentID)); + SortedSet sessionDTOs = voteService.getMonitoringSessionDTOs(Long.valueOf(toolContentID)); request.setAttribute("sessionDTOs", sessionDTOs); request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO); @@ -381,7 +381,7 @@ MonitoringController.repopulateRequestParameters(request, voteGeneralMonitoringDTO); - boolean isGroupedActivity = voteService.isGroupedActivity(new Long(toolContentID)); + boolean isGroupedActivity = voteService.isGroupedActivity(Long.valueOf(toolContentID)); request.setAttribute("isGroupedActivity", isGroupedActivity); request.setAttribute("isAllowText", voteContent.isAllowText()); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java (.../VoteChartGeneratorController.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/VoteChartGeneratorController.java (.../VoteChartGeneratorController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -85,7 +85,7 @@ //sessionId should not be blank } else if (!StringUtils.isBlank(currentSessionId)) { - VoteSession voteSession = voteService.getSessionBySessionId(new Long(currentSessionId)); + VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(currentSessionId)); VoteContent voteContent = voteSession.getVoteContent(); VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = voteService.prepareChartData(request, Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java =================================================================== diff -u -ra1064a52a646aa043ea1fe371726537fd305c5de -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java (.../WikiUser.java) (revision a1064a52a646aa043ea1fe371726537fd305c5de) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java (.../WikiUser.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -87,7 +87,7 @@ } public WikiUser(UserDTO user, WikiSession wikiSession) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = Long.valueOf(user.getUserID().intValue()); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java (.../WikiOutputFactory.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java (.../WikiOutputFactory.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -52,11 +52,11 @@ TreeMap definitionMap = new TreeMap(); ToolOutputDefinition definition1 = buildRangeDefinition(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, - new Long(0), null); + Long.valueOf(0), null); definitionMap.put(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, definition1); ToolOutputDefinition definition2 = buildRangeDefinition(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_ADDS, - new Long(0), null); + Long.valueOf(0), null); definitionMap.put(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_ADDS, definition2); return definitionMap; @@ -100,7 +100,7 @@ private ToolOutput getNumEdits(IWikiService wikiService, Long learnerId, Long toolSessionId) { int num = wikiService.getEditsNum(learnerId, toolSessionId); return new ToolOutput(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, - getI18NText(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, true), new Long(num)); + getI18NText(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, true), Long.valueOf(num)); } /** @@ -114,6 +114,6 @@ private ToolOutput getNumAdds(IWikiService wikiService, Long learnerId, Long toolSessionId) { int num = wikiService.getAddsNum(learnerId, toolSessionId); return new ToolOutput(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, - getI18NText(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, true), new Long(num)); + getI18NText(WikiOutputFactory.OUTPUT_NAME_LEARNER_NUM_EDITS, true), Long.valueOf(num)); } -} +} \ No newline at end of file Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -408,7 +408,7 @@ // reset it to new toolContentId wiki.setToolContentId(toolContentId); - wiki.setCreateBy(new Long(newUserUid.longValue())); + wiki.setCreateBy(Long.valueOf(newUserUid.longValue())); // Making sure the wiki titles do not have trailing newline characters for (WikiPage wikiPage : wiki.getWikiPages()) { @@ -508,7 +508,7 @@ @Override public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; - toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + toolContentId = Long.valueOf(toolService.getToolDefaultContentIdBySignature(toolSignature)); if (toolContentId == null) { String error = "Could not retrieve default content id for this tool"; WikiService.logger.error(error); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -209,7 +209,7 @@ @RequestMapping(path = "/removePage", method = RequestMethod.POST) public String removePage(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request) throws Exception { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI); Wiki wiki = wikiService.getWikiByContentId(toolContentID); if (wiki.isDefineLater()) { Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -223,7 +223,7 @@ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); // attempt to retrieve user using userId and toolSessionId - WikiUser wikiUser = wikiService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()), + WikiUser wikiUser = wikiService.getUserByUserIdAndSessionId(Long.valueOf(user.getUserID().intValue()), toolSessionId); if (wikiUser == null) { Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java (.../WikiPageController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/controller/WikiPageController.java (.../WikiPageController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -127,7 +127,7 @@ */ protected void revertPage(WikiPageForm wikiForm, HttpServletRequest request) throws Exception { - Long revertPageContentVersion = new Long( + Long revertPageContentVersion = Long.valueOf( WebUtil.readLongParam(request, WikiConstants.ATTR_HISTORY_PAGE_CONTENT_ID)); Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI); @@ -165,7 +165,7 @@ */ protected void comparePage(WikiPageForm wikiForm, HttpServletRequest request) throws Exception { - Long revertPageContentVersion = new Long( + Long revertPageContentVersion = Long.valueOf( WebUtil.readLongParam(request, WikiConstants.ATTR_HISTORY_PAGE_CONTENT_ID)); Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI); @@ -190,7 +190,7 @@ */ protected void viewPage(WikiPageForm wikiForm, HttpServletRequest request) throws Exception { - Long revertPageContentVersion = new Long( + Long revertPageContentVersion = Long.valueOf( WebUtil.readLongParam(request, WikiConstants.ATTR_HISTORY_PAGE_CONTENT_ID)); Long currentPageUid = WebUtil.readLongParam(request, WikiConstants.ATTR_CURRENT_WIKI); Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r82ec29b9300c3ced993602face47a6626ccb667e --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) @@ -56,7 +56,7 @@ @RequestMapping("/start") public String start(HttpServletRequest request) { - Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + Long toolContentID = Long.valueOf(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);