svn commit: r1837577 [2/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1837577 [2/6] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java Tue Aug 7 07:30:43 2018 @@ -572,7 +572,7 @@ public class ContentWorker implements or Map<String, Object> currentNode = nodeTrail.get(sz - 1); Boolean isReturnAfter = (Boolean)currentNode.get("isReturnAfter"); - if (isReturnAfter != null && isReturnAfter.booleanValue()) { + if (isReturnAfter != null && isReturnAfter) { return false; } @@ -584,7 +584,7 @@ public class ContentWorker implements or ContentWorker.traceNodeTrail("12",nodeTrail); Boolean isPick = (Boolean)currentNode.get("isPick"); - if (isPick != null && isPick.booleanValue()) { + if (isPick != null && isPick) { nodeTrail.add(currentNode); inProgress = true; selectKids(currentNode, ctx); @@ -592,7 +592,7 @@ public class ContentWorker implements or break; } else { Boolean isFollow = (Boolean)currentNode.get("isFollow"); - if (isFollow != null && isFollow.booleanValue()) { + if (isFollow != null && isFollow) { nodeTrail.add(currentNode); boolean foundPick = traverseSubContent(ctx); if (foundPick) { @@ -620,14 +620,14 @@ public class ContentWorker implements or while (idx < (kids.size() - 1)) { currentNode = kids.get(idx + 1); Boolean isFollow = (Boolean)currentNode.get("isFollow"); - if (isFollow == null || !isFollow.booleanValue()) { + if (isFollow == null || !isFollow) { idx++; continue; } nodeTrail.add(currentNode); ContentWorker.traceNodeTrail("16",nodeTrail); Boolean isPick = (Boolean)currentNode.get("isPick"); - if (isPick == null || !isPick.booleanValue()) { + if (isPick == null || !isPick) { // If not a "pick" node, look at kids inProgress = traverseSubContent(ctx); ContentWorker.traceNodeTrail("17",nodeTrail); @@ -731,9 +731,9 @@ public class ContentWorker implements or if (isPick) { Integer count = (Integer) currentNode.get("count"); if (count == null) { - count = Integer.valueOf(1); + count = 1; } else { - count = Integer.valueOf(count.intValue() + 1); + count = count + 1; } currentNode.put("count", count); } @@ -757,7 +757,7 @@ public class ContentWorker implements or // retVal should be a Boolean, if not something weird is up... if (retVal instanceof Boolean) { Boolean boolVal = (Boolean) retVal; - isWhen = boolVal.booleanValue(); + isWhen = boolVal; } else { throw new IllegalArgumentException("Return value from use-when condition eval was not a Boolean: " + (retVal != null ? retVal.getClass().getName() : "null") + " [" + retVal + "]"); @@ -1185,7 +1185,7 @@ public class ContentWorker implements or } } ctx.put("globalNodeTrail", passedGlobalNodeTrail); - ctx.put("indent", Integer.valueOf(sz)); + ctx.put("indent", sz); return currentContent; } @@ -1271,19 +1271,19 @@ public class ContentWorker implements or } } boolean isReturnBefore = checkWhen(context, (String)whenMap.get("returnBeforePickWhen"), false); - trailNode.put("isReturnBefore", Boolean.valueOf(isReturnBefore)); + trailNode.put("isReturnBefore", isReturnBefore); boolean isPick = checkWhen(context, (String)whenMap.get("pickWhen"), true); - trailNode.put("isPick", Boolean.valueOf(isPick)); + trailNode.put("isPick", isPick); boolean isFollow = checkWhen(context, (String)whenMap.get("followWhen"), true); - trailNode.put("isFollow", Boolean.valueOf(isFollow)); + trailNode.put("isFollow", isFollow); boolean isReturnAfter = checkWhen(context, (String)whenMap.get("returnAfterPickWhen"), false); - trailNode.put("isReturnAfter", Boolean.valueOf(isReturnAfter)); + trailNode.put("isReturnAfter", isReturnAfter); trailNode.put("checked", Boolean.TRUE); } public static boolean booleanDataType(Object boolObj) { boolean bool = false; - if (boolObj != null && ((Boolean)boolObj).booleanValue()) { + if (boolObj != null && (Boolean) boolObj) { bool = true; } return bool; Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/content/PermissionRecorder.java Tue Aug 7 07:30:43 2018 @@ -184,11 +184,11 @@ public class PermissionRecorder { public void record(GenericValue purposeOp, boolean targetOpCond, boolean purposeCond, boolean statusCond, boolean privilegeCond, boolean roleCond) { Map<String, Object> map = UtilMisc.makeMapWritable(purposeOp); - map.put("contentOperationIdCond", Boolean.valueOf(targetOpCond)); - map.put("contentPurposeTypeIdCond", Boolean.valueOf(purposeCond)); - map.put("statusIdCond", Boolean.valueOf(statusCond)); - map.put("privilegeEnumIdCond", Boolean.valueOf(privilegeCond)); - map.put("roleTypeIdCond", Boolean.valueOf(roleCond)); + map.put("contentOperationIdCond", targetOpCond); + map.put("contentPurposeTypeIdCond", purposeCond); + map.put("statusIdCond", statusCond); + map.put("privilegeEnumIdCond", privilegeCond); + map.put("roleTypeIdCond", roleCond); map.put("contentId", currentContentId); List<Map<String, Object>> checkResultList = UtilGenerics.checkList(currentContentMap.get("checkResultList")); checkResultList.add(map); @@ -276,8 +276,8 @@ public class PermissionRecorder { for (int i=0; i < opFields.length; i++) { String opField = opFields[i]; Boolean bool = (Boolean)rMap.get(opField + "Cond"); - String cls = (bool.booleanValue()) ? "pass" : "fail"; - if (!bool.booleanValue()) + String cls = (bool) ? "pass" : "fail"; + if (!bool) isPass = false; sb.append("<td class=\"" + cls + "\">"); s = (String)rMap.get(opField); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataEvents.java Tue Aug 7 07:30:43 2018 @@ -154,7 +154,7 @@ public class DataEvents { // no service errors; now check the actual response Boolean hasPermission = (Boolean) permSvcResp.get("hasPermission"); - if (!hasPermission.booleanValue()) { + if (!hasPermission) { String errorMsg = (String) permSvcResp.get("failMessage"); Debug.logError(errorMsg, module); request.setAttribute("_ERROR_MESSAGE_", errorMsg); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java Tue Aug 7 07:30:43 2018 @@ -130,7 +130,7 @@ public class DataResourceWorker impleme List<GenericValue> categoryValues = EntityQuery.use(delegator).from("DataCategory") .where("parentCategoryId", parentCategoryId) .cache().queryList(); - categoryNode.put("count", Integer.valueOf(categoryValues.size())); + categoryNode.put("count", categoryValues.size()); List<Map<String, Object>> subCategoryIds = new LinkedList<>(); for (GenericValue category : categoryValues) { String id = (String) category.get("dataCategoryId"); @@ -534,9 +534,9 @@ public class DataResourceWorker impleme Comparator<Object> desc = new Comparator<Object>() { @Override public int compare(Object o1, Object o2) { - if (((Long) o1).longValue() > ((Long) o2).longValue()) { + if ((Long) o1 > (Long) o2) { return -1; - } else if (((Long) o1).longValue() < ((Long) o2).longValue()) { + } else if ((Long) o1 < (Long) o2) { return 1; } return 0; @@ -553,7 +553,7 @@ public class DataResourceWorker impleme int length = subs.length; for (int i = 0; i < length; i++) { if (subs[i].isDirectory()) { - dirMap.put(Long.valueOf(subs[i].lastModified()), subs[i]); + dirMap.put(subs[i].lastModified(), subs[i]); } } } @@ -1066,7 +1066,7 @@ public class DataResourceWorker impleme } byte[] bytes = text.getBytes(UtilIO.getUtf8()); - return UtilMisc.toMap("stream", new ByteArrayInputStream(bytes), "length", Long.valueOf(bytes.length)); + return UtilMisc.toMap("stream", new ByteArrayInputStream(bytes), "length", (long) bytes.length); // object (binary) data } @@ -1098,14 +1098,14 @@ public class DataResourceWorker impleme throw new GeneralException("Unsupported OBJECT type [" + dataResourceTypeId + "]; cannot stream"); } - return UtilMisc.toMap("stream", new ByteArrayInputStream(bytes), "length", Long.valueOf(bytes.length)); + return UtilMisc.toMap("stream", new ByteArrayInputStream(bytes), "length", (long) bytes.length); // file data } else if (dataResourceTypeId.endsWith("_FILE") || dataResourceTypeId.endsWith("_FILE_BIN")) { String objectInfo = dataResource.getString("objectInfo"); if (UtilValidate.isNotEmpty(objectInfo)) { File file = DataResourceWorker.getContentFile(dataResourceTypeId, objectInfo, contextRoot); - return UtilMisc.toMap("stream", Files.newInputStream(file.toPath(), StandardOpenOption.READ), "length", Long.valueOf(file.length())); + return UtilMisc.toMap("stream", Files.newInputStream(file.toPath(), StandardOpenOption.READ), "length", file.length()); } throw new GeneralException("No objectInfo found for FILE type [" + dataResourceTypeId + "]; cannot stream"); @@ -1124,7 +1124,7 @@ public class DataResourceWorker impleme } URLConnection con = url.openConnection(); - return UtilMisc.toMap("stream", con.getInputStream(), "length", Long.valueOf(con.getContentLength())); + return UtilMisc.toMap("stream", con.getInputStream(), "length", (long) con.getContentLength()); } throw new GeneralException("No objectInfo found for URL_RESOURCE type; cannot stream"); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/PdfSurveyServices.java Tue Aug 7 07:30:43 2018 @@ -152,10 +152,10 @@ public class PdfSurveyServices { Long sequenceNum = null; if (tabPage != null && tabOrder != null) { - sequenceNum = Long.valueOf(tabPage.intValue() * 1000 + tabOrder.intValue()); + sequenceNum = (long) (tabPage * 1000 + tabOrder); Debug.logInfo("tabPage=" + tabPage + ", tabOrder=" + tabOrder + ", sequenceNum=" + sequenceNum, module); } else if (fieldPositions.length > 0) { - sequenceNum = Long.valueOf((long) fieldPage * 10000 + (long) fieldLly * 1000 + (long) fieldLlx); + sequenceNum = (long) fieldPage * 10000 + (long) fieldLly * 1000 + (long) fieldLlx; Debug.logInfo("fieldPage=" + fieldPage + ", fieldLlx=" + fieldLlx + ", fieldLly=" + fieldLly + ", fieldUrx=" + fieldUrx + ", fieldUry=" + fieldUry + ", sequenceNum=" + sequenceNum, module); } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/survey/SurveyWrapper.java Tue Aug 7 07:30:43 2018 @@ -469,7 +469,7 @@ public class SurveyWrapper { Map<String, Object> thisResult = getOptionResult(question); Long questionTotal = (Long) thisResult.remove("_total"); if (questionTotal == null) { - questionTotal = Long.valueOf(0); + questionTotal = 0L; } // set the total responses resultMap.put("_total", questionTotal); @@ -480,9 +480,9 @@ public class SurveyWrapper { Long optTotal = (Long) entry.getValue(); String optId = entry.getKey(); if (optTotal == null) { - optTotal = Long.valueOf(0); + optTotal = 0L; } - Long percent = Long.valueOf((long)(((double)optTotal.longValue() / (double)questionTotal.longValue()) * 100)); + Long percent = (long) (((double) optTotal / (double) questionTotal) * 100); optMap.put("_total", optTotal); optMap.put("_percent", percent); resultMap.put(optId, optMap); @@ -493,36 +493,36 @@ public class SurveyWrapper { long yesPercent = thisResult[1] > 0 ? (long)(((double)thisResult[1] / (double)thisResult[0]) * 100) : 0; long noPercent = thisResult[2] > 0 ? (long)(((double)thisResult[2] / (double)thisResult[0]) * 100) : 0; - resultMap.put("_total", Long.valueOf(thisResult[0])); - resultMap.put("_yes_total", Long.valueOf(thisResult[1])); - resultMap.put("_no_total", Long.valueOf(thisResult[2])); - resultMap.put("_yes_percent", Long.valueOf(yesPercent)); - resultMap.put("_no_percent", Long.valueOf(noPercent)); + resultMap.put("_total", thisResult[0]); + resultMap.put("_yes_total", thisResult[1]); + resultMap.put("_no_total", thisResult[2]); + resultMap.put("_yes_percent", yesPercent); + resultMap.put("_no_percent", noPercent); resultMap.put("_a_type", "boolean"); } else if ("NUMBER_LONG".equals(questionType)) { double[] thisResult = getNumberResult(question, 1); - resultMap.put("_total", Long.valueOf((long)thisResult[0])); - resultMap.put("_tally", Long.valueOf((long)thisResult[1])); - resultMap.put("_average", Long.valueOf((long)thisResult[2])); + resultMap.put("_total", (long) thisResult[0]); + resultMap.put("_tally", (long) thisResult[1]); + resultMap.put("_average", (long) thisResult[2]); resultMap.put("_a_type", "long"); } else if ("NUMBER_CURRENCY".equals(questionType)) { double[] thisResult = getNumberResult(question, 2); - resultMap.put("_total", Long.valueOf((long)thisResult[0])); - resultMap.put("_tally", Double.valueOf(thisResult[1])); - resultMap.put("_average", Double.valueOf(thisResult[2])); + resultMap.put("_total", (long) thisResult[0]); + resultMap.put("_tally", thisResult[1]); + resultMap.put("_average", thisResult[2]); resultMap.put("_a_type", "double"); } else if ("NUMBER_FLOAT".equals(questionType)) { double[] thisResult = getNumberResult(question, 3); - resultMap.put("_total", Long.valueOf((long)thisResult[0])); - resultMap.put("_tally", Double.valueOf(thisResult[1])); - resultMap.put("_average", Double.valueOf(thisResult[2])); + resultMap.put("_total", (long) thisResult[0]); + resultMap.put("_tally", thisResult[1]); + resultMap.put("_average", thisResult[2]); resultMap.put("_a_type", "double"); } else if ("SEPERATOR_LINE".equals(questionType) || "SEPERATOR_TEXT".equals(questionType)) { // not really a question; ingore completely return null; } else { // default is text - resultMap.put("_total", Long.valueOf(getTextResult(question))); + resultMap.put("_total", getTextResult(question)); resultMap.put("_a_type", "text"); } @@ -593,19 +593,19 @@ public class SurveyWrapper { case 1: Long n = value.getLong("numericResponse"); if (UtilValidate.isNotEmpty(n)) { - result[1] += n.longValue(); + result[1] += n; } break; case 2: Double c = value.getDouble("currencyResponse"); if (UtilValidate.isNotEmpty(c)) { - result[1] += (((double) Math.round((c.doubleValue() - c.doubleValue()) * 100)) / 100); + result[1] += (((double) Math.round((c - c) * 100)) / 100); } break; case 3: Double f = value.getDouble("floatResponse"); if (UtilValidate.isNotEmpty(f)) { - result[1] += f.doubleValue(); + result[1] += f; } break; } @@ -686,9 +686,9 @@ public class SurveyWrapper { if (UtilValidate.isNotEmpty(optionId)) { Long optCount = (Long) result.remove(optionId); if (optCount == null) { - optCount = Long.valueOf(1); + optCount = 1L; } else { - optCount = Long.valueOf(1 + optCount.longValue()); + optCount = 1 + optCount; } result.put(optionId, optCount); total++; // increment the count @@ -713,7 +713,7 @@ public class SurveyWrapper { } } - result.put("_total", Long.valueOf(total)); + result.put("_total", total); return result; } Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/view/SimpleContentViewHandler.java Tue Aug 7 07:30:43 2018 @@ -176,7 +176,7 @@ public class SimpleContentViewHandler ex // no service errors; now check the actual response Boolean hasPermission = (Boolean) permSvcResp.get("hasPermission"); - if (!hasPermission.booleanValue()) { + if (!hasPermission) { String errorMsg = (String) permSvcResp.get("failMessage"); Debug.logError(errorMsg, module); request.setAttribute("_ERROR_MESSAGE_", errorMsg); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Tue Aug 7 07:30:43 2018 @@ -225,8 +225,8 @@ public class LimitedSubContentCacheTrans Boolean isReturnBeforeObj = (Boolean) trailNode.get("isReturnBefore"); Boolean isPickObj = (Boolean) trailNode.get("isPick"); Boolean isFollowObj = (Boolean) trailNode.get("isFollow"); - if ((isReturnBeforeObj == null || !isReturnBeforeObj.booleanValue()) && ((isPickObj != null && - isPickObj.booleanValue()) || (isFollowObj != null && isFollowObj.booleanValue()))) { + if ((isReturnBeforeObj == null || !isReturnBeforeObj) && ((isPickObj != null && + isPickObj) || (isFollowObj != null && isFollowObj))) { List<Map<String, ? extends Object>> globalNodeTrail = UtilGenerics.checkList(ctx.get("globalNodeTrail")); if (globalNodeTrail == null) { globalNodeTrail = new LinkedList<>(); @@ -236,7 +236,7 @@ public class LimitedSubContentCacheTrans String csvTrail = ContentWorker.nodeTrailToCsv(globalNodeTrail); ctx.put("nodeTrailCsv", csvTrail); int indentSz = globalNodeTrail.size(); - ctx.put("indent", Integer.valueOf(indentSz)); + ctx.put("indent", indentSz); ctx.put("subDataResourceTypeId", subDataResourceTypeId); ctx.put("mimeTypeId", mimeTypeId); @@ -244,7 +244,7 @@ public class LimitedSubContentCacheTrans ctx.put("content", view); env.setVariable("subDataResourceTypeId", FreeMarkerWorker.autoWrap(subDataResourceTypeId, env)); - env.setVariable("indent", FreeMarkerWorker.autoWrap(Integer.valueOf(indentSz), env)); + env.setVariable("indent", FreeMarkerWorker.autoWrap(indentSz, env)); env.setVariable("nodeTrailCsv", FreeMarkerWorker.autoWrap(csvTrail, env)); env.setVariable("globalNodeTrail", FreeMarkerWorker.autoWrap(globalNodeTrail, env)); env.setVariable("content", FreeMarkerWorker.autoWrap(view, env)); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Tue Aug 7 07:30:43 2018 @@ -85,9 +85,9 @@ public class LoopSubContentTransform imp List<GenericValue> lst = UtilGenerics.checkList(ctx.get("entityList")); Integer idx = (Integer) ctx.get("entityIndex"); if (idx == null) { - idx = Integer.valueOf(0); + idx = 0; } - int i = idx.intValue(); + int i = idx; if (UtilValidate.isEmpty(lst)) { return false; } else if (i >= lst.size()) { @@ -139,7 +139,7 @@ public class LoopSubContentTransform imp ctx.put("textData", null); } ctx.put("content", subContentDataResourceView); - ctx.put("entityIndex", Integer.valueOf(i + 1)); + ctx.put("entityIndex", i + 1); ctx.put("subContentId", subContentIdSub); ctx.put("drDataResourceId", dataResourceId); ctx.put("mimeTypeId", mimeTypeId); @@ -205,7 +205,7 @@ public class LoopSubContentTransform imp @Override public int onStart() throws TemplateModelException, IOException { - templateCtx.put("entityIndex", Integer.valueOf(0)); + templateCtx.put("entityIndex", 0); boolean inProgress = prepCtx(delegator, templateCtx); if (inProgress) { return TransformControl.EVALUATE_BODY; Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Tue Aug 7 07:30:43 2018 @@ -155,7 +155,7 @@ public class TraverseSubContentCacheTran node = UtilGenerics.checkMap(globalNodeTrail.get(sz - 1)); Boolean checkedObj = (Boolean)node.get("checked"); Map<String, Object> whenMap = UtilGenerics.checkMap(templateRoot.get("whenMap")); - if (checkedObj == null || !checkedObj.booleanValue()) { + if (checkedObj == null || !checkedObj) { ContentWorker.checkConditions(delegator, node, null, whenMap); } } else { @@ -163,7 +163,7 @@ public class TraverseSubContentCacheTran } Boolean isReturnBeforePickBool = (Boolean)node.get("isReturnBeforePick"); - if (isReturnBeforePickBool != null && isReturnBeforePickBool.booleanValue()) { + if (isReturnBeforePickBool != null && isReturnBeforePickBool) { return TransformControl.SKIP_BODY; } @@ -173,8 +173,8 @@ public class TraverseSubContentCacheTran Boolean isPickBool = (Boolean)node.get("isPick"); Boolean isFollowBool = (Boolean)node.get("isFollow"); boolean isPick = true; - if ((isPickBool == null || !isPickBool.booleanValue()) - && (isFollowBool != null && isFollowBool.booleanValue())) { + if ((isPickBool == null || !isPickBool) + && (isFollowBool != null && isFollowBool)) { isPick = ContentWorker.traverseSubContent(traverseContext); } if (isPick) { @@ -241,7 +241,7 @@ public class TraverseSubContentCacheTran globalNodeTrail.addAll(nodeTrail); } int indentSz = globalNodeTrail.size(); - envWrap("indent", Integer.valueOf(indentSz)); + envWrap("indent", indentSz); String trailCsv = ContentWorker.nodeTrailToCsv(globalNodeTrail); envWrap("nodeTrailCsv", trailCsv); envWrap("globalNodeTrail", globalNodeTrail); Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Tue Aug 7 07:30:43 2018 @@ -162,7 +162,7 @@ public class TraverseSubContentTransform ContentWorker.traceNodeTrail("2", nodeTrail); nodeTrail.add(rootNode); boolean isPick = checkWhen(subContentDataResourceView, (String)traverseContext.get("contentAssocTypeId")); - rootNode.put("isPick", Boolean.valueOf(isPick)); + rootNode.put("isPick", isPick); if (!isPick) { ContentWorker.traceNodeTrail("3", nodeTrail); isPick = ContentWorker.traverseSubContent(traverseContext); @@ -249,8 +249,8 @@ public class TraverseSubContentTransform assocContext.put("typeAncestry", contentTypeAncestry); Map<String, Object> whenMap = UtilGenerics.checkMap(traverseContext.get("whenMap")); List<Map<String, ? extends Object>> nodeTrail = UtilGenerics.checkList(traverseContext.get("nodeTrail")); - int indentSz = indent.intValue() + nodeTrail.size(); - assocContext.put("indentObj", Integer.valueOf(indentSz)); + int indentSz = indent + nodeTrail.size(); + assocContext.put("indentObj", indentSz); isPick = ContentWorker.checkWhen(assocContext, (String)whenMap.get("pickWhen"), true); return isPick; } @@ -262,8 +262,8 @@ public class TraverseSubContentTransform String contentId = (String)node.get("contentId"); templateContext.put("subContentId", contentId); templateContext.put("subContentDataResourceView", null); - int indentSz = indent.intValue() + nodeTrail.size(); - templateContext.put("indent", Integer.valueOf(indentSz)); + int indentSz = indent + nodeTrail.size(); + templateContext.put("indent", indentSz); if (sz >= 2) { Map<String, Object> parentNode = nodeTrail.get(sz - 2); GenericValue parentContent = (GenericValue)parentNode.get("value"); Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/bom/BOMServices.java Tue Aug 7 07:30:43 2018 @@ -106,7 +106,7 @@ public class BOMServices { } catch (GenericEntityException gee) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingBomErrorRunningMaxDethAlgorithm", UtilMisc.toMap("errorString", gee.getMessage()), locale)); } - result.put("depth", Long.valueOf(maxDepth)); + result.put("depth", (long) maxDepth); return result; } @@ -163,11 +163,11 @@ public class BOMServices { } } if (virtualMaxDepth > llc.intValue()) { - llc = Long.valueOf(virtualMaxDepth); + llc = (long) virtualMaxDepth; } product.set("billOfMaterialLevel", llc); product.store(); - if (alsoComponents.booleanValue()) { + if (alsoComponents) { Map<String, Object> treeResult = dispatcher.runSync("getBOMTree", UtilMisc.toMap("productId", productId, "bomType", "MANUF_COMPONENT")); if (ServiceUtil.isError(treeResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(treeResult)); @@ -183,12 +183,12 @@ public class BOMServices { lev = oneProduct.getLong("billOfMaterialLevel").intValue(); } if (lev < oneNode.getDepth()) { - oneProduct.set("billOfMaterialLevel", Long.valueOf(oneNode.getDepth())); + oneProduct.set("billOfMaterialLevel", (long) oneNode.getDepth()); oneProduct.store(); } } } - if (alsoVariants.booleanValue()) { + if (alsoVariants) { List<GenericValue> variantProducts = EntityQuery.use(delegator).from("ProductAssoc") .where("productId", productId, "productAssocTypeId", "PRODUCT_VARIANT") @@ -222,7 +222,7 @@ public class BOMServices { try { List<GenericValue> products = EntityQuery.use(delegator).from("Product").orderBy("isVirtual DESC").queryList(); - Long zero = Long.valueOf(0); + Long zero = 0L; List<GenericValue> allProducts = new LinkedList<GenericValue>(); for (GenericValue product : products) { product.set("billOfMaterialLevel", zero); @@ -233,7 +233,7 @@ public class BOMServices { for (GenericValue product : products) { try { - Map<String, Object> depthResult = dispatcher.runSync("updateLowLevelCode", UtilMisc.<String, Object>toMap("productIdTo", product.getString("productId"), "alsoComponents", Boolean.valueOf(false), "alsoVariants", Boolean.valueOf(false))); + Map<String, Object> depthResult = dispatcher.runSync("updateLowLevelCode", UtilMisc.<String, Object>toMap("productIdTo", product.getString("productId"), "alsoComponents", Boolean.FALSE, "alsoVariants", Boolean.FALSE)); if (ServiceUtil.isError(depthResult)) { return ServiceUtil.returnError(ServiceUtil.getErrorMessage(depthResult)); } @@ -305,7 +305,7 @@ public class BOMServices { BigDecimal amount = (BigDecimal) context.get("amount"); Locale locale = (Locale) context.get("locale"); if (type == null) { - type = Integer.valueOf(0); + type = 0; } Date fromDate = null; @@ -321,7 +321,7 @@ public class BOMServices { BOMTree tree = null; try { - tree = new BOMTree(productId, bomType, fromDate, type.intValue(), delegator, dispatcher, userLogin); + tree = new BOMTree(productId, bomType, fromDate, type, delegator, dispatcher, userLogin); } catch (GenericEntityException gee) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingBomErrorCreatingBillOfMaterialsTree", UtilMisc.toMap("errorString", gee.getMessage()), locale)); } @@ -385,7 +385,7 @@ public class BOMServices { tree = new BOMTree(productId, "MANUF_COMPONENT", fromDate, BOMTree.EXPLOSION_SINGLE_LEVEL, delegator, dispatcher, userLogin); tree.setRootQuantity(quantity); tree.setRootAmount(amount); - tree.print(components, excludeWIPs.booleanValue()); + tree.print(components, excludeWIPs); if (components.size() > 0) components.remove(0); } catch (GenericEntityException gee) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingBomErrorCreatingBillOfMaterialsTree", UtilMisc.toMap("errorString", gee.getMessage()), locale)); @@ -594,7 +594,7 @@ public class BOMServices { BOMNode component = productsInPackages.get(j); Map<String, Object> boxTypeContentMap = new HashMap<String, Object>(); boxTypeContentMap.put("content", orderShipmentReadMap); - boxTypeContentMap.put("componentIndex", Integer.valueOf(j)); + boxTypeContentMap.put("componentIndex", j); GenericValue product = component.getProduct(); String boxTypeId = product.getString("shipmentBoxTypeId"); if (boxTypeId != null) { @@ -668,7 +668,7 @@ public class BOMServices { if (subProduct) { // multi package Integer index = (Integer)contentMap.get("componentIndex"); - BOMNode component = productsInPackages.get(index.intValue()); + BOMNode component = productsInPackages.get(index); product = component.getProduct(); quantity = component.getQuantity(); } else { Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRun.java Tue Aug 7 07:30:43 2018 @@ -282,7 +282,7 @@ public class ProductionRun { */ public Timestamp recalculateEstimatedCompletionDate() { this.updateCompletionDate = false; - return recalculateEstimatedCompletionDate(Long.valueOf(0), estimatedStartDate); + return recalculateEstimatedCompletionDate(0L, estimatedStartDate); } /** * get the productionRunName property. @@ -408,10 +408,10 @@ public class ProductionRun { double taskTime = 1; double totalTaskTime = 0; if (task.get("estimatedSetupMillis") != null) { - setupTime = task.getDouble("estimatedSetupMillis").doubleValue(); + setupTime = task.getDouble("estimatedSetupMillis"); } if (task.get("estimatedMilliSeconds") != null) { - taskTime = task.getDouble("estimatedMilliSeconds").doubleValue(); + taskTime = task.getDouble("estimatedMilliSeconds"); } totalTaskTime = (setupTime + taskTime * quantity.doubleValue()); Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Tue Aug 7 07:30:43 2018 @@ -906,7 +906,7 @@ public class ProductionRunServices { // this should be called only when the last task is completed if ("PRUN_RUNNING".equals(currentStatusId) && (statusId == null || "PRUN_COMPLETED".equals(statusId))) { Map<String, Object> serviceContext = new HashMap<String, Object>(); - if (issueAllComponents.booleanValue()) { + if (issueAllComponents) { // Issue all the components, if this task needs components and they still need to be issued try { List<GenericValue> inventoryAssigned = EntityQuery.use(delegator).from("WorkEffortInventoryAssign") @@ -958,7 +958,7 @@ public class ProductionRunServices { if (theTask.get("actualMilliSeconds") == null) { Double autoMillis = null; if (theTask.get("estimatedMilliSeconds") != null) { - autoMillis = Double.valueOf(quantityProduced.doubleValue() * theTask.getDouble("estimatedMilliSeconds")); + autoMillis = quantityProduced.doubleValue() * theTask.getDouble("estimatedMilliSeconds"); } serviceContext.put("actualMilliSeconds", autoMillis); } @@ -1166,13 +1166,13 @@ public class ProductionRunServices { Double actualSetupMillis = workEffort.getDouble("actualSetupMillis"); Double actualMilliSeconds = workEffort.getDouble("actualMilliSeconds"); if (actualSetupMillis == null) { - actualSetupMillis = new Double(0.0); + actualSetupMillis = 0.0; } if (actualMilliSeconds == null) { - actualMilliSeconds = new Double(0.0); + actualMilliSeconds = 0.0; } - actualTotalMilliSeconds += actualSetupMillis.doubleValue(); - actualTotalMilliSeconds += actualMilliSeconds.doubleValue(); + actualTotalMilliSeconds += actualSetupMillis; + actualTotalMilliSeconds += actualMilliSeconds; // Get the template (aka routing task) of the work effort GenericValue routingTaskAssoc = EntityQuery.use(delegator).from("WorkEffortAssoc") .where("workEffortIdTo", productionRunTaskId, @@ -1195,7 +1195,7 @@ public class ProductionRunServices { // compute the total time double totalTime = actualTotalMilliSeconds; if (costComponentCalc.get("perMilliSecond") != null) { - long perMilliSecond = costComponentCalc.getLong("perMilliSecond").longValue(); + long perMilliSecond = costComponentCalc.getLong("perMilliSecond"); if (perMilliSecond != 0) { totalTime = totalTime / perMilliSecond; } @@ -1247,11 +1247,11 @@ public class ProductionRunServices { String currencyUomId = (setupCost != null? setupCost.getString("amountUomId"): usageCost.getString("amountUomId")); BigDecimal setupCostAmount = ZERO; if (setupCost != null) { - setupCostAmount = setupCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualSetupMillis.doubleValue())); + setupCostAmount = setupCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualSetupMillis)); } BigDecimal usageCostAmount = ZERO; if (usageCost != null) { - usageCostAmount = usageCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualMilliSeconds.doubleValue())); + usageCostAmount = usageCost.getBigDecimal("amount").multiply(BigDecimal.valueOf(actualMilliSeconds)); } BigDecimal fixedAssetCost = setupCostAmount.add(usageCostAmount).setScale(decimals, rounding); fixedAssetCost = fixedAssetCost.divide(BigDecimal.valueOf(3600000), decimals, rounding); @@ -1767,14 +1767,14 @@ public class ProductionRunServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunProductProducedNotStillAvailable", locale)); } - if (lotId == null && autoCreateLot.booleanValue()) { + if (lotId == null && autoCreateLot) { createLotIfNeeded = Boolean.TRUE; } try { // Find the lot GenericValue lot = EntityQuery.use(delegator).from("Lot").where("lotId", lotId).queryOne(); if (lot == null) { - if (createLotIfNeeded.booleanValue()) { + if (createLotIfNeeded) { Map<String, Object> createLotCtx = ctx.makeValidContext("createLot", ModelService.IN_PARAM, context); createLotCtx.put("creationDate", UtilDateTime.nowTimestamp()); Map<String, Object> serviceResults = dispatcher.runSync("createLot", createLotCtx); @@ -2362,7 +2362,7 @@ public class ProductionRunServices { BigDecimal totalQuantityProduced = quantityProduced.add(addQuantityProduced); BigDecimal totalQuantityRejected = quantityRejected.add(addQuantityRejected); - if (issueRequiredComponents.booleanValue() && addQuantityProduced.compareTo(ZERO) > 0) { + if (issueRequiredComponents && addQuantityProduced.compareTo(ZERO) > 0) { BigDecimal quantityToProduce = theTask.getBigDecimal("quantityToProduce"); if (quantityToProduce == null) { quantityToProduce = BigDecimal.ZERO; @@ -2424,16 +2424,16 @@ public class ProductionRunServices { if (addTaskTime != null) { Double actualMilliSeconds = theTask.getDouble("actualMilliSeconds"); if (actualMilliSeconds == null) { - actualMilliSeconds = Double.valueOf(0); + actualMilliSeconds = (double) 0; } - serviceContext.put("actualMilliSeconds", Double.valueOf(actualMilliSeconds.doubleValue() + addTaskTime.doubleValue())); + serviceContext.put("actualMilliSeconds", actualMilliSeconds + addTaskTime.doubleValue()); } if (addSetupTime != null) { Double actualSetupMillis = theTask.getDouble("actualSetupMillis"); if (actualSetupMillis == null) { - actualSetupMillis = Double.valueOf(0); + actualSetupMillis = (double) 0; } - serviceContext.put("actualSetupMillis", Double.valueOf(actualSetupMillis.doubleValue() + addSetupTime.doubleValue())); + serviceContext.put("actualSetupMillis", actualSetupMillis + addSetupTime.doubleValue()); } serviceContext.put("quantityProduced", totalQuantityProduced); serviceContext.put("quantityRejected", totalQuantityRejected); Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/mrp/MrpServices.java Tue Aug 7 07:30:43 2018 @@ -138,7 +138,7 @@ public class MrpServices { notAssignedDate = now; } else { Calendar calendar = UtilDateTime.toCalendar(now); - calendar.add(Calendar.YEAR, defaultYearsOffset.intValue()); + calendar.add(Calendar.YEAR, defaultYearsOffset); notAssignedDate = new Timestamp(calendar.getTimeInMillis()); } resultList = null; @@ -679,9 +679,9 @@ public class MrpServices { if (bomLevel == 0) { filterByConditions = EntityCondition.makeCondition(EntityCondition.makeCondition("billOfMaterialLevel", EntityOperator.EQUALS, null), EntityOperator.OR, - EntityCondition.makeCondition("billOfMaterialLevel", EntityOperator.EQUALS, Long.valueOf(bomLevel))); + EntityCondition.makeCondition("billOfMaterialLevel", EntityOperator.EQUALS, bomLevel)); } else { - filterByConditions = EntityCondition.makeCondition("billOfMaterialLevel", EntityOperator.EQUALS, Long.valueOf(bomLevel)); + filterByConditions = EntityCondition.makeCondition("billOfMaterialLevel", EntityOperator.EQUALS, bomLevel); } try { listInventoryEventForMRP = EntityQuery.use(delegator).from("MrpEventView") @@ -689,7 +689,7 @@ public class MrpServices { .orderBy("productId", "eventDate") .queryList(); } catch (GenericEntityException e) { - Long bomLevelToString = new Long(bomLevel); + Long bomLevelToString = bomLevel; return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingMrpErrorForBomLevel", UtilMisc.toMap("bomLevel", bomLevelToString.toString(), "errorString", e.getMessage()), locale)); } Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/routing/RoutingServices.java Tue Aug 7 07:30:43 2018 @@ -75,7 +75,7 @@ public class RoutingServices { // FIXME: the ProductionRun.getEstimatedTaskTime(...) method will be removed and // its logic will be implemented inside this method. long estimatedTaskTime = ProductionRun.getEstimatedTaskTime(task, quantity, productId, routingId, dispatcher); - result.put("estimatedTaskTime", Long.valueOf(estimatedTaskTime)); + result.put("estimatedTaskTime", estimatedTaskTime); if (task != null && task.get("estimatedSetupMillis") != null) { result.put("setupTime", task.getBigDecimal("estimatedSetupMillis")); } Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/src/main/java/org/apache/ofbiz/manufacturing/techdata/TechDataServices.java Tue Aug 7 07:30:43 2018 @@ -220,7 +220,7 @@ public class TechDataServices { int moveDay = 0; Double capacity = null; Time startTime = null; - while (capacity == null || capacity.doubleValue()==0) { + while (capacity == null || capacity ==0) { switch (dayStart) { case Calendar.MONDAY: capacity = techDataCalendarWeek.getDouble("mondayCapacity"); @@ -251,14 +251,14 @@ public class TechDataServices { startTime = techDataCalendarWeek.getTime("sundayStartTime"); break; } - if (capacity == null || capacity.doubleValue() == 0) { + if (capacity == null || capacity == 0) { moveDay +=1; dayStart = (dayStart==7) ? 1 : dayStart +1; } } result.put("capacity",capacity); result.put("startTime",startTime); - result.put("moveDay",Integer.valueOf(moveDay)); + result.put("moveDay", moveDay); return result; } /** Used to to request the remain capacity available for dateFrom in a TechDataCalenda, @@ -281,7 +281,7 @@ public class TechDataServices { Calendar cDateTrav = Calendar.getInstance(); cDateTrav.setTime(dateFrom); Map<String, Object> position = dayStartCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); - int moveDay = ((Integer) position.get("moveDay")).intValue(); + int moveDay = (Integer) position.get("moveDay"); if (moveDay != 0) return 0; Time startTime = (Time) position.get("startTime"); Double capacity = (Double) position.get("capacity"); @@ -314,7 +314,7 @@ public class TechDataServices { cDateTrav.setTime(dateFrom); Map<String, Object> position = dayStartCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); Time startTime = (Time) position.get("startTime"); - int moveDay = ((Integer) position.get("moveDay")).intValue(); + int moveDay = (Integer) position.get("moveDay"); dateTo = (moveDay == 0) ? dateFrom : UtilDateTime.getDayStart(dateFrom,moveDay); Timestamp startAvailablePeriod = new Timestamp(UtilDateTime.getDayStart(dateTo).getTime() + startTime.getTime() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET)); if (dateTo.before(startAvailablePeriod)) { @@ -325,7 +325,7 @@ public class TechDataServices { cDateTrav.setTime(dateTo); position = dayStartCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); startTime = (Time) position.get("startTime"); - moveDay = ((Integer) position.get("moveDay")).intValue(); + moveDay = (Integer) position.get("moveDay"); if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo,moveDay); dateTo.setTime(dateTo.getTime() + startTime.getTime() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET)); } @@ -374,7 +374,7 @@ public class TechDataServices { int moveDay = 0; Double capacity = null; Time startTime = null; - while (capacity == null || capacity.doubleValue() == 0) { + while (capacity == null || capacity == 0) { switch (dayEnd) { case Calendar.MONDAY: capacity = techDataCalendarWeek.getDouble("mondayCapacity"); @@ -405,14 +405,14 @@ public class TechDataServices { startTime = techDataCalendarWeek.getTime("sundayStartTime"); break; } - if (capacity == null || capacity.doubleValue() == 0) { + if (capacity == null || capacity == 0) { moveDay -=1; dayEnd = (dayEnd==1) ? 7 : dayEnd - 1; } } result.put("capacity",capacity); result.put("startTime",startTime); - result.put("moveDay",Integer.valueOf(moveDay)); + result.put("moveDay", moveDay); return result; } /** Used to request the remaining capacity available for dateFrom in a TechDataCalenda, @@ -435,7 +435,7 @@ public class TechDataServices { Calendar cDateTrav = Calendar.getInstance(); cDateTrav.setTime(dateFrom); Map<String, Object> position = dayEndCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); - int moveDay = ((Integer) position.get("moveDay")).intValue(); + int moveDay = (Integer) position.get("moveDay"); if (moveDay != 0) return 0; Time startTime = (Time) position.get("startTime"); Double capacity = (Double) position.get("capacity"); @@ -468,9 +468,9 @@ public class TechDataServices { cDateTrav.setTime(dateFrom); Map<String, Object> position = dayEndCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); Time startTime = (Time) position.get("startTime"); - int moveDay = ((Integer) position.get("moveDay")).intValue(); + int moveDay = (Integer) position.get("moveDay"); Double capacity = (Double) position.get("capacity"); - dateTo = (moveDay == 0) ? dateFrom : UtilDateTime.getDayEnd(dateFrom, Long.valueOf(moveDay)); + dateTo = (moveDay == 0) ? dateFrom : UtilDateTime.getDayEnd(dateFrom, (long) moveDay); Timestamp endAvailablePeriod = new Timestamp(UtilDateTime.getDayStart(dateTo).getTime() + startTime.getTime() + capacity.longValue() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET)); if (dateTo.after(endAvailablePeriod)) { dateTo = endAvailablePeriod; @@ -480,7 +480,7 @@ public class TechDataServices { cDateTrav.setTime(dateTo); position = dayEndCapacityAvailable(techDataCalendarWeek, cDateTrav.get(Calendar.DAY_OF_WEEK)); startTime = (Time) position.get("startTime"); - moveDay = ((Integer) position.get("moveDay")).intValue(); + moveDay = (Integer) position.get("moveDay"); capacity = (Double) position.get("capacity"); if (moveDay != 0) dateTo = UtilDateTime.getDayStart(dateTo,moveDay); dateTo.setTime(dateTo.getTime() + startTime.getTime() + capacity.longValue() + cDateTrav.get(Calendar.ZONE_OFFSET) + cDateTrav.get(Calendar.DST_OFFSET)); Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/report/ReportHelper.java Tue Aug 7 07:30:43 2018 @@ -64,21 +64,21 @@ public final class ReportHelper { reportValue.put("orders", orderValue.getLong("orderId")); // # of orders if (orderValue.getDouble("grandTotal") == null) { - reportValue.put("orderAmount", Double.valueOf(0)); + reportValue.put("orderAmount", (double) 0); } else { reportValue.put("orderAmount", orderValue.getDouble("grandTotal")); } if ((orderValue.getLong("orderId") == null) || (visit.getLong("visitId") == null) || (visit.getLong("visitId").intValue() == 0)) { - reportValue.put("conversionRate", Double.valueOf(0)); + reportValue.put("conversionRate", (double) 0); } else { - reportValue.put("conversionRate", Double.valueOf(orderValue.getLong("orderId").doubleValue() / visit.getLong("visitId").doubleValue())); + reportValue.put("conversionRate", orderValue.getLong("orderId").doubleValue() / visit.getLong("visitId").doubleValue()); } } else { // no matching orders - all those values are zeroes - reportValue.put("orders", Long.valueOf(0)); - reportValue.put("orderAmount", Double.valueOf(0)); - reportValue.put("conversionRate", Double.valueOf(0)); + reportValue.put("orders", 0L); + reportValue.put("orderAmount", (double) 0); + reportValue.put("conversionRate", (double) 0); } conversionRates.add(reportValue); Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/src/main/java/org/apache/ofbiz/marketing/tracking/TrackingCodeEvents.java Tue Aug 7 07:30:43 2018 @@ -148,9 +148,9 @@ public class TrackingCodeEvents { trackingCode.set("lastModifiedDate", UtilDateTime.nowTimestamp()); //use nearly unlimited trackable lifetime: 10 billion seconds, 310 years - trackingCode.set("trackableLifetime", Long.valueOf(10000000000L)); + trackingCode.set("trackableLifetime", 10000000000L); //use 2592000 seconds as billable lifetime: equals 1 month - trackingCode.set("billableLifetime", Long.valueOf(2592000)); + trackingCode.set("billableLifetime", 2592000L); trackingCode.set("comments", "This TrackingCode has default values because no default TrackingCode could be found."); @@ -224,9 +224,9 @@ public class TrackingCodeEvents { // if trackingCode.trackableLifetime not null and is > 0 write a trackable cookie with name in the form: TKCDT_{trackingCode.trackingCodeTypeId} and timeout will be trackingCode.trackableLifetime Long trackableLifetime = trackingCode.getLong("trackableLifetime"); - if (trackableLifetime != null && (trackableLifetime.longValue() > 0 || trackableLifetime.longValue() == -1)) { + if (trackableLifetime != null && (trackableLifetime > 0 || trackableLifetime == -1)) { Cookie trackableCookie = new Cookie("TKCDT_" + trackingCode.getString("trackingCodeTypeId"), trackingCode.getString("trackingCodeId")); - if (trackableLifetime.longValue() > 0) trackableCookie.setMaxAge(trackableLifetime.intValue()); + if (trackableLifetime > 0) trackableCookie.setMaxAge(trackableLifetime.intValue()); trackableCookie.setPath("/"); if (cookieDomain.length() > 0) trackableCookie.setDomain(cookieDomain); trackableCookie.setSecure(true); @@ -236,9 +236,9 @@ public class TrackingCodeEvents { // if trackingCode.billableLifetime not null and is > 0 write a billable cookie with name in the form: TKCDB_{trackingCode.trackingCodeTypeId} and timeout will be trackingCode.billableLifetime Long billableLifetime = trackingCode.getLong("billableLifetime"); - if (billableLifetime != null && (billableLifetime.longValue() > 0 || billableLifetime.longValue() == -1)) { + if (billableLifetime != null && (billableLifetime > 0 || billableLifetime == -1)) { Cookie billableCookie = new Cookie("TKCDB_" + trackingCode.getString("trackingCodeTypeId"), trackingCode.getString("trackingCodeId")); - if (billableLifetime.longValue() > 0) billableCookie.setMaxAge(billableLifetime.intValue()); + if (billableLifetime > 0) billableCookie.setMaxAge(billableLifetime.intValue()); billableCookie.setPath("/"); if (cookieDomain.length() > 0) billableCookie.setDomain(cookieDomain); billableCookie.setSecure(true); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderLookupServices.java Tue Aug 7 07:30:43 2018 @@ -626,15 +626,15 @@ public class OrderLookupServices { // format the param list String paramString = StringUtil.join(paramList, "&"); - result.put("highIndex", Integer.valueOf(highIndex)); - result.put("lowIndex", Integer.valueOf(lowIndex)); + result.put("highIndex", highIndex); + result.put("lowIndex", lowIndex); result.put("viewIndex", viewIndex); result.put("viewSize", viewSize); result.put("showAll", showAll); result.put("paramList", (paramString != null? paramString: "")); result.put("orderList", orderList); - result.put("orderListSize", Integer.valueOf(orderCount)); + result.put("orderListSize", orderCount); return result; } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReadHelper.java Tue Aug 7 07:30:43 2018 @@ -1195,7 +1195,7 @@ public class OrderReadHelper { } if (pieces != null) { - piecesIncluded = pieces.longValue(); + piecesIncluded = pieces; } } } @@ -1222,7 +1222,7 @@ public class OrderReadHelper { itemInfo.put("quantity", getOrderItemQuantity(item)); itemInfo.put("weight", this.getItemWeight(item)); itemInfo.put("size", this.getItemSize(item)); - itemInfo.put("piecesIncluded", Long.valueOf(this.getItemPiecesIncluded(item))); + itemInfo.put("piecesIncluded", this.getItemPiecesIncluded(item)); itemInfo.put("featureSet", this.getItemFeatureSet(item)); return itemInfo; } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderReturnServices.java Tue Aug 7 07:30:43 2018 @@ -111,7 +111,7 @@ public class OrderReturnServices { if (countNewReturnItems == null) { countNewReturnItems = Boolean.FALSE; } - BigDecimal returnTotal = orh.getOrderReturnedTotal(countNewReturnItems.booleanValue()); + BigDecimal returnTotal = orh.getOrderReturnedTotal(countNewReturnItems); BigDecimal orderTotal = orh.getOrderGrandTotal(); BigDecimal available = orderTotal.subtract(returnTotal).subtract(adj); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderServices.java Tue Aug 7 07:30:43 2018 @@ -1492,7 +1492,7 @@ public class OrderServices { } EntityCondition cond = null; - if (!forceAll.booleanValue()) { + if (!forceAll) { List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("grandTotal", EntityOperator.EQUALS, null), EntityCondition.makeCondition("remainingSubTotal", EntityOperator.EQUALS, null)); cond = EntityCondition.makeCondition(exprs, EntityOperator.OR); @@ -2462,7 +2462,7 @@ public class OrderServices { String roleTypeId = (String) context.get("roleTypeId"); Boolean removeOld = (Boolean) context.get("removeOld"); - if (removeOld != null && removeOld.booleanValue()) { + if (removeOld != null && removeOld) { try { delegator.removeByAnd("OrderRole", UtilMisc.toMap("orderId", orderId, "roleTypeId", roleTypeId)); } catch (GenericEntityException e) { @@ -5374,7 +5374,7 @@ public class OrderServices { // process payment Map<String, Object> payResp; try { - payResp = coh.processPayment(productStore, userLogin, false, manualHold.booleanValue()); + payResp = coh.processPayment(productStore, userLogin, false, manualHold); } catch (GeneralException e) { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); @@ -5955,7 +5955,7 @@ public class OrderServices { if (rowNumber == null) { Long count = EntityQuery.use(delegator).from("OrderItemShipGroupAssoc").where("orderId", orderId, "orderItemSeqId", orderItemSeqId).queryCount(); if (count != null) { - rowNumber = Integer.valueOf(count.intValue()); + rowNumber = count.intValue(); result.put("rowNumber", rowNumber); } } @@ -5982,7 +5982,7 @@ public class OrderServices { //if quantity is 0, delete this association only if there is several oisgaoc if (ZERO.compareTo(quantity) == 0) { // test if there is only one oisgaoc then display errror - if (rowNumber.intValue() == 1) { + if (rowNumber == 1) { String errMsg = mainErrorMessage + UtilProperties.getMessage(resource_error, "OrderQuantityAssociatedCannotBeNullOrNegative", locale); Debug.logError(errMsg, module); return ServiceUtil.returnError(errMsg); @@ -6003,8 +6003,8 @@ public class OrderServices { } //Only for multi service calling and the last row : test if orderItem quantity equals OrderItemShipGroupAssocs quantitys if (rowCount != null) { - int rowCountInt = rowCount .intValue(); - int rowNumberInt = rowNumber .intValue(); + int rowCountInt = rowCount; + int rowNumberInt = rowNumber; if (rowCountInt == rowNumberInt - 1) { try { message = validateOrderItemShipGroupAssoc(delegator, dispatcher, orderItem, totalQuantity, oisga, userLogin, locale); @@ -6070,8 +6070,8 @@ public class OrderServices { //Only for multi service calling and the last row : test if orderItem quantity equals OrderItemShipGroupAssocs quantitys if (rowCount != null && rowNumber != null ) { - int rowCountInt = rowCount .intValue(); - int rowNumberInt = rowNumber .intValue(); + int rowCountInt = rowCount; + int rowNumberInt = rowNumber; if (rowCountInt == rowNumberInt - 1) { try { message = validateOrderItemShipGroupAssoc(delegator, dispatcher, orderItem, totalQuantity, oisga, userLogin, locale); Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/requirement/RequirementServices.java Tue Aug 7 07:30:43 2018 @@ -195,7 +195,7 @@ public class RequirementServices { Map<String, Object> results = ServiceUtil.returnSuccess(); results.put("requirementsForSupplier", requirements); - results.put("distinctProductCount", Integer.valueOf(products.size())); + results.put("distinctProductCount", products.size()); results.put("quantityTotal", quantity); results.put("amountTotal", amountTotal); return results; Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutEvents.java Tue Aug 7 07:30:43 2018 @@ -534,7 +534,7 @@ public class CheckOutEvents { if (productStore == null || productStore.get("explodeOrderItems") == null) { return false; } - return productStore.getBoolean("explodeOrderItems").booleanValue(); + return productStore.getBoolean("explodeOrderItems"); } public static String checkShipmentNeeded(HttpServletRequest request, HttpServletResponse response) { Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java Tue Aug 7 07:30:43 2018 @@ -807,7 +807,7 @@ public class CheckOutHelper { if (itemAdj != null) { for (int x = 0; x < itemAdj.size(); x++) { List<GenericValue> adjs = itemAdj.get(x); - ShoppingCartItem item = shoppingCartItemIndexMap.get(Integer.valueOf(x)); + ShoppingCartItem item = shoppingCartItemIndexMap.get(x); if (adjs == null) { adjs = new LinkedList<>(); } @@ -843,7 +843,7 @@ public class CheckOutHelper { price.add(i, cartItem.getBasePrice()); quantity.add(i, cartItem.getQuantity()); shipAmt.add(i, BigDecimal.ZERO); // no per item shipping yet - shoppingCartItemIndexMap.put(Integer.valueOf(i), cartItem); + shoppingCartItemIndexMap.put(i, cartItem); } //add promotion adjustments Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java Tue Aug 7 07:30:43 2018 @@ -582,7 +582,7 @@ public class ShoppingCart implements Ite if ("PURCHASE_ORDER".equals(getOrderType())) { supplierProduct = getSupplierProduct(productId, quantity, dispatcher); if (supplierProduct != null || "_NA_".equals(this.getPartyId())) { - item = ShoppingCartItem.makePurchaseOrderItem(Integer.valueOf(0), productId, selectedAmount, quantity, features, attributes, prodCatalogId, configWrapper, itemType, itemGroup, dispatcher, this, supplierProduct, shipBeforeDate, shipAfterDate, cancelBackOrderDate); + item = ShoppingCartItem.makePurchaseOrderItem(0, productId, selectedAmount, quantity, features, attributes, prodCatalogId, configWrapper, itemType, itemGroup, dispatcher, this, supplierProduct, shipBeforeDate, shipAfterDate, cancelBackOrderDate); } else { throw new CartItemModifyException("SupplierProduct not found"); } @@ -595,7 +595,7 @@ public class ShoppingCart implements Ite } catch (GenericEntityException e) { Debug.logError(e, module); } - item = ShoppingCartItem.makeItem(Integer.valueOf(0), productId, selectedAmount, quantity, null, + item = ShoppingCartItem.makeItem(0, productId, selectedAmount, quantity, null, reservStart, reservLength, reservPersons, accommodationMapId, accommodationSpotId, shipBeforeDate, shipAfterDate, features, attributes, prodCatalogId, configWrapper, itemType, itemGroup, dispatcher, this, Boolean.TRUE, Boolean.TRUE, parentProductId, Boolean.FALSE, Boolean.FALSE); @@ -618,7 +618,7 @@ public class ShoppingCart implements Ite public int addNonProductItem(String itemType, String description, String categoryId, BigDecimal price, BigDecimal quantity, Map<String, Object> attributes, String prodCatalogId, String itemGroupNumber, LocalDispatcher dispatcher) throws CartItemModifyException { ShoppingCart.ShoppingCartItemGroup itemGroup = this.getItemGroupByNumber(itemGroupNumber); - return this.addItem(0, ShoppingCartItem.makeItem(Integer.valueOf(0), itemType, description, categoryId, price, null, quantity, attributes, prodCatalogId, itemGroup, dispatcher, this, Boolean.TRUE)); + return this.addItem(0, ShoppingCartItem.makeItem(0, itemType, description, categoryId, price, null, quantity, attributes, prodCatalogId, itemGroup, dispatcher, this, Boolean.TRUE)); } /** Add an item to the shopping cart. */ @@ -2099,7 +2099,7 @@ public class ShoppingCart implements Ite if (shipGroups.keySet() != null) { for (Integer shipGroup : shipGroups.keySet()) { - CartShipInfo cartShipInfo = this.getShipInfo(shipGroup.intValue()); + CartShipInfo cartShipInfo = this.getShipInfo(shipGroup); cartShipInfo.resetShipAfterDateIfBefore(item.getShipAfterDate()); cartShipInfo.resetShipBeforeDateIfAfter(item.getShipBeforeDate()); @@ -2470,7 +2470,7 @@ public class ShoppingCart implements Ite public void setIsGift(int idx, Boolean isGift) { CartShipInfo csi = this.getShipInfo(idx); if (UtilValidate.isNotEmpty(isGift)) { - csi.isGift = isGift.booleanValue() ? "Y" : "N"; + csi.isGift = isGift ? "Y" : "N"; } } @@ -4190,7 +4190,7 @@ public class ShoppingCart implements Ite CartShipInfo csi = shipInfo.get(i); if ((csi.supplierPartyId == null && supplierPartyId == null) || (UtilValidate.isNotEmpty(csi.supplierPartyId) && csi.supplierPartyId.equals(supplierPartyId))) { - shipGroups.put(Integer.valueOf(i), csi); + shipGroups.put(i, csi); } } return shipGroups; @@ -4341,7 +4341,7 @@ public class ShoppingCart implements Ite } Map<Integer, BigDecimal> cartItemGroupQuantities = UtilGenerics.checkMap(supplierCartItems.get(cartItem)); - cartItemGroupQuantities.put(Integer.valueOf(shipGroupIndex), dropShipQuantity); + cartItemGroupQuantities.put(shipGroupIndex, dropShipQuantity); } } @@ -4354,7 +4354,7 @@ public class ShoppingCart implements Ite // Attempt to get the first ship group for the supplierPartyId TreeMap<Integer, CartShipInfo> supplierShipGroups = this.getShipGroupsBySupplier(supplierPartyId); if (! UtilValidate.isEmpty(supplierShipGroups)) { - newShipGroupIndex = (supplierShipGroups.firstKey()).intValue(); + newShipGroupIndex = supplierShipGroups.firstKey(); shipInfo = supplierShipGroups.get(supplierShipGroups.firstKey()); } if (newShipGroupIndex == -1) { @@ -4669,7 +4669,7 @@ public class ShoppingCart implements Ite public void setMaySplit(Boolean maySplit) { if (UtilValidate.isNotEmpty(maySplit)) { - this.maySplit = maySplit.booleanValue() ? "Y" : "N"; + this.maySplit = maySplit ? "Y" : "N"; } } Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1837577&r1=1837576&r2=1837577&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java Tue Aug 7 07:30:43 2018 @@ -271,7 +271,7 @@ public class ShoppingCartHelper { // Indicate there were no critical errors result = ServiceUtil.returnSuccess(); if (itemId != -1) { - result.put("itemId", Integer.valueOf(itemId)); + result.put("itemId", itemId); } return result; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |