svn commit: r935163 - in /ofbiz/trunk: applications/commonext/script/
Locked
svn commit: r935163 - in /ofbiz/trunk: applications/commonext/script/
 
|
Author: lektran
Date: Sat Apr 17 10:27:15 2010 New Revision: 935163 URL: http://svn.apache.org/viewvc?rev=935163&view=rev Log: Get rid of a bunch of Integer instantiations Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java Modified: ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml (original) +++ ofbiz/trunk/applications/commonext/script/org/ofbiz/SystemInfoServices.xml Sat Apr 17 10:27:15 2010 @@ -145,7 +145,7 @@ under the License. <if-compare field="parameters.entityName" value="PublicMessage" operator="equals"> <if-has-permission permission="COMMONEXT_PUBLMSG"> <!-- get all recent visitors logged on the last 3 weeks --> - <set field="lastDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.addDaysToTimestamp(org.ofbiz.base.util.UtilDateTime.nowTimestamp(), new Integer("-21"))}" type="Timestamp"/> + <set field="lastDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.addDaysToTimestamp(org.ofbiz.base.util.UtilDateTime.nowTimestamp(), -21)}" type="Timestamp"/> <entity-condition list="parties" entity-name="PartyNameVisitView" distinct="true"> <condition-expr field-name="fromDate" operator="greater" from-field="lastDate"/> <select-field field-name="partyId"/> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsComponentsByFeature.groovy Sat Apr 17 10:27:15 2010 @@ -114,7 +114,7 @@ if (allProductionRuns) { if (productArea > 0) panelQty = productMapQty / productArea; panelQtyInt = panelQty; if (panelQtyInt < panelQty) panelQtyInt++; - productMap.panelQuantity = new Integer(panelQtyInt); + productMap.panelQuantity = panelQtyInt; } } feature.productList = productsMap.values(); Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java (original) +++ ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java Sat Apr 17 10:27:15 2010 @@ -1170,7 +1170,7 @@ public class ProductPromoWorker { if (UtilValidate.isNotEmpty(condValue)) { BigDecimal orderTotalShipping = cart.getTotalShipping(); if (Debug.verboseOn()) { Debug.logVerbose("Doing order total Shipping compare: ordertotalShipping=" + orderTotalShipping, module); } - compareBase = new Integer(orderTotalShipping.compareTo(new BigDecimal(condValue))); + compareBase = orderTotalShipping.compareTo(new BigDecimal(condValue)); } } else { Debug.logWarning(UtilProperties.getMessage(resource_error,"OrderAnUnSupportedProductPromoCondInputParameterLhs", UtilMisc.toMap("inputParamEnumId",productPromoCond.getString("inputParamEnumId")), cart.getLocale()), module); Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy Sat Apr 17 10:27:15 2010 @@ -22,7 +22,7 @@ import org.ofbiz.entity.condition.*; import org.ofbiz.entity.util.* import org.ofbiz.base.util.*; -lastDate = UtilDateTime.addDaysToTimestamp(UtilDateTime.nowTimestamp(), new Integer("-21")); // should be there the last 3 weeks. +lastDate = UtilDateTime.addDaysToTimestamp(UtilDateTime.nowTimestamp(), -21); // should be there the last 3 weeks. searchCondition = EntityCondition.makeCondition("fromDate", EntityOperator.GREATER_THAN, lastDate); options = new EntityFindOptions(false, 0, 0,, true); context.recentParties = delegator.findList("PartyNameVisitView", searchCondition, (Set)["partyId", "firstName", "middleName", "lastName", "groupName"], null, options, true); Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy Sat Apr 17 10:27:15 2010 @@ -25,7 +25,7 @@ if (partyId) { // get the system user system = delegator.findByPrimaryKey("UserLogin", [userLoginId : "system"]); - monthsToInclude = new Integer(12); + monthsToInclude = 12; Map serviceIn = UtilMisc.toMap("partyId", partyId, "roleTypeId", "PLACING_CUSTOMER", "orderTypeId", "SALES_ORDER", "statusId", "ORDER_COMPLETED", "monthsToInclude", monthsToInclude, "userLogin", system); Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Sat Apr 17 10:27:15 2010 @@ -969,7 +969,7 @@ public class PackingSession implements j public BigDecimal getPackageWeight(int packageSeqId) { if (this.packageWeights == null) return null; BigDecimal packageWeight = null; - Object p = packageWeights.get(new Integer(packageSeqId)); + Object p = packageWeights.get(packageSeqId); if (p != null) { packageWeight = (BigDecimal) p; } Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy Sat Apr 17 10:27:15 2010 @@ -49,7 +49,7 @@ context.prevMillis = new Long(prev.getTi Timestamp next = UtilDateTime.getDayStart(start, 1, timeZone, locale); context.nextMillis = new Long(next.getTime()).toString(); -Map serviceCtx = UtilMisc.toMap("userLogin", userLogin,"start",start,"numPeriods",new Integer(24),"periodType",new Integer(Calendar.HOUR)); +Map serviceCtx = UtilMisc.toMap("userLogin", userLogin,"start",start,"numPeriods", 24,"periodType", Calendar.HOUR); serviceCtx.putAll(UtilMisc.toMap("partyId", partyId, "facilityId", facilityId, "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, "calendarType", calendarType, "locale", locale, "timeZone", timeZone)); if (entityExprList) { serviceCtx.putAll(["entityExprList" : entityExprList]); Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy Sat Apr 17 10:27:15 2010 @@ -62,7 +62,7 @@ tempCal.add(Calendar.DATE, -prevMonthDay numDays += prevMonthDays; getFrom = new Timestamp(tempCal.getTimeInMillis()); firstWeekNum = tempCal.get(Calendar.WEEK_OF_YEAR); -context.put("firstWeekNum", new Integer(firstWeekNum)); +context.put("firstWeekNum", firstWeekNum); // also get days until the end of the week at the end of the month lastWeekCal = UtilDateTime.toCalendar(end, timeZone, locale); @@ -75,7 +75,7 @@ if (followingMonthDays < 0) { } numDays += followingMonthDays; -serviceCtx = UtilMisc.toMap("userLogin", userLogin, "start", getFrom, "numPeriods", new Integer(numDays), "periodType", new Integer(Calendar.DATE)); +serviceCtx = UtilMisc.toMap("userLogin", userLogin, "start", getFrom, "numPeriods", numDays, "periodType", Calendar.DATE); serviceCtx.putAll(UtilMisc.toMap("partyId", partyId, "facilityId", facilityId, "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, "calendarType", calendarType, "locale", locale, "timeZone", timeZone)); if (entityExprList) { serviceCtx.putAll(["entityExprList" : entityExprList]); Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Upcoming.groovy Sat Apr 17 10:27:15 2010 @@ -44,7 +44,7 @@ if (workEffortTypeId != null) { eventsParam = "workEffortTypeId=" + workEffortTypeId; } -Map serviceCtx = UtilMisc.toMap("userLogin", userLogin, "start", start, "numPeriods", new Integer(7), "periodType", new Integer(Calendar.DATE)); +Map serviceCtx = UtilMisc.toMap("userLogin", userLogin, "start", start, "numPeriods", 7, "periodType", Calendar.DATE); serviceCtx.putAll(UtilMisc.toMap("partyId", partyId, "facilityId", facilityId, "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, "calendarType", calendarType, "locale", locale, "timeZone", timeZone)); Map result = dispatcher.runSync("getWorkEffortEventsByPeriod",serviceCtx); Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy Sat Apr 17 10:27:15 2010 @@ -56,8 +56,8 @@ Timestamp next = UtilDateTime.getDayStar context.nextMillis = new Long(next.getTime()).toString(); Timestamp end = UtilDateTime.getDayStart(start, 6, timeZone, locale); -Map serviceCtx = UtilMisc.toMap("userLogin", userLogin,"start",start,"numPeriods",new Integer(7), - "periodType",new Integer(Calendar.DATE)); +Map serviceCtx = UtilMisc.toMap("userLogin", userLogin,"start",start,"numPeriods", 7, + "periodType", Calendar.DATE); serviceCtx.putAll(UtilMisc.toMap("partyId", partyId, "facilityId", facilityId, "fixedAssetId", fixedAssetId, "workEffortTypeId", workEffortTypeId, "calendarType", calendarType, "locale", locale, "timeZone", timeZone)); Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilMisc.java Sat Apr 17 10:27:15 2010 @@ -627,7 +627,7 @@ public class UtilMisc { return (Integer) obj; } if (obj instanceof Number) { - return new Integer(((Number)obj).intValue()); + return ((Number)obj).intValue(); } Integer result = null; try { Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java Sat Apr 17 10:27:15 2010 @@ -309,7 +309,7 @@ public class ObjectTypeTests extends Gen simpleTypeConvertTestSingleMulti("Integer->Double", intg, new String[] {"Double", "java.lang.Double"}, new Double("781")); simpleTypeConvertTestSingleMulti("Integer->Float", intg, new String[] {"Float", "java.lang.Float"}, new Float("781")); simpleTypeConvertTestSingleMulti("Integer->Long", intg, new String[] {"Long", "java.lang.Long"}, lng); - simpleTypeConvertTestSingleMulti("Integer->Integer", intg, new String[] {"Integer", "java.lang.Integer"}, new Integer("781")); + simpleTypeConvertTestSingleMulti("Integer->Integer", intg, new String[] {"Integer", "java.lang.Integer"}, Integer.valueOf("781")); simpleTypeConvertTestSingleMulti("Integer->List", intg, new String[] {"List", "List<java.lang.Integer>", "java.util.List"}, list(intg)); simpleTypeConvertTestSingleMulti("Integer->Set", intg, new String[] {"Set", "Set<java.lang.Integer>", "java.util.Set"}, set(intg)); simpleTypeConvertTestSingleMulti("Integer->TimeDuration", Integer.valueOf("3661001"), new String[] {"TimeDuration", "org.ofbiz.base.util.TimeDuration"}, duration); Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java (original) +++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/ExpressionUiHelper.java Sat Apr 17 10:27:15 2010 @@ -59,7 +59,7 @@ public class ExpressionUiHelper { SimpleDateFormat dateFormat = new SimpleDateFormat("EEEE", locale); List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(7); for (int i = 0; i < 7; i++) { - result.add(UtilMisc.toMap("description", (Object)dateFormat.format(tempCal.getTime()), "value", new Integer(tempCal.get(Calendar.DAY_OF_WEEK)))); + result.add(UtilMisc.toMap("description", (Object)dateFormat.format(tempCal.getTime()), "value", tempCal.get(Calendar.DAY_OF_WEEK))); tempCal.roll(Calendar.DAY_OF_WEEK, 1); } return result; @@ -96,7 +96,7 @@ public class ExpressionUiHelper { SimpleDateFormat dateFormat = new SimpleDateFormat("MMMM", locale); List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(13); for (int i = Calendar.JANUARY; i <= tempCal.getActualMaximum(Calendar.MONTH); i++) { - result.add(UtilMisc.toMap("description", (Object)dateFormat.format(tempCal.getTime()), "value", new Integer(i))); + result.add(UtilMisc.toMap("description", (Object)dateFormat.format(tempCal.getTime()), "value", i)); tempCal.roll(Calendar.MONTH, 1); } return result; @@ -109,12 +109,12 @@ public class ExpressionUiHelper { */ public static List<Map<String, Object>> getFrequencyValueList(Map<String, Object> uiLabelMap) { List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(6); - result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonSecond"), "value", new Integer(Calendar.SECOND))); - result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonMinute"), "value", new Integer(Calendar.MINUTE))); - result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonHour"), "value", new Integer(Calendar.HOUR_OF_DAY))); - result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonDay"), "value", new Integer(Calendar.DAY_OF_MONTH))); - result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonMonth"), "value", new Integer(Calendar.MONTH))); - result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonYear"), "value", new Integer(Calendar.YEAR))); + result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonSecond"), "value", Calendar.SECOND)); + result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonMinute"), "value", Calendar.MINUTE)); + result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonHour"), "value", Calendar.HOUR_OF_DAY)); + result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonDay"), "value", Calendar.DAY_OF_MONTH)); + result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonMonth"), "value", Calendar.MONTH)); + result.add(UtilMisc.toMap("description", uiLabelMap.get("CommonYear"), "value", Calendar.YEAR)); return result; } Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java (original) +++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelReferences.java Sat Apr 17 10:27:15 2010 @@ -124,15 +124,15 @@ public class LabelReferences { Map<String, Integer> reference = references.get(labelKey); if (UtilValidate.isEmpty(reference)) { reference = new TreeMap<String, Integer>(); - reference.put(filePath, new Integer(1)); + reference.put(filePath, 1); references.put(labelKey, reference); } else { Integer labelsInFile = reference.get(filePath); if (UtilValidate.isEmpty(labelsInFile)) { - labelsInFile = new Integer(1); + labelsInFile = 1; } else { - labelsInFile = new Integer(labelsInFile.intValue() + 1); + labelsInFile = labelsInFile + 1; } reference.put(filePath, labelsInFile); } Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Sat Apr 17 10:27:15 2010 @@ -643,7 +643,7 @@ public class EbayOrderServices { while (paginationElemIter.hasNext()) { Element paginationElement = (Element) paginationElemIter.next(); String totalNumberOfEntries = UtilXml.childElementValue(paginationElement, "TotalNumberOfEntries", "0"); - totalOrders = new Integer(totalNumberOfEntries).intValue(); + totalOrders = Integer.valueOf(totalNumberOfEntries); } if (ack != null && "Success".equals(ack)) { Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Sat Apr 17 10:27:15 2010 @@ -337,7 +337,7 @@ public class ImportOrdersFromEbay { while (paginationElemIter.hasNext()) { Element paginationElement = (Element) paginationElemIter.next(); String totalNumberOfEntries = UtilXml.childElementValue(paginationElement, "TotalNumberOfEntries", "0"); - totalOrders = new Integer(totalNumberOfEntries).intValue(); + totalOrders = Integer.valueOf(totalNumberOfEntries); } if (ack != null && "Success".equals(ack)) { Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Sat Apr 17 10:27:15 2010 @@ -516,7 +516,7 @@ public class ProductsExportToEbay { } else { categoryParent = params[1]; levelLimit = params[2]; - Integer level = new Integer(levelLimit); + Integer level = Integer.valueOf(levelLimit); levelLimit = (level.intValue() + 1) + ""; } } Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Sat Apr 17 10:27:15 2010 @@ -212,7 +212,7 @@ public class EbayEvents { item.setSKU(product.getString("productId")); item.setApplicationData(product.getString("productId")); item.setCountry(CountryCodeType.US); - item.setQuantity(new Integer(1)); + item.setQuantity(1); String smallImage = product.getString("smallImageUrl"); String mediumImage = product.getString("mediumImageUrl"); String largeImage = product.getString("largeImageUrl"); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sat Apr 17 10:27:15 2010 @@ -599,7 +599,7 @@ public class PosTransaction implements S item.removeAdjustment(itemAdj.intValue()); } int idx = item.addAdjustment(adjustment); - skuDiscounts.put(productId, new Integer(idx)); + skuDiscounts.put(productId, idx); } else { trace("add sale adjustment"); if (cartDiscount > -1) { @@ -1469,7 +1469,7 @@ public class PosTransaction implements S String selectedCartItems[] = new String[cart.size()]; for(int i = 0; i < cart.size(); i++) { - Integer integer = new Integer(i); + Integer integer = i; selectedCartItems[i] = integer.toString(); } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java Sat Apr 17 10:27:15 2010 @@ -65,7 +65,7 @@ public class KeyboardAdaptor { } if (receiver != null && dataType > -1) { - receivers.put(receiver, new Integer(dataType)); + receivers.put(receiver, dataType); } return adaptor; } @@ -147,7 +147,7 @@ public class KeyboardAdaptor { } protected synchronized void receiveCode(int keycode) { - keyCodeData.add(new Integer(keycode)); + keyCodeData.add(keycode); } protected synchronized void receiveChar(char keychar) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java Sat Apr 17 10:27:15 2010 @@ -69,7 +69,7 @@ public class KeyboardService extends Bas propName = propName.substring(4); PosKey key = new PosKey(propName, propValue); - keyMapping.put(new Integer(key.hashCode()), key); + keyMapping.put(key.hashCode(), key); } } } @@ -138,7 +138,7 @@ public class KeyboardService extends Bas if (lastEvent != null) { KeyEvent thisEvent = lastEvent; PosKey thisKey = new PosKey(thisEvent); - PosKey mappedKey = (PosKey) keyMapping.get(new Integer(thisKey.hashCode())); + PosKey mappedKey = (PosKey) keyMapping.get(thisKey.hashCode()); if (mappedKey != null && mappedKey.checkModifiers(thisEvent.getModifiersEx())) { this.received = true; this.keyData = mappedKey.getMappedCode(); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java?rev=935163&r1=935162&r2=935163&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java Sat Apr 17 10:27:15 2010 @@ -185,29 +185,29 @@ public class ScannerKybService extends B if (codeType.startsWith("CodeType:")) { String codeValue = entry.getProp(codeType).getValueAsString(); if ("CodeType:CODE11".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_OTHER)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_OTHER); } else if ("CodeType:CODE39".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_Code39)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_Code39); } else if ("CodeType:CODE93".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_Code93)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_Code93); } else if ("CodeType:CODE128".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_Code128)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_Code128); } else if ("CodeType:CODABAR".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_Codabar)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_Codabar); } else if ("CodeType:I2OF5".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_OTHER)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_OTHER); } else if ("CodeType:ID2OF5".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_OTHER)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_OTHER); } else if ("CodeType:MSI".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_OTHER)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_OTHER); } else if ("CodeType:UPCA".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_UPCA)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_UPCA); } else if ("CodeType:UPCE".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_UPCE)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_UPCE); } else if ("CodeType:EAN13".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_EAN13)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_EAN13); } else if ("CodeType:EAN8".equals(codeType)) { - barcodeIdMap.put(codeValue.toUpperCase(), new Integer(ScannerConst.SCAN_SDT_EAN8)); + barcodeIdMap.put(codeValue.toUpperCase(), ScannerConst.SCAN_SDT_EAN8); } } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |