Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java (.../OrgPasswordChangeController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -133,7 +133,7 @@ int totalPages = 1; int totalUsers = users.size(); if (rowLimit < users.size()) { - totalPages = new Double( + totalPages = Double.valueOf( Math.ceil(Integer.valueOf(users.size()).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); int firstRow = (page - 1) * rowLimit; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java (.../PolicyManagementController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java (.../PolicyManagementController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -230,7 +230,7 @@ List consentDtos = policyService.getConsentDtosByPolicy(policyUid, page - 1, rowLimit, sortBy, sortOrder, searchString); int countUsers = userManagementService.getCountUsers(searchString); - int totalPages = new Double( + int totalPages = Double.valueOf( Math.ceil(Integer.valueOf(countUsers).doubleValue() / Integer.valueOf(rowLimit).doubleValue())).intValue(); ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); Index: lams_central/web/includes/javascript/browser_detect.js =================================================================== diff -u -r1dd0a5d30e8fe38e53b897c238b843b722cceeea -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_central/web/includes/javascript/browser_detect.js (.../browser_detect.js) (revision 1dd0a5d30e8fe38e53b897c238b843b722cceeea) +++ lams_central/web/includes/javascript/browser_detect.js (.../browser_detect.js) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -1,3 +1,3 @@ /*! modernizr 3.6.0 (Custom Build) | MIT * * https://modernizr.com/download/?-atobbtoa-checked-cookies-datauri-nthchild-opacity-svg-svgforeignobject-time-todataurljpeg_todataurlpng_todataurlwebp-websockets-xhrresponsetypejson-xhrresponsetypetext-setclasses !*/ -!function(e,t,n){function a(e,t){return typeof e===t}function o(){var e,t,n,o,i,r,s;for(var d in u)if(u.hasOwnProperty(d)){if(e=[],t=u[d],t.name&&(e.push(t.name.toLowerCase()),t.options&&t.options.aliases&&t.options.aliases.length))for(n=0;na;a++)n=n&&t[a].offsetWidth===a%2+1;Modernizr.addTest("nthchild",n)},5);var T={}.toString;Modernizr.addTest("svgforeignobject",function(){return!!t.createElementNS&&/SVGForeignObject/.test(T.call(t.createElementNS("http://www.w3.org/2000/svg","foreignObject")))}),o(),i(f),delete l.addTest,delete l.addAsyncTest;for(var x=0;xa;a++)n=n&&t[a].offsetWidth===a%2+1;Modernizr.addTest("nthchild",n)},5);var T={}.toString;Modernizr.addTest("svgforeignobject",function(){return!!t.createElementNS&&/SVGForeignObject/.test(T.call(t.createElementNS("http://www.w3.org/2000/svg","foreignObject")))}),o(),i(f),delete l.addTest,delete l.addAsyncTest;for(var x=0;x * The action servlet that triggers the system driven grouping (random grouping) and allows the learner to view the * result of the grouping. @@ -68,7 +67,6 @@ *

* * @author Jacky Fang - * */ @Controller @RequestMapping("/grouping") @@ -79,7 +77,7 @@ private ILearnerFullService learnerService; @Autowired private ActivityMapping activityMapping; - + // --------------------------------------------------------------------- // Class level constants - Session Attributes // --------------------------------------------------------------------- @@ -111,21 +109,22 @@ return "error"; } Long lessonId = learnerProgress.getLesson().getLessonId(); - boolean groupingDone = learnerService.performGrouping(lessonId, activity.getActivityId(), - currentUserId, forceGroup); + boolean groupingDone = learnerService.performGrouping(lessonId, activity.getActivityId(), currentUserId, + forceGroup); groupingForm.setPreviewLesson(learnerProgress.getLesson().isPreviewLesson()); groupingForm.setTitle(activity.getTitle()); groupingForm.setActivityID(activity.getActivityId()); request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId); - + prepareDataForShowPage(currentUserId, request); - + //Load up the grouping information and forward to the jsp page to display all the groups and members. if (groupingDone) { request.setAttribute(GroupingController.FINISHED_BUTTON, Boolean.TRUE); ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); - request.setAttribute(GroupingController.FINISHED_BUTTON, new Boolean((mode == null) || !mode.isTeacher())); + request.setAttribute(GroupingController.FINISHED_BUTTON, + Boolean.valueOf((mode == null) || !mode.isTeacher())); //find activity position within Learning Design and store it as request attribute ActivityPositionDTO positionDTO = learnerService.getActivityPosition(activityId); @@ -136,35 +135,36 @@ return "grouping/show"; } else - // forward to group choosing page - if (((GroupingActivity) activity).getCreateGrouping().isLearnerChoiceGrouping()) { - Long groupingId = ((GroupingActivity) activity).getCreateGrouping().getGroupingId(); - Integer maxNumberOfLeaernersPerGroup = learnerService.calculateMaxNumberOfLearnersPerGroup(lessonId, - groupingId); + // forward to group choosing page + if (((GroupingActivity) activity).getCreateGrouping().isLearnerChoiceGrouping()) { + Long groupingId = ((GroupingActivity) activity).getCreateGrouping().getGroupingId(); + Integer maxNumberOfLeaernersPerGroup = learnerService.calculateMaxNumberOfLearnersPerGroup(lessonId, + groupingId); - LearnerChoiceGrouping groupingDb = (LearnerChoiceGrouping) learnerService.getGrouping(groupingId); - request.setAttribute(GroupingController.MAX_LEARNERS_PER_GROUP, maxNumberOfLeaernersPerGroup); - request.setAttribute(GroupingController.VIEW_STUDENTS_BEFORE_SELECTION, - groupingDb.getViewStudentsBeforeSelection()); - return "grouping/choose"; - - } else { - return "grouping/wait"; - } + LearnerChoiceGrouping groupingDb = (LearnerChoiceGrouping) learnerService.getGrouping(groupingId); + request.setAttribute(GroupingController.MAX_LEARNERS_PER_GROUP, maxNumberOfLeaernersPerGroup); + request.setAttribute(GroupingController.VIEW_STUDENTS_BEFORE_SELECTION, + groupingDb.getViewStudentsBeforeSelection()); + return "grouping/choose"; + + } else { + return "grouping/wait"; + } } - + /** - * Load up the grouping information and forward to the jsp page to display all the groups and members. This method is used only to show show.jsp page to the teacher. + * Load up the grouping information and forward to the jsp page to display all the groups and members. This method + * is used only to show show.jsp page to the teacher. */ @RequestMapping("/viewGrouping") public String viewGrouping(HttpServletRequest request) throws IOException, ServletException { int userId = WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID); prepareDataForShowPage(userId, request); - + request.setAttribute(GroupingController.FINISHED_BUTTON, false); return "grouping/show"; } - + /** * Common method for performGrouping(GroupingForm, HttpServletRequest) and viewGrouping(HttpServletRequest) */ Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java =================================================================== diff -u -r7116e79c883ad42375d9fa3278dec8a84733ea86 -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java (.../ContributeActivityDTO.java) (revision 7116e79c883ad42375d9fa3278dec8a84733ea86) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java (.../ContributeActivityDTO.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -140,7 +140,7 @@ || contributionType.equals(ContributionTypes.CONTENT_EDITED) || contributionType.equals(ContributionTypes.CONTRIBUTION)); - this.isRequired = new Boolean(isReq); + this.isRequired = Boolean.valueOf(isReq); } /** @@ -166,4 +166,4 @@ this.isComplete = isComplete; } } -} +} \ No newline at end of file Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java (.../Deploy.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -57,7 +57,7 @@ } Boolean forceDB = Boolean.FALSE; if (args.length == 2 && args[1] != null) { - forceDB = new Boolean(args[1]); + forceDB = Boolean.valueOf(args[1]); } System.out.println("Starting Tool Deploy"); @@ -195,4 +195,4 @@ } } -} +} \ No newline at end of file Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -1206,7 +1206,7 @@ } } if (totalMark != null) { - Double mark = new Double(totalMark); + Double mark = Double.valueOf(totalMark); toolService.updateActivityMark(mark, null, user.getUserId().intValue(), toolSessionID, false); } } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java (.../LearningController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -154,7 +154,7 @@ // if isLimitedInput = false then don't restrict the number of chars // Indicate don't restrict number of chars by allowNumber = 0 Long forumId = forum.getUid(); - Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor()); + Boolean allowRichEditor = Boolean.valueOf(forum.isAllowRichEditor()); int minCharacters = forum.isLimitedMinCharacters() ? forum.getMinCharacters() : 0; int maxCharacters = forum.isLimitedMaxCharacters() || forum.isAllowRichEditor() ? forum.getMaxCharacters() : 0; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -421,7 +421,7 @@ String instruction = forum.getInstructions(); boolean isForumEditable = ForumWebUtils.isForumEditable(forum); - request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable)); + request.setAttribute(ForumConstants.PAGE_EDITABLE, Boolean.valueOf(isForumEditable)); request.setAttribute("title", title); request.setAttribute("instruction", instruction); } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/util/LamsBasicLTIUtil.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/util/LamsBasicLTIUtil.java (.../LamsBasicLTIUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/util/LamsBasicLTIUtil.java (.../LamsBasicLTIUtil.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -67,7 +67,7 @@ LamsBasicLTIUtil.setProperty(info, "key", basicLTIItem.getKey()); LamsBasicLTIUtil.setProperty(info, "debug", "false"); LamsBasicLTIUtil.setProperty(info, "frameheight", Integer.valueOf(basicLTIItem.getFrameHeight()).toString()); - LamsBasicLTIUtil.setProperty(info, "newwindow", new Boolean(basicLTIItem.isOpenUrlNewWindow()).toString()); + LamsBasicLTIUtil.setProperty(info, "newwindow", Boolean.valueOf(basicLTIItem.isOpenUrlNewWindow()).toString()); LamsBasicLTIUtil.setProperty(info, "title", basicLTIItem.getTitle()); LamsBasicLTIUtil.setProperty(info, BasicLTIUtil.BASICLTI_SUBMIT, basicLTIItem.getButtonText()); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java (.../LearningController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -139,7 +139,7 @@ sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); sessionMap.put(AttributeNames.ATTR_MODE, mode); - sessionMap.put(CommonCartridgeConstants.ATTR_RUN_AUTO, new Boolean(runAuto)); + sessionMap.put(CommonCartridgeConstants.ATTR_RUN_AUTO, Boolean.valueOf(runAuto)); // add define later support if (commonCartridge.isDefineLater()) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java =================================================================== diff -u -rc87bb47eb670934f10192c08922f83367bc36230 -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java (.../McOptionDTO.java) (revision c87bb47eb670934f10192c08922f83367bc36230) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java (.../McOptionDTO.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -47,7 +47,7 @@ public McOptionDTO(QbOption option) { this.candidateAnswer = option.getName(); this.qbOptionUid = option.getUid(); - //this.correct = new Boolean(option.isCorrectOption()).toString(); + //this.correct = Boolean.valueOf(option.isCorrectOption()).toString(); if (option.isCorrect()) { this.correct = "Correct"; @@ -113,4 +113,4 @@ } } -} +} \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -845,7 +845,7 @@ updateMcQueUsr(user); // propagate changes to Gradebook - toolService.updateActivityMark(new Double(totalMark), null, user.getQueUsrId().intValue(), + toolService.updateActivityMark(Double.valueOf(totalMark), null, user.getQueUsrId().intValue(), mcSession.getMcSessionId(), false); // record mark change with audit service Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java (.../LearningUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java (.../LearningUtil.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -59,7 +59,7 @@ */ public static McGeneralLearnerFlowDTO buildMcGeneralLearnerFlowDTO(McContent mcContent) { McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = new McGeneralLearnerFlowDTO(); - mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); + mcGeneralLearnerFlowDTO.setRetries(Boolean.valueOf(mcContent.isRetries()).toString()); mcGeneralLearnerFlowDTO.setActivityTitle(mcContent.getTitle()); mcGeneralLearnerFlowDTO.setActivityInstructions(mcContent.getInstructions()); mcGeneralLearnerFlowDTO.setPassMark(mcContent.getPassMark()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/LearningController.java (.../LearningController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -128,8 +128,8 @@ HttpServletResponse response) { mcLearningForm.setMcService(mcService); - mcLearningForm.setPassMarkApplicable(new Boolean(false).toString()); - mcLearningForm.setUserOverPassMark(new Boolean(false).toString()); + mcLearningForm.setPassMarkApplicable(Boolean.valueOf(false).toString()); + mcLearningForm.setUserOverPassMark(Boolean.valueOf(false).toString()); SessionMap sessionMap = new SessionMap<>(); List sequentialCheckedCa = new LinkedList<>(); @@ -185,7 +185,7 @@ mcLearningForm.setToolContentID(mcContent.getMcContentId().toString()); McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent); - mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString()); + mcGeneralLearnerFlowDTO.setTotalCountReached(Boolean.valueOf(false).toString()); mcGeneralLearnerFlowDTO.setQuestionIndex(Integer.valueOf(1)); Boolean displayAnswers = mcContent.isDisplayAnswers(); @@ -483,10 +483,10 @@ Integer totalQuestionCount = mcGeneralLearnerFlowDTO.getTotalQuestionCount(); Integer questionIndex = mcLearningForm.getQuestionIndex(); if (totalQuestionCount.equals(questionIndex)) { - mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(true).toString()); + mcGeneralLearnerFlowDTO.setTotalCountReached(Boolean.valueOf(true).toString()); } - mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); + mcGeneralLearnerFlowDTO.setRetries(Boolean.valueOf(mcContent.isRetries()).toString()); mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible()); mcGeneralLearnerFlowDTO.setQuestionIndex(questionIndex); request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); @@ -577,12 +577,12 @@ } mcGeneralLearnerFlowDTO.setAttemptMap(attemptMap); - mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); - mcGeneralLearnerFlowDTO.setPassMarkApplicable(new Boolean(mcContent.isPassMarkApplicable()).toString()); - mcGeneralLearnerFlowDTO.setUserOverPassMark(new Boolean(user.isLastAttemptMarkPassed()).toString()); + mcGeneralLearnerFlowDTO.setRetries(Boolean.valueOf(mcContent.isRetries()).toString()); + mcGeneralLearnerFlowDTO.setPassMarkApplicable(Boolean.valueOf(mcContent.isPassMarkApplicable()).toString()); + mcGeneralLearnerFlowDTO.setUserOverPassMark(Boolean.valueOf(user.isLastAttemptMarkPassed()).toString()); mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible()); - mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(mcContent.isShowMarks()).toString()); - mcGeneralLearnerFlowDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString()); + mcGeneralLearnerFlowDTO.setShowMarks(Boolean.valueOf(mcContent.isShowMarks()).toString()); + mcGeneralLearnerFlowDTO.setDisplayAnswers(Boolean.valueOf(mcContent.isDisplayAnswers()).toString()); mcGeneralLearnerFlowDTO.setDisplayFeedbackOnly(((Boolean) mcContent.isDisplayFeedbackOnly()).toString()); mcGeneralLearnerFlowDTO.setLearnerMark(user.getLastAttemptTotalMark()); @@ -632,9 +632,9 @@ McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent); mcGeneralLearnerFlowDTO.setQuestionIndex(Integer.valueOf(1)); - mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString()); + mcGeneralLearnerFlowDTO.setRetries(Boolean.valueOf(mcContent.isRetries()).toString()); - String passMarkApplicable = new Boolean(mcContent.isPassMarkApplicable()).toString(); + String passMarkApplicable = Boolean.valueOf(mcContent.isPassMarkApplicable()).toString(); mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable); mcLearningForm.setPassMarkApplicable(passMarkApplicable); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -161,8 +161,8 @@ /* this section is needed for Edit Activity screen, from here... */ - mcGeneralMonitoringDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString()); - mcGeneralMonitoringDTO.setDisplayFeedbackOnly(new Boolean(mcContent.isDisplayFeedbackOnly()).toString()); + mcGeneralMonitoringDTO.setDisplayAnswers(Boolean.valueOf(mcContent.isDisplayAnswers()).toString()); + mcGeneralMonitoringDTO.setDisplayFeedbackOnly(Boolean.valueOf(mcContent.isDisplayFeedbackOnly()).toString()); request.setAttribute(McAppConstants.MC_GENERAL_MONITORING_DTO, mcGeneralMonitoringDTO); @@ -197,8 +197,8 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); McContent mcContent = mcService.getMcContent(Long.valueOf(strToolContentID)); - mcContent.setDisplayAnswers(new Boolean(true)); - mcContent.setDisplayFeedbackOnly(new Boolean(false)); + mcContent.setDisplayAnswers(Boolean.valueOf(true)); + mcContent.setDisplayFeedbackOnly(Boolean.valueOf(false)); mcService.updateMc(mcContent); // use redirect to prevent resubmition of the same request @@ -218,7 +218,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); McContent mcContent = mcService.getMcContent(Long.valueOf(strToolContentID)); - mcContent.setDisplayFeedbackOnly(new Boolean(true)); + mcContent.setDisplayFeedbackOnly(Boolean.valueOf(true)); mcService.updateMc(mcContent); // use redirect to prevent resubmition of the same request @@ -398,7 +398,7 @@ countVisitLogs = mcService.getCountPagedUsersBySession(sessionId, searchString); } - int totalPages = new Double( + int totalPages = Double.valueOf( Math.ceil(Integer.valueOf(countVisitLogs).doubleValue() / Integer.valueOf(rowLimit).doubleValue())).intValue(); ArrayNode rows = JsonNodeFactory.instance.arrayNode(); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java (.../LearningUtil.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/LearningUtil.java (.../LearningUtil.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -73,9 +73,9 @@ generalLearnerFlowDTO.setUserNameVisible(qaContent.isUsernameVisible()); generalLearnerFlowDTO.setShowOtherAnswers(qaContent.isShowOtherAnswers()); - generalLearnerFlowDTO.setAllowRichEditor(new Boolean(qaContent.isAllowRichEditor()).toString()); + generalLearnerFlowDTO.setAllowRichEditor(Boolean.valueOf(qaContent.isAllowRichEditor()).toString()); generalLearnerFlowDTO - .setUseSelectLeaderToolOuput(new Boolean(qaContent.isUseSelectLeaderToolOuput()).toString()); + .setUseSelectLeaderToolOuput(Boolean.valueOf(qaContent.isUseSelectLeaderToolOuput()).toString()); generalLearnerFlowDTO.setTotalQuestionCount(Integer.valueOf(qaContent.getQaQueContents().size())); //check if allow rate answers is ON and also that there is at least one non-comments rating criteria available Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java (.../LearningController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -192,7 +192,7 @@ generalLearnerFlowDTO.setSessionMapID(sessionMapId); generalLearnerFlowDTO.setToolSessionID(toolSessionID); generalLearnerFlowDTO.setToolContentID(qaContent.getQaContentId().toString()); - generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); + generalLearnerFlowDTO.setLockWhenFinished(Boolean.valueOf(lockWhenFinished).toString()); generalLearnerFlowDTO.setNoReeditAllowed(qaContent.isNoReeditAllowed()); /* @@ -447,7 +447,7 @@ generalLearnerFlowDTO.setSessionMapID(sessionMap.getSessionID()); boolean lockWhenFinished = qaContent.isLockWhenFinished(); - generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); + generalLearnerFlowDTO.setLockWhenFinished(Boolean.valueOf(lockWhenFinished).toString()); generalLearnerFlowDTO.setNoReeditAllowed(qaContent.isNoReeditAllowed()); request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); @@ -589,14 +589,14 @@ generalLearnerFlowDTO); boolean lockWhenFinished = qaContent.isLockWhenFinished(); - generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); + generalLearnerFlowDTO.setLockWhenFinished(Boolean.valueOf(lockWhenFinished).toString()); generalLearnerFlowDTO.setNoReeditAllowed(qaContent.isNoReeditAllowed()); boolean useSelectLeaderToolOuput = qaContent.isUseSelectLeaderToolOuput(); - generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(useSelectLeaderToolOuput).toString()); + generalLearnerFlowDTO.setUseSelectLeaderToolOuput(Boolean.valueOf(useSelectLeaderToolOuput).toString()); boolean allowRichEditor = qaContent.isAllowRichEditor(); - generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString()); + generalLearnerFlowDTO.setAllowRichEditor(Boolean.valueOf(allowRichEditor).toString()); generalLearnerFlowDTO.setUserUid(user.getQueUsrId().toString()); boolean usernameVisible = qaContent.isUsernameVisible(); @@ -655,14 +655,14 @@ lockWhenFinished = qaContent.isLockWhenFinished(); noReeditAllowed = qaContent.isNoReeditAllowed(); } - generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); + generalLearnerFlowDTO.setLockWhenFinished(Boolean.valueOf(lockWhenFinished).toString()); generalLearnerFlowDTO.setNoReeditAllowed(noReeditAllowed); boolean allowRichEditor = qaContent.isAllowRichEditor(); - generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString()); + generalLearnerFlowDTO.setAllowRichEditor(Boolean.valueOf(allowRichEditor).toString()); boolean useSelectLeaderToolOuput = qaContent.isUseSelectLeaderToolOuput(); - generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(useSelectLeaderToolOuput).toString()); + generalLearnerFlowDTO.setUseSelectLeaderToolOuput(Boolean.valueOf(useSelectLeaderToolOuput).toString()); QaQueUsr qaQueUsr = getCurrentUser(toolSessionID); generalLearnerFlowDTO.setUserUid(qaQueUsr.getQueUsrId().toString()); @@ -1108,7 +1108,7 @@ responseRow.put("answer", response.getAnswer()); responseRow.put("userName", StringEscapeUtils.escapeCsv(user.getFullname())); responseRow.put("sessionName", StringEscapeUtils.escapeCsv(user.getQaSession().getSession_name())); - responseRow.put("visible", new Boolean(response.isVisible()).toString()); + responseRow.put("visible", Boolean.valueOf(response.isVisible()).toString()); responseRow.put("userID", user.getQueUsrId()); responseRow.put("portraitId", response.getPortraitId()); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -119,7 +119,7 @@ rowLimit, sortBy, sortOrder, searchString); int countVisitLogs = resourceService.getCountVisitLogsBySessionAndItem(sessionId, itemUid, searchString); - int totalPages = new Double( + int totalPages = Double.valueOf( Math.ceil(Integer.valueOf(countVisitLogs).doubleValue() / Integer.valueOf(rowLimit).doubleValue())).intValue(); ArrayNode rows = JsonNodeFactory.instance.arrayNode(); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java (.../NbLearnerForm.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbLearnerForm.java (.../NbLearnerForm.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -119,7 +119,7 @@ setTitle(content.getTitle()); setBasicContent(content.getContent()); setMode(mode); - setReadOnly(new Boolean(readOnly)); + setReadOnly(Boolean.valueOf(readOnly)); } /** Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java =================================================================== diff -u -r52a6369ce66a2ea70d38bfa2e627dfcde6354b10 -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java (.../PixlrUserDTO.java) (revision 52a6369ce66a2ea70d38bfa2e627dfcde6354b10) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/dto/PixlrUserDTO.java (.../PixlrUserDTO.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -191,14 +191,14 @@ if (imageWidth >= imageHeight) { this.imageThumbnailWidth = 100; double temp = 100.0 / imageWidth.longValue(); - this.imageThumbnailHeight = (new Double(imageHeight.longValue() * temp)).longValue(); + this.imageThumbnailHeight = (Double.valueOf(imageHeight.longValue() * temp)).longValue(); } else { this.imageThumbnailHeight = 100; double temp = 100.0 / imageHeight.longValue(); - this.imageThumbnailWidth = (new Double(imageWidth.longValue() * temp)).longValue(); + this.imageThumbnailWidth = (Double.valueOf(imageWidth.longValue() * temp)).longValue(); } } } -} +} \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -357,7 +357,7 @@ boolean isEditable = SurveyWebUtils.isSurveyEditable(survey); if (!isEditable) { - request.setAttribute(SurveyConstants.PAGE_EDITABLE, new Boolean(isEditable)); + request.setAttribute(SurveyConstants.PAGE_EDITABLE, Boolean.valueOf(isEditable)); return "error"; } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -131,7 +131,7 @@ // cache into sessionMap sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, summary); sessionMap.put(SurveyConstants.ATTR_STATISTIC_LIST, statis); - sessionMap.put(SurveyConstants.PAGE_EDITABLE, new Boolean(SurveyWebUtils.isSurveyEditable(survey))); + sessionMap.put(SurveyConstants.PAGE_EDITABLE, Boolean.valueOf(SurveyWebUtils.isSurveyEditable(survey))); sessionMap.put(SurveyConstants.ATTR_SURVEY, survey); sessionMap.put(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId); sessionMap.put(SurveyConstants.ATTR_IS_GROUPED_ACTIVITY, surveyService.isGroupedActivity(contentId)); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java =================================================================== diff -u -rc11264f3271f40971838dd015db6b5107f3bc55e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java (.../MonitoringController.java) (revision c11264f3271f40971838dd015db6b5107f3bc55e) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -23,23 +23,15 @@ package org.lamsfoundation.lams.tool.taskList.web.controller; -import java.io.IOException; -import java.io.PrintWriter; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Set; -import java.util.TimeZone; - +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; - import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.lamsfoundation.lams.tool.taskList.TaskListConstants; import org.lamsfoundation.lams.tool.taskList.dto.SessionDTO; import org.lamsfoundation.lams.tool.taskList.dto.TaskListUserDTO; @@ -67,9 +59,16 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.util.HtmlUtils; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.io.PrintWriter; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Set; +import java.util.TimeZone; @Controller @RequestMapping("/monitoring") @@ -195,7 +194,7 @@ sortBy, sortOrder, searchString); int countSessionUsers = taskListService.getCountPagedUsersBySession(sessionId, searchString); - int totalPages = new Double( + int totalPages = Double.valueOf( Math.ceil(Integer.valueOf(countSessionUsers).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); @@ -268,7 +267,7 @@ page - 1, rowLimit, sortBy, sortOrder, searchString); int countSessionUsers = taskListService.getCountPagedUsersBySession(sessionId, searchString); - int totalPages = new Double( + int totalPages = Double.valueOf( Math.ceil(Integer.valueOf(countSessionUsers).doubleValue() / Integer.valueOf(rowLimit).doubleValue())) .intValue(); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -649,7 +649,7 @@ voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); - voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); + voteMonitoredUserDTO.setVisible(Boolean.valueOf(voteUsrAttempt.isVisible()).toString()); monitoredUserContainerDTOs.add(voteMonitoredUserDTO); } else { @@ -668,7 +668,7 @@ voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); monitoredUserContainerDTOs.add(voteMonitoredUserDTO); voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); - voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); + voteMonitoredUserDTO.setVisible(Boolean.valueOf(voteUsrAttempt.isVisible()).toString()); if (voteUsrAttempt.isVisible() == false) { voteMonitoredAnswersDTO.setQuestion("Nomination Hidden"); } @@ -686,7 +686,7 @@ voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); monitoredUserContainerDTOs.add(voteMonitoredUserDTO); voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); - voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); + voteMonitoredUserDTO.setVisible(Boolean.valueOf(voteUsrAttempt.isVisible()).toString()); } } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -803,8 +803,8 @@ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); voteAuthoringForm.resetRadioBoxes(); - voteAuthoringForm.setExceptionMaxNominationInvalid(new Boolean(false).toString()); - voteGeneralAuthoringDTO.setExceptionMaxNominationInvalid(new Boolean(false).toString()); + voteAuthoringForm.setExceptionMaxNominationInvalid(Boolean.valueOf(false).toString()); + voteGeneralAuthoringDTO.setExceptionMaxNominationInvalid(Boolean.valueOf(false).toString()); MultiValueMap errorMap = new LinkedMultiValueMap<>(); boolean validateSignature = validateDefaultContent(voteAuthoringForm, errorMap); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java =================================================================== diff -u -r82ec29b9300c3ced993602face47a6626ccb667e -r7de71bba12d7584070f72e2038343453a824ad87 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 82ec29b9300c3ced993602face47a6626ccb667e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/controller/LearningController.java (.../LearningController.java) (revision 7de71bba12d7584070f72e2038343453a824ad87) @@ -90,13 +90,13 @@ public String viewAllResults(VoteLearningForm voteLearningForm, HttpServletRequest request) { VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); - voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); - voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); - voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteLearningForm.setMinNominationCountReached(Boolean.valueOf(false).toString()); - voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(Boolean.valueOf(false).toString()); LearningController.repopulateRequestParameters(request, voteLearningForm); @@ -141,13 +141,13 @@ public String viewAnswers(VoteLearningForm voteLearningForm, HttpServletRequest request) { VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); - voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); - voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); - voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteLearningForm.setMinNominationCountReached(Boolean.valueOf(false).toString()); - voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(Boolean.valueOf(false).toString()); LearningController.repopulateRequestParameters(request, voteLearningForm); @@ -220,13 +220,13 @@ String revisitingUser = request.getParameter(REVISITING_USER); voteLearningForm.setRevisitingUser(revisitingUser); - voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); - voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); - voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteLearningForm.setMinNominationCountReached(Boolean.valueOf(false).toString()); - voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(Boolean.valueOf(false).toString()); VoteSession voteSession = voteService.getSessionBySessionId(Long.valueOf(toolSessionID)); VoteContent voteContent = voteSession.getVoteContent(); @@ -243,13 +243,13 @@ public String learnerFinished(VoteLearningForm voteLearningForm, HttpServletRequest request) { VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); - voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); - voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); - voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteLearningForm.setMinNominationCountReached(Boolean.valueOf(false).toString()); - voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(Boolean.valueOf(false).toString()); LearningController.repopulateRequestParameters(request, voteLearningForm); @@ -332,13 +332,13 @@ voteLearningForm.setUserEntry(userEntry); 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()); + voteLearningForm.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteLearningForm.setMinNominationCountReached(Boolean.valueOf(false).toString()); - voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(Boolean.valueOf(false).toString()); Collection voteDisplayOrderIds = voteLearningForm.votesAsCollection(); @@ -354,8 +354,8 @@ } if (castVoteCount > intMaxNominationCount) { - voteLearningForm.setMaxNominationCountReached(new Boolean(true).toString()); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(true).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(true).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(true).toString()); MultiValueMap errorMap = new LinkedMultiValueMap<>(); errorMap.add("GLOBAL", messageService.getMessage("error.maxNominationCount.reached")); request.setAttribute("errorMap", errorMap); @@ -418,8 +418,8 @@ voteLearningForm.setMapGeneralCheckedOptionsContent(mapGeneralCheckedOptionsContent); voteGeneralLearnerFlowDTO.setMapGeneralCheckedOptionsContent(mapGeneralCheckedOptionsContent); - voteLearningForm.setNominationsSubmited(new Boolean(true).toString()); - voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(true).toString()); + voteLearningForm.setNominationsSubmited(Boolean.valueOf(true).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(Boolean.valueOf(true).toString()); voteService.prepareChartData(request, toolContentID, toolSessionUid, voteGeneralLearnerFlowDTO); @@ -452,11 +452,11 @@ voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); - voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); - voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(false).toString()); - voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(Boolean.valueOf(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(false).toString()); Map mapQuestionsContent = voteService.buildQuestionMap(voteContent, null); request.setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent); @@ -549,15 +549,15 @@ VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); - voteLearningForm.setRevisitingUser(new Boolean(false).toString()); + voteLearningForm.setRevisitingUser(Boolean.valueOf(false).toString()); voteLearningForm.setUserEntry(""); voteLearningForm.setCastVoteCount(0); - voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setMaxNominationCountReached(Boolean.valueOf(false).toString()); - voteGeneralLearnerFlowDTO.setRevisitingUser(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setRevisitingUser(Boolean.valueOf(false).toString()); voteGeneralLearnerFlowDTO.setUserEntry(""); voteGeneralLearnerFlowDTO.setCastVoteCount("0"); - voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(Boolean.valueOf(false).toString()); boolean validateParameters = LearningController.validateParameters(request, voteLearningForm); if (!validateParameters) { @@ -698,8 +698,8 @@ request.setAttribute(VoteAppConstants.LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts); // since this is progress view, present a screen which can not be edited - voteLearningForm.setReportViewOnly(new Boolean(true).toString()); - voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString()); + voteLearningForm.setReportViewOnly(Boolean.valueOf(true).toString()); + voteGeneralLearnerFlowDTO.setReportViewOnly(Boolean.valueOf(true).toString()); voteService.prepareChartData(request, voteContent.getVoteContentId(), voteSession.getUid(), voteGeneralLearnerFlowDTO); @@ -727,8 +727,8 @@ boolean isResponseFinalised = user.isResponseFinalised(); if (isResponseFinalised) { // since the response is finalised present a screen which can not be edited - voteLearningForm.setReportViewOnly(new Boolean(true).toString()); - voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString()); + voteLearningForm.setReportViewOnly(Boolean.valueOf(true).toString()); + voteGeneralLearnerFlowDTO.setReportViewOnly(Boolean.valueOf(true).toString()); } Set userAttempts = voteService.getAttemptsForUserAndSessionUseOpenAnswer(user.getUid(), @@ -739,16 +739,16 @@ voteGeneralLearnerFlowDTO); String isContentLockOnFinish = voteLearningForm.getLockOnFinish(); - if (isContentLockOnFinish.equals(new Boolean(true).toString()) && isResponseFinalised == true) { + if (isContentLockOnFinish.equals(Boolean.valueOf(true).toString()) && isResponseFinalised == true) { // user with session id: userSessionId should not redo votes. session is locked return "/learning/ExitLearning"; } - voteLearningForm.setRevisitingUser(new Boolean(true).toString()); - voteGeneralLearnerFlowDTO.setRevisitingUser(new Boolean(true).toString()); + voteLearningForm.setRevisitingUser(Boolean.valueOf(true).toString()); + voteGeneralLearnerFlowDTO.setRevisitingUser(Boolean.valueOf(true).toString()); request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); - if (isContentLockOnFinish.equals(new Boolean(false).toString()) && isResponseFinalised == true) { + if (isContentLockOnFinish.equals(Boolean.valueOf(false).toString()) && isResponseFinalised == true) { // isContentLockOnFinish is false, enable redo of votes return "/learning/RevisitedAllNominations"; } @@ -815,19 +815,19 @@ voteLearningForm.setActivityInstructions(voteContent.getInstructions()); voteLearningForm.setMaxNominationCount(voteContent.getMaxNominationCount()); voteLearningForm.setMinNominationCount(voteContent.getMinNominationCount()); - voteLearningForm.setUseSelectLeaderToolOuput(new Boolean(voteContent.isUseSelectLeaderToolOuput()).toString()); - voteLearningForm.setAllowTextEntry(new Boolean(voteContent.isAllowText()).toString()); - voteLearningForm.setShowResults(new Boolean(voteContent.isShowResults()).toString()); - voteLearningForm.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString()); + voteLearningForm.setUseSelectLeaderToolOuput(Boolean.valueOf(voteContent.isUseSelectLeaderToolOuput()).toString()); + voteLearningForm.setAllowTextEntry(Boolean.valueOf(voteContent.isAllowText()).toString()); + voteLearningForm.setShowResults(Boolean.valueOf(voteContent.isShowResults()).toString()); + voteLearningForm.setLockOnFinish(Boolean.valueOf(voteContent.isLockOnFinish()).toString()); voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); voteGeneralLearnerFlowDTO.setMaxNominationCount(voteContent.getMaxNominationCount()); voteGeneralLearnerFlowDTO.setMinNominationCount(voteContent.getMinNominationCount()); voteGeneralLearnerFlowDTO - .setUseSelectLeaderToolOuput(new Boolean(voteContent.isUseSelectLeaderToolOuput()).toString()); - voteGeneralLearnerFlowDTO.setAllowTextEntry(new Boolean(voteContent.isAllowText()).toString()); - voteGeneralLearnerFlowDTO.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString()); + .setUseSelectLeaderToolOuput(Boolean.valueOf(voteContent.isUseSelectLeaderToolOuput()).toString()); + voteGeneralLearnerFlowDTO.setAllowTextEntry(Boolean.valueOf(voteContent.isAllowText()).toString()); + voteGeneralLearnerFlowDTO.setLockOnFinish(Boolean.valueOf(voteContent.isLockOnFinish()).toString()); voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); }