diff --git a/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java b/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java index 6b4fd1c87..fd54b845a 100644 --- a/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/OptionsFormController.java @@ -308,8 +308,12 @@ protected Object formBackingObject(HttpServletRequest request) throws ServletExc opts.setDefaultLocation(props.get(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCATION)); opts.setDefaultLocale(props.get(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCALE)); opts.setProficientLocales(props.get(OpenmrsConstants.USER_PROPERTY_PROFICIENT_LOCALES)); - opts.setShowRetiredMessage(new Boolean(props.get(OpenmrsConstants.USER_PROPERTY_SHOW_RETIRED))); - opts.setVerbose(new Boolean(props.get(OpenmrsConstants.USER_PROPERTY_SHOW_VERBOSE))); + opts.setShowRetiredMessage(Boolean.parseBoolean( + String.valueOf(props.get(OpenmrsConstants.USER_PROPERTY_SHOW_RETIRED)) + )); + opts.setVerbose(Boolean.parseBoolean( + String.valueOf(props.get(OpenmrsConstants.USER_PROPERTY_SHOW_VERBOSE)) + )); opts.setUsername(user.getUsername()); PersonName personName; diff --git a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java index 085f9bf45..bd93b1820 100644 --- a/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java +++ b/omod/src/main/java/org/openmrs/web/controller/concept/ConceptProposalListController.java @@ -49,7 +49,7 @@ protected Object formBackingObject(HttpServletRequest request) throws ServletExc if (Context.isAuthenticated()) { ConceptService cs = Context.getConceptService(); log.debug("tmp value: " + request.getParameter("includeCompleted")); - boolean b = new Boolean(request.getParameter("includeCompleted")); + boolean b = Boolean.parseBoolean(request.getParameter("includeCompleted")); log.debug("b value: " + b); cpList = cs.getAllConceptProposals(b); } @@ -64,7 +64,7 @@ protected Object formBackingObject(HttpServletRequest request) throws ServletExc origText.put(cp.getOriginalText(), matchingProposals); } - boolean asc = new Boolean("asc".equals(request.getParameter("sortOrder"))); + boolean asc = "asc".equals(request.getParameter("sortOrder")); String sortOn = request.getParameter("sortOn"); if (sortOn == null) { sortOn = "occurences"; diff --git a/omod/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java b/omod/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java index 963f78acf..34d321b4a 100644 --- a/omod/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java @@ -156,7 +156,7 @@ protected ModelAndView processFormSubmission(HttpServletRequest request, HttpSer pi.setLocation(ls.getLocation(Integer.valueOf(locs[i]))); } if (idPrefStatus != null && idPrefStatus.length > i) { - pi.setPreferred(new Boolean(idPrefStatus[i])); + pi.setPreferred(Boolean.parseBoolean(idPrefStatus[i])); } BindException piErrors = new BindException(pi, "patientIdentifier"); diff --git a/omod/src/main/java/org/openmrs/web/controller/person/PersonFormController.java b/omod/src/main/java/org/openmrs/web/controller/person/PersonFormController.java index 60796ecfa..f8f95d891 100644 --- a/omod/src/main/java/org/openmrs/web/controller/person/PersonFormController.java +++ b/omod/src/main/java/org/openmrs/web/controller/person/PersonFormController.java @@ -488,7 +488,7 @@ protected void updatePersonNames(HttpServletRequest request, Person person) { if (!"".equals(gNames[i])) { //skips invalid and blank address data box PersonName pn = new PersonName(); if (namePrefStatus != null && namePrefStatus.length > i) { - pn.setPreferred(new Boolean(namePrefStatus[i])); + pn.setPreferred(Boolean.parseBoolean(namePrefStatus[i])); } if (gNames.length >= i + 1) { pn.setGivenName(gNames[i]); @@ -645,7 +645,7 @@ protected void updatePersonAddresses(HttpServletRequest request, Person person, pa.setAddress3(add3s[i]); } if (addPrefStatus != null && addPrefStatus.length > i) { - pa.setPreferred(new Boolean(addPrefStatus[i])); + pa.setPreferred(Boolean.parseBoolean(addPrefStatus[i])); } if (add6s.length >= i + 1) { pa.setAddress6(add6s[i]);