You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/03/24 08:23:50 UTC
svn commit: r1084863 [3/11] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/data/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/src/org/of...
Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Thu Mar 24 07:23:42 2011
@@ -109,7 +109,7 @@ public class ProductionRunServices {
List<ProductionRun> mandatoryWorkEfforts = FastList.newInstance();
ProductionRunHelper.getLinkedProductionRuns(delegator, dispatcher, productionRunId, mandatoryWorkEfforts);
for (int i = 1; i < mandatoryWorkEfforts.size(); i++) {
- GenericValue mandatoryWorkEffort = ((ProductionRun)mandatoryWorkEfforts.get(i)).getGenericValue();
+ GenericValue mandatoryWorkEffort = (mandatoryWorkEfforts.get(i)).getGenericValue();
if (!(mandatoryWorkEffort.getString("currentStatusId").equals("PRUN_CANCELLED"))) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunStatusNotChangedMandatoryProductionRunFound", locale));
}
@@ -127,7 +127,7 @@ public class ProductionRunServices {
if (!UtilValidate.isEmpty(products)) {
Iterator<GenericValue> productsIt = products.iterator();
while (productsIt.hasNext()) {
- GenericValue product = (GenericValue)productsIt.next();
+ GenericValue product = productsIt.next();
product.set("statusId", "WEGS_CANCELLED");
product.store();
}
@@ -138,7 +138,7 @@ public class ProductionRunServices {
GenericValue oneTask = null;
String taskId = null;
for (int i = 0; i < tasks.size(); i++) {
- oneTask = (GenericValue)tasks.get(i);
+ oneTask = tasks.get(i);
taskId = oneTask.getString("workEffortId");
serviceContext.clear();
serviceContext.put("workEffortId", taskId);
@@ -152,7 +152,7 @@ public class ProductionRunServices {
if (!UtilValidate.isEmpty(components)) {
Iterator<GenericValue> componentsIt = components.iterator();
while (componentsIt.hasNext()) {
- GenericValue component = (GenericValue)componentsIt.next();
+ GenericValue component = componentsIt.next();
component.set("statusId", "WEGS_CANCELLED");
component.store();
}
@@ -308,7 +308,7 @@ public class ProductionRunServices {
Iterator<GenericValue> rt = routingTaskAssocs.iterator();
boolean first = true;
while (rt.hasNext()) {
- GenericValue routingTaskAssoc = (GenericValue) rt.next();
+ GenericValue routingTaskAssoc = rt.next();
if (EntityUtil.isValueActive(routingTaskAssoc, startDate)) {
GenericValue routingTask = null;
@@ -372,7 +372,7 @@ public class ProductionRunServices {
while (pb.hasNext()) {
// The components variable contains a list of BOMNodes:
// each node represents a product (component).
- BOMNode node = (BOMNode) pb.next();
+ BOMNode node = pb.next();
GenericValue productBom = node.getProductAssoc();
if ((productBom.getString("routingWorkEffortId") == null && first) || (productBom.getString("routingWorkEffortId") != null && productBom.getString("routingWorkEffortId").equals(routingTask.getString("workEffortId")))) {
serviceContext.clear();
@@ -435,7 +435,7 @@ public class ProductionRunServices {
if (workEffortPartyAssignments != null) {
Iterator<GenericValue> i = workEffortPartyAssignments.iterator();
while (i.hasNext()) {
- GenericValue workEffortPartyAssignment = (GenericValue) i.next();
+ GenericValue workEffortPartyAssignment = i.next();
Map<String, Object> partyToWorkEffort = UtilMisc.<String, Object>toMap(
"workEffortId", productionRunTaskId,
"partyId", workEffortPartyAssignment.getString("partyId"),
@@ -602,7 +602,7 @@ public class ProductionRunServices {
// change the production run tasks status to PRUN_SCHEDULED
Iterator<GenericValue> tasks = productionRun.getProductionRunRoutingTasks().iterator();
while (tasks.hasNext()) {
- GenericValue task = (GenericValue)tasks.next();
+ GenericValue task = tasks.next();
serviceContext.clear();
serviceContext.put("workEffortId", task.getString("workEffortId"));
serviceContext.put("currentStatusId", statusId);
@@ -636,7 +636,7 @@ public class ProductionRunServices {
// change the production run tasks status to PRUN_DOC_PRINTED
Iterator<GenericValue> tasks = productionRun.getProductionRunRoutingTasks().iterator();
while (tasks.hasNext()) {
- GenericValue task = (GenericValue)tasks.next();
+ GenericValue task = tasks.next();
serviceContext.clear();
serviceContext.put("workEffortId", task.getString("workEffortId"));
serviceContext.put("currentStatusId", "PRUN_DOC_PRINTED");
@@ -661,7 +661,7 @@ public class ProductionRunServices {
try {
List<GenericValue> mandatoryWorkEfforts = EntityUtil.filterByDate(delegator.findByAnd("WorkEffortAssoc", UtilMisc.toMap("workEffortIdTo", productionRunId, "workEffortAssocTypeId", "WORK_EFF_PRECEDENCY")));
for (int i = 0; i < mandatoryWorkEfforts.size(); i++) {
- GenericValue mandatoryWorkEffortAssoc = (GenericValue)mandatoryWorkEfforts.get(i);
+ GenericValue mandatoryWorkEffortAssoc = mandatoryWorkEfforts.get(i);
GenericValue mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort");
if (!(mandatoryWorkEffort.getString("currentStatusId").equals("PRUN_COMPLETED") ||
mandatoryWorkEffort.getString("currentStatusId").equals("PRUN_RUNNING") ||
@@ -728,7 +728,7 @@ public class ProductionRunServices {
// change the production run tasks status to PRUN_CLOSED
Iterator<GenericValue> tasks = productionRun.getProductionRunRoutingTasks().iterator();
while (tasks.hasNext()) {
- GenericValue task = (GenericValue)tasks.next();
+ GenericValue task = tasks.next();
serviceContext.clear();
serviceContext.put("workEffortId", task.getString("workEffortId"));
serviceContext.put("currentStatusId", "PRUN_CLOSED");
@@ -773,7 +773,7 @@ public class ProductionRunServices {
boolean allTaskCompleted = true;
boolean allPrecTaskCompletedOrRunning = true;
for (int i = 0; i < tasks.size(); i++) {
- oneTask = (GenericValue)tasks.get(i);
+ oneTask = tasks.get(i);
if (oneTask.getString("workEffortId").equals(taskId)) {
theTask = oneTask;
} else {
@@ -942,7 +942,7 @@ public class ProductionRunServices {
UtilMisc.toMap("productId", productionRun.getProductProduced().getString("productId")),
UtilMisc.toList("sequenceNum"));
for (int i = 0; i < productCostComponentCalcs.size(); i++) {
- GenericValue productCostComponentCalc = (GenericValue)productCostComponentCalcs.get(i);
+ GenericValue productCostComponentCalc = productCostComponentCalcs.get(i);
GenericValue costComponentCalc = productCostComponentCalc.getRelatedOne("CostComponentCalc");
GenericValue customMethod = costComponentCalc.getRelatedOne("CustomMethod");
if (customMethod == null) {
@@ -1002,7 +1002,7 @@ public class ProductionRunServices {
BigDecimal totalCost = ZERO;
BigDecimal totalCostNoMaterials = ZERO;
while (costComponentsIt.hasNext()) {
- GenericValue costComponent = (GenericValue)costComponentsIt.next();
+ GenericValue costComponent = costComponentsIt.next();
BigDecimal cost = costComponent.getBigDecimal("cost");
totalCost = totalCost.add(cost);
if (!"ACTUAL_MAT_COST".equals(costComponent.getString("costComponentTypeId"))) {
@@ -1034,7 +1034,7 @@ public class ProductionRunServices {
BigDecimal productionRunHeaderCost = (BigDecimal)outputMap.get("totalCost");
totalCost = totalCost.add(productionRunHeaderCost);
while (tasksIt.hasNext()) {
- GenericValue task = (GenericValue)tasksIt.next();
+ GenericValue task = tasksIt.next();
outputMap = dispatcher.runSync("getWorkEffortCosts",
UtilMisc.<String, Object>toMap("userLogin", userLogin, "workEffortId", task.getString("workEffortId")));
BigDecimal taskCost = (BigDecimal)outputMap.get("totalCost");
@@ -1087,7 +1087,7 @@ public class ProductionRunServices {
Iterator<GenericValue> workEffortCostCalcsIt = workEffortCostCalcs.iterator();
while (workEffortCostCalcsIt.hasNext()) {
- GenericValue workEffortCostCalc = (GenericValue)workEffortCostCalcsIt.next();
+ GenericValue workEffortCostCalc = workEffortCostCalcsIt.next();
GenericValue costComponentCalc = workEffortCostCalc.getRelatedOne("CostComponentCalc");
GenericValue customMethod = costComponentCalc.getRelatedOne("CustomMethod");
if (UtilValidate.isEmpty(customMethod) || UtilValidate.isEmpty(customMethod.getString("customMethodName"))) {
@@ -1168,7 +1168,7 @@ public class ProductionRunServices {
UtilMisc.toMap("workEffortId", productionRunTaskId)).iterator();
Map<String, BigDecimal> materialsCostByCurrency = FastMap.newInstance();
while (inventoryAssignIt.hasNext()) {
- GenericValue inventoryConsumed = (GenericValue)inventoryAssignIt.next();
+ GenericValue inventoryConsumed = inventoryAssignIt.next();
BigDecimal quantity = inventoryConsumed.getBigDecimal("quantity");
BigDecimal unitCost = inventoryConsumed.getBigDecimal("unitCost");
if (UtilValidate.isEmpty(unitCost) || UtilValidate.isEmpty(quantity)) {
@@ -1178,14 +1178,14 @@ public class ProductionRunServices {
if (!materialsCostByCurrency.containsKey(currencyUomId)) {
materialsCostByCurrency.put(currencyUomId, BigDecimal.ZERO);
}
- BigDecimal materialsCost = (BigDecimal)materialsCostByCurrency.get(currencyUomId);
+ BigDecimal materialsCost = materialsCostByCurrency.get(currencyUomId);
materialsCost = materialsCost.add(unitCost.multiply(quantity)).setScale(decimals, rounding);
materialsCostByCurrency.put(currencyUomId, materialsCost);
}
Iterator<String> currencyIt = materialsCostByCurrency.keySet().iterator();
while (currencyIt.hasNext()) {
- String currencyUomId = (String)currencyIt.next();
- BigDecimal materialsCost = (BigDecimal)materialsCostByCurrency.get(currencyUomId);
+ String currencyUomId = currencyIt.next();
+ BigDecimal materialsCost = materialsCostByCurrency.get(currencyUomId);
Map<String, Object> inMap = UtilMisc.<String, Object>toMap("userLogin", userLogin,
"workEffortId", productionRunTaskId);
inMap.put("costComponentTypeId", "ACTUAL_MAT_COST");
@@ -1241,7 +1241,7 @@ public class ProductionRunServices {
List<GenericValue> pRRoutingTasks = productionRun.getProductionRunRoutingTasks();
boolean first = true;
for (Iterator<GenericValue> iter = pRRoutingTasks.iterator(); iter.hasNext();) {
- GenericValue routingTask = (GenericValue) iter.next();
+ GenericValue routingTask = iter.next();
if (priority.equals(routingTask.get("priority")) && ! routingTaskId.equals(routingTask.get("workEffortId")))
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingRoutingTaskSeqIdAlreadyExist", locale));
if (routingTaskId.equals(routingTask.get("workEffortId"))) {
@@ -1309,7 +1309,7 @@ public class ProductionRunServices {
if (workEffortId != null) {
boolean found = false;
for (int i = 0; i < tasks.size(); i++) {
- GenericValue oneTask = (GenericValue)tasks.get(i);
+ GenericValue oneTask = tasks.get(i);
if (oneTask.getString("workEffortId").equals(workEffortId)) {
found = true;
break;
@@ -1379,7 +1379,7 @@ public class ProductionRunServices {
boolean found = false;
GenericValue theComponent = null;
for (int i = 0; i < components.size(); i++) {
- theComponent = (GenericValue)components.get(i);
+ theComponent = components.get(i);
if (theComponent.getString("productId").equals(productId)) {
if (workEffortId != null) {
if (theComponent.getString("workEffortId").equals(workEffortId)) {
@@ -1541,7 +1541,7 @@ public class ProductionRunServices {
if (workEffortPartyAssignments != null) {
Iterator<GenericValue> i = workEffortPartyAssignments.iterator();
while (i.hasNext()) {
- GenericValue workEffortPartyAssignment = (GenericValue) i.next();
+ GenericValue workEffortPartyAssignment = i.next();
Map<String, Object> partyToWorkEffort = UtilMisc.<String, Object>toMap(
"workEffortId", productionRunTaskId,
"partyId", workEffortPartyAssignment.getString("partyId"),
@@ -1811,7 +1811,7 @@ public class ProductionRunServices {
List<GenericValue> tasks = productionRun.getProductionRunRoutingTasks();
for (int i = 0; i < tasks.size(); i++) {
- GenericValue oneTask = (GenericValue)tasks.get(i);
+ GenericValue oneTask = tasks.get(i);
String taskId = oneTask.getString("workEffortId");
if ("PRUN_RUNNING".equals(oneTask.getString("currentStatusId"))) {
BigDecimal quantityDeclared = oneTask.getBigDecimal("quantityProduced");
@@ -1977,7 +1977,7 @@ public class ProductionRunServices {
UtilMisc.toMap("workEffortId", productionRunTaskId, "productId", productId))).iterator();
BigDecimal totalIssued = BigDecimal.ZERO;
while (issuances.hasNext()) {
- GenericValue issuance = (GenericValue)issuances.next();
+ GenericValue issuance = issuances.next();
BigDecimal issued = issuance.getBigDecimal("quantity");
if (issued != null) {
totalIssued = totalIssued.add(issued);
@@ -1987,7 +1987,7 @@ public class ProductionRunServices {
UtilMisc.toMap("workEffortId", productionRunTaskId, "productId", productId))).iterator();
BigDecimal totalReturned = BigDecimal.ZERO;
while (returns.hasNext()) {
- GenericValue returned = (GenericValue)returns.next();
+ GenericValue returned = returns.next();
GenericValue returnDetail = EntityUtil.getFirst(delegator.findByAnd("InventoryItemDetail", UtilMisc.toMap("inventoryItemId", returned.getString("inventoryItemId")), UtilMisc.toList("inventoryItemDetailSeqId")));
if (returnDetail != null) {
BigDecimal qtyReturned = returnDetail.getBigDecimal("quantityOnHandDiff");
@@ -2072,7 +2072,7 @@ public class ProductionRunServices {
GenericValue theTask = null;
GenericValue oneTask = null;
for (int i = 0; i < tasks.size(); i++) {
- oneTask = (GenericValue)tasks.get(i);
+ oneTask = tasks.get(i);
if (oneTask.getString("workEffortId").equals(workEffortId)) {
theTask = oneTask;
break;
@@ -2338,12 +2338,12 @@ public class ProductionRunServices {
Iterator<ConfigOption> options = config.getSelectedOptions().iterator();
Map<String, BigDecimal> components = FastMap.newInstance();
while (options.hasNext()) {
- ConfigOption co = (ConfigOption)options.next();
+ ConfigOption co = options.next();
//components.addAll(co.getComponents());
Iterator<GenericValue> selComponents = co.getComponents().iterator();
while (selComponents.hasNext()) {
BigDecimal componentQuantity = null;
- GenericValue selComponent = (GenericValue)selComponents.next();
+ GenericValue selComponent = selComponents.next();
if (selComponent.get("quantity") != null) {
componentQuantity = selComponent.getBigDecimal("quantity");
}
@@ -2354,12 +2354,12 @@ public class ProductionRunServices {
if (co.isVirtualComponent(selComponent)) {
Map<String, String> componentOptions = co.getComponentOptions();
if (UtilValidate.isNotEmpty(componentOptions) && UtilValidate.isNotEmpty(componentOptions.get(componentProductId))) {
- componentProductId = (String)componentOptions.get(componentProductId);
+ componentProductId = componentOptions.get(componentProductId);
}
}
componentQuantity = quantity.multiply(componentQuantity);
if (components.containsKey(componentProductId)) {
- BigDecimal totalQuantity = (BigDecimal)components.get(componentProductId);
+ BigDecimal totalQuantity = components.get(componentProductId);
componentQuantity = totalQuantity.add(componentQuantity);
}
@@ -2616,7 +2616,7 @@ public class ProductionRunServices {
}
List<String> productionRuns = FastList.newInstance();
for (int i = 0; i < orderItems.size(); i++) {
- GenericValue orderItemOrShipGroupAssoc = (GenericValue)orderItems.get(i);
+ GenericValue orderItemOrShipGroupAssoc = orderItems.get(i);
String productId = null;
BigDecimal amount = null;
GenericValue orderItem = null;
@@ -2782,7 +2782,7 @@ public class ProductionRunServices {
GenericValue oneTask = null;
String taskId = null;
for (int i = 0; i < tasks.size(); i++) {
- oneTask = (GenericValue)tasks.get(i);
+ oneTask = tasks.get(i);
taskId = oneTask.getString("workEffortId");
try {
Map<String, Object> serviceContext = FastMap.newInstance();
@@ -2815,7 +2815,7 @@ public class ProductionRunServices {
GenericValue oneTask = null;
String taskId = null;
for (int i = 0; i < tasks.size(); i++) {
- oneTask = (GenericValue)tasks.get(i);
+ oneTask = tasks.get(i);
taskId = oneTask.getString("workEffortId");
if ("PRUN_CREATED".equals(oneTask.getString("currentStatusId")) ||
"PRUN_SCHEDULED".equals(oneTask.getString("currentStatusId")) ||
@@ -2940,7 +2940,7 @@ public class ProductionRunServices {
UtilMisc.toList("-estimatedStartDate"), null, false);
if (outgoingProductionRuns != null) {
for (int i = 0; i < outgoingProductionRuns.size(); i++) {
- GenericValue outgoingProductionRun = (GenericValue)outgoingProductionRuns.get(i);
+ GenericValue outgoingProductionRun = outgoingProductionRuns.get(i);
BigDecimal qty = outgoingProductionRun.getBigDecimal("estimatedQuantity");
qty = qty != null ? qty : BigDecimal.ZERO;
totQty = totQty.add(qty);
@@ -3115,7 +3115,7 @@ public class ProductionRunServices {
"statusId", "WEGS_CREATED", "workEffortTypeId", "PROD_ORDER_HEADER"));
Iterator<GenericValue> iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- GenericValue genericResult = (GenericValue) iteratorResult.next();
+ GenericValue genericResult = iteratorResult.next();
if ("PRUN_CLOSED".equals(genericResult.getString("currentStatusId")) ||
"PRUN_CREATED".equals(genericResult.getString("currentStatusId"))) {
continue;
@@ -3160,7 +3160,7 @@ public class ProductionRunServices {
String orderId = null;
GenericValue orderDeliverySchedule = null;
while (iteratorResult.hasNext()) {
- GenericValue genericResult = (GenericValue) iteratorResult.next();
+ GenericValue genericResult = iteratorResult.next();
String newOrderId = genericResult.getString("orderId");
if (!newOrderId.equals(orderId)) {
orderDeliverySchedule = null;
@@ -3213,7 +3213,7 @@ public class ProductionRunServices {
UtilMisc.toList("shipBeforeDate"), null, false);
Iterator<GenericValue> backordersIt = backorders.iterator();
while (backordersIt.hasNext()) {
- GenericValue genericResult = (GenericValue) backordersIt.next();
+ GenericValue genericResult = backordersIt.next();
String productId = genericResult.getString("productId");
GenericValue orderItemShipGroup = delegator.findByPrimaryKey("OrderItemShipGroup", UtilMisc.toMap("orderId", genericResult.get("orderId"),
"shipGroupSeqId", genericResult.get("shipGroupSeqId")));
@@ -3233,7 +3233,7 @@ public class ProductionRunServices {
// iterate and 'reserve'
Iterator<Timestamp> subsetMapKeysIt = subsetMap.keySet().iterator();
while (subsetMapKeysIt.hasNext()) {
- Timestamp currentDate = (Timestamp)subsetMapKeysIt.next();
+ Timestamp currentDate = subsetMapKeysIt.next();
Map<String, Object> currentDateMap = UtilGenerics.checkMap(subsetMap.get(currentDate));
//List reservations = (List)currentDateMap.get("reservations");
BigDecimal remainingQty = (BigDecimal)currentDateMap.get("remainingQty");
Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Thu Mar 24 07:23:42 2011
@@ -105,7 +105,7 @@ public class MrpServices {
try {
Iterator<GenericValue> listResultIt = listResult.iterator();
while (listResultIt.hasNext()) {
- GenericValue tmpRequirement = (GenericValue)listResultIt.next();
+ GenericValue tmpRequirement = listResultIt.next();
listResultRoles.addAll(tmpRequirement.getRelated("RequirementRole"));
//int numOfRecordsRemoved = delegator.removeRelated("RequirementRole", tmpRequirement);
}
@@ -159,7 +159,7 @@ public class MrpServices {
}
iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- genericResult = (GenericValue) iteratorResult.next();
+ genericResult = iteratorResult.next();
String productId = genericResult.getString("productId");
BigDecimal reservedQuantity = genericResult.getBigDecimal("reservedQuantity");
BigDecimal shipGroupQuantity = genericResult.getBigDecimal("quantity");
@@ -221,7 +221,7 @@ public class MrpServices {
}
iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- genericResult = (GenericValue) iteratorResult.next();
+ genericResult = iteratorResult.next();
String productId = genericResult.getString("productId");
BigDecimal eventQuantityTmp = genericResult.getBigDecimal("quantity");
if (productId == null || eventQuantityTmp == null) {
@@ -261,7 +261,7 @@ public class MrpServices {
}
iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- genericResult = (GenericValue) iteratorResult.next();
+ genericResult = iteratorResult.next();
String newOrderId = genericResult.getString("orderId");
if (!newOrderId.equals(orderId)) {
orderDeliverySchedule = null;
@@ -328,7 +328,7 @@ public class MrpServices {
resultList = delegator.findByAnd("WorkEffortAndGoods", parameters);
iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- genericResult = (GenericValue) iteratorResult.next();
+ genericResult = iteratorResult.next();
if ("PRUN_CLOSED".equals(genericResult.getString("currentStatusId")) ||
"PRUN_COMPLETED".equals(genericResult.getString("currentStatusId")) ||
"PRUN_CANCELLED".equals(genericResult.getString("currentStatusId"))) {
@@ -366,7 +366,7 @@ public class MrpServices {
resultList = delegator.findByAnd("WorkEffortAndGoods", parameters);
iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- genericResult = (GenericValue) iteratorResult.next();
+ genericResult = iteratorResult.next();
if ("PRUN_CLOSED".equals(genericResult.getString("currentStatusId")) ||
"PRUN_COMPLETED".equals(genericResult.getString("currentStatusId")) ||
"PRUN_CANCELLED".equals(genericResult.getString("currentStatusId"))) {
@@ -412,7 +412,7 @@ public class MrpServices {
}
iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- genericResult = (GenericValue) iteratorResult.next();
+ genericResult = iteratorResult.next();
String productId = genericResult.getString("productId");
BigDecimal minimumStock = genericResult.getBigDecimal("minimumStock");
if (minimumStock == null) {
@@ -459,7 +459,7 @@ public class MrpServices {
}
iteratorResult = resultList.iterator();
while (iteratorResult.hasNext()) {
- genericResult = (GenericValue) iteratorResult.next();
+ genericResult = iteratorResult.next();
String customTimePeriodId = genericResult.getString("customTimePeriodId");
GenericValue customTimePeriod = null;
try {
@@ -480,7 +480,7 @@ public class MrpServices {
}
sfdIter = salesForecastDetails.iterator();
while (sfdIter.hasNext()) {
- genericResult = (GenericValue) sfdIter.next();
+ genericResult = sfdIter.next();
String productId = genericResult.getString("productId");
BigDecimal eventQuantityTmp = genericResult.getBigDecimal("quantity");
if (productId == null || eventQuantityTmp == null) {
@@ -566,7 +566,7 @@ public class MrpServices {
if (UtilValidate.isNotEmpty(listComponent)) {
Iterator<BOMNode> listComponentIter = listComponent.iterator();
while (listComponentIter.hasNext()) {
- BOMNode node = (BOMNode) listComponentIter.next();
+ BOMNode node = listComponentIter.next();
GenericValue productComponent = node.getProductAssoc();
// read the startDate for the component
String routingTask = node.getProductAssoc().getString("routingWorkEffortId");
@@ -631,7 +631,7 @@ public class MrpServices {
}
Iterator<GenericValue> facilitiesIt = facilities.iterator();
while (facilitiesIt.hasNext()) {
- GenericValue facilityMember = (GenericValue)facilitiesIt.next();
+ GenericValue facilityMember = facilitiesIt.next();
GenericValue facility = facilityMember.getRelatedOne("Facility");
if ("WAREHOUSE".equals(facility.getString("facilityTypeId")) && UtilValidate.isEmpty(facilityId)) {
facilityId = facility.getString("facilityId");
@@ -707,7 +707,7 @@ public class MrpServices {
oldProductId = "";
while (iteratorListInventoryEventForMRP.hasNext()) {
- inventoryEventForMRP = (GenericValue) iteratorListInventoryEventForMRP.next();
+ inventoryEventForMRP = iteratorListInventoryEventForMRP.next();
productId = inventoryEventForMRP.getString("productId");
eventQuantity = inventoryEventForMRP.getBigDecimal("quantity");
@@ -752,7 +752,7 @@ public class MrpServices {
}
components = UtilGenerics.checkList(serviceResponse.get("components"));
if (UtilValidate.isNotEmpty(components)) {
- BOMNode node = ((BOMNode)components.get(0)).getParentNode();
+ BOMNode node = (components.get(0)).getParentNode();
isBuilt = node.isManufactured();
} else {
isBuilt = false;
@@ -794,7 +794,7 @@ public class MrpServices {
routing = null;
}
if (UtilValidate.isNotEmpty(components)) {
- BOMNode node = ((BOMNode)components.get(0)).getParentNode();
+ BOMNode node = (components.get(0)).getParentNode();
isBuilt = node.isManufactured();
} else {
isBuilt = false;
Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/ProposedOrder.java Thu Mar 24 07:23:42 2011
@@ -151,7 +151,7 @@ public class ProposedOrder {
}
if (listRoutingTaskAssoc != null) {
for (int i = 1; i <= listRoutingTaskAssoc.size(); i++) {
- GenericValue routingTaskAssoc = (GenericValue) listRoutingTaskAssoc.get(listRoutingTaskAssoc.size() - i);
+ GenericValue routingTaskAssoc = listRoutingTaskAssoc.get(listRoutingTaskAssoc.size() - i);
if (EntityUtil.isValueActive(routingTaskAssoc, endDate)) {
GenericValue routingTask = null;
try {
Modified: ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/manufacturing/src/org/ofbiz/manufacturing/techdata/TechDataServices.java Thu Mar 24 07:23:42 2011
@@ -134,7 +134,7 @@ public class TechDataServices {
if (listRoutingTaskAssoc != null) {
Iterator<GenericValue> i = listRoutingTaskAssoc.iterator();
while (i.hasNext()) {
- GenericValue routingTaskAssoc = (GenericValue) i.next();
+ GenericValue routingTaskAssoc = i.next();
if (! workEffortIdFrom.equals(routingTaskAssoc.getString("workEffortIdFrom")) ||
! workEffortIdTo.equals(routingTaskAssoc.getString("workEffortIdTo")) ||
! workEffortAssocTypeId.equals(routingTaskAssoc.getString("workEffortAssocTypeId")) ||
Modified: ofbiz/branches/jackrabbit20100709/applications/marketing/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/marketing/ofbiz-component.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/marketing/ofbiz-component.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/marketing/ofbiz-component.xml Thu Mar 24 07:23:42 2011
@@ -31,7 +31,7 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/MarketingHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SfaPortletData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/sfaDemoData.xml"/>
- <entity-resource type="data" reader-name="demo" loader="main" location="testdef/SeleniumTests.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/MarketingDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_opportunity.xml"/>
<service-resource type="eca" loader="main" location="servicedef/secas.xml"/>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/config/OrderUiLabels.xml Thu Mar 24 07:23:42 2011
@@ -2680,6 +2680,18 @@
<value xml:lang="zh_CN">为æ¥ä»·å»ºç«è¯·æ±</value>
<value xml:lang="zh_TW">çºå ±å¹å»ºç«è¦æ±</value>
</property>
+ <property key="OrderCreated">
+ <value xml:lang="de">Erstellt</value>
+ <value xml:lang="en">Created</value>
+ <value xml:lang="es">Creado</value>
+ <value xml:lang="fr">Création</value>
+ <value xml:lang="it">Creato</value>
+ <value xml:lang="nl">Aangemaakt op</value>
+ <value xml:lang="ro">Creat</value>
+ <value xml:lang="ru">Создано</value>
+ <value xml:lang="th">สรà¹à¸²à¸</value>
+ <value xml:lang="zh">å·²å建</value>
+ </property>
<property key="OrderCreateExchangeOrder">
<value xml:lang="en">Create Exchange Order</value>
<value xml:lang="it">Creare ordine di cambio</value>
Modified: ofbiz/branches/jackrabbit20100709/applications/order/email/default/emailprocessnotify.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/email/default/emailprocessnotify.ftl?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/email/default/emailprocessnotify.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/email/default/emailprocessnotify.ftl Thu Mar 24 07:23:42 2011
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 24 07:23:42 2011
@@ -2,3 +2,4 @@
/ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957
/ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1084618
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderContentWrapper.java Thu Mar 24 07:23:42 2011
@@ -103,7 +103,7 @@ public class OrderContentWrapper {
String cacheKey = orderContentTypeId + SEPARATOR + locale + SEPARATOR + mimeTypeId + SEPARATOR + order.get("orderId") + SEPARATOR + orderItemSeqId;
try {
if (orderContentCache != null && orderContentCache.get(cacheKey) != null) {
- return (String) orderContentCache.get(cacheKey);
+ return orderContentCache.get(cacheKey);
}
Writer outWriter = new StringWriter();
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderEvents.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderEvents.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderEvents.java Thu Mar 24 07:23:42 2011
@@ -67,7 +67,7 @@ public class OrderEvents {
return "error";
}
- GenericValue orderRoleAndProductContentInfo = (GenericValue) orderRoleAndProductContentInfoList.get(0);
+ GenericValue orderRoleAndProductContentInfo = orderRoleAndProductContentInfoList.get(0);
// TODO: check validity based on ProductContent fields: useCountLimit, useTime/useTimeUomId
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderListState.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderListState.java Thu Mar 24 07:23:42 2011
@@ -203,6 +203,9 @@ public class OrderListState {
public Map<String, String> getOrderTypeState() { return orderTypeState; }
public Map<String, String> getorderFilterState() { return orderFilterState; }
+ public void setStatus(String param, boolean b) { orderStatusState.put(param, (b ? "Y" : "N")); }
+ public void setType(String param, boolean b) { orderTypeState.put(param, (b ? "Y" : "N")); }
+
public boolean hasStatus(String param) { return ("Y".equals(orderStatusState.get(param))); }
public boolean hasType(String param) { return ("Y".equals(orderTypeState.get(param))); }
public boolean hasFilter(String param) { return ("Y".equals(orderFilterState.get(param))); }
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Thu Mar 24 07:23:42 2011
@@ -2936,6 +2936,10 @@ public class OrderReadHelper {
return result;
}
+ public static Map<String, Object> getOrderItemTaxByTaxAuthGeoAndPartyForDisplay(GenericValue orderItem, List<GenericValue> orderAdjustmentsOriginal) {
+ return getOrderTaxByTaxAuthGeoAndPartyForDisplay(getOrderItemAdjustmentList(orderItem, orderAdjustmentsOriginal));
+ }
+
public static Map<String, Object> getOrderTaxByTaxAuthGeoAndPartyForDisplay(List<GenericValue> orderAdjustmentsOriginal) {
BigDecimal taxGrandTotal = BigDecimal.ZERO;
List<Map<String, Object>> taxByTaxAuthGeoAndPartyList = FastList.newInstance();
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Thu Mar 24 07:23:42 2011
@@ -1323,7 +1323,7 @@ public class OrderReturnServices {
// See how much we can refund to the payment method
BigDecimal orderPayPrefReceivedTotal = ZERO;
if (receivedPaymentTotalsByPaymentMethod.containsKey(orderPayPrefKey)) {
- orderPayPrefReceivedTotal = orderPayPrefReceivedTotal.add((BigDecimal)receivedPaymentTotalsByPaymentMethod.get(orderPayPrefKey)).setScale(decimals, rounding);
+ orderPayPrefReceivedTotal = orderPayPrefReceivedTotal.add(receivedPaymentTotalsByPaymentMethod.get(orderPayPrefKey)).setScale(decimals, rounding);
}
if (receivedPaymentTotalsByBillingAccount != null) {
@@ -1331,7 +1331,7 @@ public class OrderReturnServices {
}
BigDecimal orderPayPrefRefundedTotal = ZERO;
if (refundedTotalsByPaymentMethod.containsKey(orderPayPrefKey)) {
- orderPayPrefRefundedTotal = orderPayPrefRefundedTotal.add((BigDecimal)refundedTotalsByPaymentMethod.get(orderPayPrefKey)).setScale(decimals, rounding);
+ orderPayPrefRefundedTotal = orderPayPrefRefundedTotal.add(refundedTotalsByPaymentMethod.get(orderPayPrefKey)).setScale(decimals, rounding);
}
BigDecimal orderPayPrefAvailableTotal = orderPayPrefReceivedTotal.subtract(orderPayPrefRefundedTotal);
@@ -1680,9 +1680,9 @@ public class OrderReturnServices {
// now allocate responseAmount * invoiceTotal / grandTotal to each invoice
for (Iterator<GenericValue> iter = returnInvoices.values().iterator(); iter.hasNext();) {
- GenericValue invoice = (GenericValue) iter.next();
+ GenericValue invoice = iter.next();
String invoiceId = invoice.getString("invoiceId");
- BigDecimal invoiceTotal = (BigDecimal) invoiceTotals.get(invoiceId);
+ BigDecimal invoiceTotal = invoiceTotals.get(invoiceId);
BigDecimal amountApplied = responseAmount.multiply(invoiceTotal).divide(grandTotal, decimals, rounding).setScale(decimals, rounding);
@@ -1832,7 +1832,7 @@ public class OrderReturnServices {
Iterator<GenericValue> returnItemIter = returnItemList.iterator();
int itemCount = 1;
while (returnItemIter.hasNext()) {
- GenericValue returnItem = (GenericValue) returnItemIter.next();
+ GenericValue returnItem = returnItemIter.next();
GenericValue orderItem = null;
GenericValue product = null;
try {
@@ -2409,7 +2409,7 @@ public class OrderReturnServices {
Iterator<String> orderIterator = returnAmountByOrder.keySet().iterator();
while (orderIterator.hasNext()) {
String orderId = orderIterator.next();
- BigDecimal returnAmount = (BigDecimal) returnAmountByOrder.get(orderId);
+ BigDecimal returnAmount = returnAmountByOrder.get(orderId);
if (returnAmount.abs().compareTo(new BigDecimal("0.000001")) < 0) {
Debug.logError("Order [" + orderId + "] refund amount[ " + returnAmount + "] less than zero", module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java Thu Mar 24 07:23:42 2011
@@ -1407,7 +1407,7 @@ public class OrderServices {
if (eli != null) {
// reset each order
GenericValue orderHeader = null;
- while ((orderHeader = (GenericValue) eli.next()) != null) {
+ while ((orderHeader = eli.next()) != null) {
String orderId = orderHeader.getString("orderId");
Map<String, Object> resetResult = null;
try {
@@ -1523,7 +1523,7 @@ public class OrderServices {
// build up the list of tax calc service parameters
for (int i = 0; i < validOrderItems.size(); i++) {
- GenericValue orderItem = (GenericValue) validOrderItems.get(i);
+ GenericValue orderItem = validOrderItems.get(i);
String productId = orderItem.getString("productId");
try {
products.add(i, delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId))); // get the product entity
@@ -1997,10 +1997,10 @@ public class OrderServices {
String reasonEnumId = null;
String changeComments = null;
if (UtilValidate.isNotEmpty(itemReasonMap)) {
- reasonEnumId = (String) itemReasonMap.get(orderItem.getString("orderItemSeqId"));
+ reasonEnumId = itemReasonMap.get(orderItem.getString("orderItemSeqId"));
}
if (UtilValidate.isNotEmpty(itemCommentMap)) {
- changeComments = (String) itemCommentMap.get(orderItem.getString("orderItemSeqId"));
+ changeComments = itemCommentMap.get(orderItem.getString("orderItemSeqId"));
}
Map<String, Object> serviceCtx = FastMap.newInstance();
@@ -3558,7 +3558,7 @@ public class OrderServices {
Iterator<String> i = itemQtyMap.keySet().iterator();
while (i.hasNext()) {
String key = i.next();
- String quantityStr = (String) itemQtyMap.get(key);
+ String quantityStr = itemQtyMap.get(key);
BigDecimal groupQty = BigDecimal.ZERO;
try {
groupQty = new BigDecimal(quantityStr);
@@ -3573,7 +3573,7 @@ public class OrderServices {
}
String[] itemInfo = key.split(":");
- BigDecimal tally = (BigDecimal) itemTotals.get(itemInfo[0]);
+ BigDecimal tally = itemTotals.get(itemInfo[0]);
if (tally == null) {
tally = groupQty;
} else {
@@ -3589,7 +3589,7 @@ public class OrderServices {
ShoppingCartItem cartItem = cart.findCartItem(itemSeqId);
if (cartItem != null) {
- BigDecimal qty = (BigDecimal) itemTotals.get(itemSeqId);
+ BigDecimal qty = itemTotals.get(itemSeqId);
BigDecimal priceSave = cartItem.getBasePrice();
// set quantity
@@ -3605,7 +3605,7 @@ public class OrderServices {
cartItem.setBasePrice(priceSave);
if (overridePriceMap.containsKey(itemSeqId)) {
- String priceStr = (String) itemPriceMap.get(itemSeqId);
+ String priceStr = itemPriceMap.get(itemSeqId);
if (UtilValidate.isNotEmpty(priceStr)) {
BigDecimal price = new BigDecimal("-1");
price = new BigDecimal(priceStr).setScale(orderDecimals, orderRounding);
@@ -3618,7 +3618,7 @@ public class OrderServices {
// Update the item description
if (itemDescriptionMap != null && itemDescriptionMap.containsKey(itemSeqId)) {
- String description = (String) itemDescriptionMap.get(itemSeqId);
+ String description = itemDescriptionMap.get(itemSeqId);
if (UtilValidate.isNotEmpty(description)) {
cartItem.setName(description);
Debug.log("Set item description: [" + itemSeqId + "] " + description, module);
@@ -3632,7 +3632,7 @@ public class OrderServices {
if (itemAttributesMap != null) {
String attrValue = null;
for (String attrName : attributeNames) {
- attrValue = (String) itemAttributesMap.get(attrName + ":" + itemSeqId);
+ attrValue = itemAttributesMap.get(attrName + ":" + itemSeqId);
if (UtilValidate.isNotEmpty(attrName)) {
cartItem.setOrderItemAttribute(attrName, attrValue);
Debug.log("Set item attribute Name: [" + itemSeqId + "] " + attrName + " , Value:" + attrValue, module);
@@ -3671,7 +3671,7 @@ public class OrderServices {
Iterator<String> gai = itemQtyMap.keySet().iterator();
while (gai.hasNext()) {
String key = gai.next();
- String quantityStr = (String) itemQtyMap.get(key);
+ String quantityStr = itemQtyMap.get(key);
BigDecimal groupQty = BigDecimal.ZERO;
try {
groupQty = new BigDecimal(quantityStr);
@@ -3996,7 +3996,7 @@ public class OrderServices {
for (long itr = 1; itr <= groupIndex; itr++) {
shipGroupSeqId = UtilFormatOut.formatPaddedNumber(itr, 5);
List<GenericValue> removeList = new ArrayList<GenericValue>();
- for (GenericValue stored: (List<GenericValue>)toStore) {
+ for (GenericValue stored: toStore) {
if ("OrderAdjustment".equals(stored.getEntityName())) {
if (("SHIPPING_CHARGES".equals(stored.get("orderAdjustmentTypeId")) ||
"SALES_TAX".equals(stored.get("orderAdjustmentTypeId"))) &&
@@ -4013,7 +4013,7 @@ public class OrderServices {
}
toStore.removeAll(removeList);
}
- for (GenericValue toAdd: (List<GenericValue>)toAddList) {
+ for (GenericValue toAdd: toAddList) {
if ("OrderAdjustment".equals(toAdd.getEntityName())) {
if (toAdd.get("comments") != null && ((String)toAdd.get("comments")).startsWith("Added manually by") && (("PROMOTION_ADJUSTMENT".equals(toAdd.get("orderAdjustmentTypeId"))) ||
("SHIPPING_CHARGES".equals(toAdd.get("orderAdjustmentTypeId"))) || ("SALES_TAX".equals(toAdd.get("orderAdjustmentTypeId"))))) {
@@ -4189,7 +4189,9 @@ public class OrderServices {
}
}
}
- Debug.log("To Store Contains: " + toStore, module);
+
+ if (Debug.verboseOn())
+ Debug.logVerbose("To Store Contains: " + toStore, module);
// remove any order item attributes that were set to empty
try {
@@ -5394,7 +5396,7 @@ public class OrderServices {
if (eli != null) {
GenericValue subscription;
- while (((subscription = (GenericValue) eli.next()) != null)) {
+ while (((subscription = eli.next()) != null)) {
Calendar endDate = Calendar.getInstance();
endDate.setTime(UtilDateTime.nowTimestamp());
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/quote/QuoteServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/quote/QuoteServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/quote/QuoteServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/quote/QuoteServices.java Thu Mar 24 07:23:42 2011
@@ -194,7 +194,7 @@ public class QuoteServices {
if (UtilValidate.isNotEmpty(quoteItems)) {
Iterator<GenericValue> quoteIt = quoteItems.iterator();
while (quoteIt.hasNext()) {
- GenericValue quoteItem = (GenericValue)quoteIt.next();
+ GenericValue quoteItem = quoteIt.next();
quoteItem.set("quoteId", quoteId);
Map<String, Object> quoteItemIn = quoteItem.getAllFields();
quoteItemIn.put("userLogin", userLogin);
@@ -207,7 +207,7 @@ public class QuoteServices {
if (UtilValidate.isNotEmpty(quoteAttributes)) {
Iterator<GenericValue> quoteAttrIt = quoteAttributes.iterator();
while (quoteAttrIt.hasNext()) {
- GenericValue quoteAttr = (GenericValue)quoteAttrIt.next();
+ GenericValue quoteAttr = quoteAttrIt.next();
quoteAttr.set("quoteId", quoteId);
Map<String, Object> quoteAttrIn = quoteAttr.getAllFields();
quoteAttrIn.put("userLogin", userLogin);
@@ -220,7 +220,7 @@ public class QuoteServices {
if (UtilValidate.isNotEmpty(quoteCoefficients)) {
Iterator<GenericValue> quoteCoefficientIt = quoteCoefficients.iterator();
while (quoteCoefficientIt.hasNext()) {
- GenericValue quoteCoefficient = (GenericValue)quoteCoefficientIt.next();
+ GenericValue quoteCoefficient = quoteCoefficientIt.next();
quoteCoefficient.set("quoteId", quoteId);
Map<String, Object> quoteCoefficientIn = quoteCoefficient.getAllFields();
quoteCoefficientIn.put("userLogin", userLogin);
@@ -233,7 +233,7 @@ public class QuoteServices {
if (UtilValidate.isNotEmpty(quoteRoles)) {
Iterator<GenericValue> quoteRoleIt = quoteRoles.iterator();
while (quoteRoleIt.hasNext()) {
- GenericValue quoteRole = (GenericValue)quoteRoleIt.next();
+ GenericValue quoteRole = quoteRoleIt.next();
quoteRole.set("quoteId", quoteId);
Map<String, Object> quoteRoleIn = quoteRole.getAllFields();
quoteRoleIn.put("userLogin", userLogin);
@@ -246,7 +246,7 @@ public class QuoteServices {
if (UtilValidate.isNotEmpty(quoteWorkEfforts)) {
Iterator<GenericValue> quoteWorkEffortIt = quoteWorkEfforts.iterator();
while (quoteWorkEffortIt.hasNext()) {
- GenericValue quoteWorkEffort = (GenericValue)quoteWorkEffortIt.next();
+ GenericValue quoteWorkEffort = quoteWorkEffortIt.next();
quoteWorkEffort.set("quoteId", quoteId);
Map<String, Object> quoteWorkEffortIn = quoteWorkEffort.getAllFields();
quoteWorkEffortIn.put("userLogin", userLogin);
@@ -259,7 +259,7 @@ public class QuoteServices {
if (UtilValidate.isNotEmpty(quoteAdjustments)) {
Iterator<GenericValue> quoteAdjustmentIt = quoteAdjustments.iterator();
while (quoteAdjustmentIt.hasNext()) {
- GenericValue quoteAdjustment = (GenericValue)quoteAdjustmentIt.next();
+ GenericValue quoteAdjustment = quoteAdjustmentIt.next();
quoteAdjustment.set("quoteId", quoteId);
Map<String, Object> quoteAdjustmentIn = quoteAdjustment.getAllFields();
quoteAdjustmentIn.put("userLogin", userLogin);
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java Thu Mar 24 07:23:42 2011
@@ -101,7 +101,7 @@ public class RequirementServices {
List<Map<String, Object>> requirements = FastList.newInstance();
for (Iterator<GenericValue> iter = requirementAndRoles.iterator(); iter.hasNext();) {
Map<String, Object> union = FastMap.newInstance();
- GenericValue requirement = (GenericValue) iter.next();
+ GenericValue requirement = iter.next();
String productId = requirement.getString("productId");
partyId = requirement.getString("partyId");
String facilityId = requirement.getString("facilityId");
@@ -132,7 +132,7 @@ public class RequirementServices {
}
// for good identification, get the UPCA type (UPC code)
- GenericValue gid = (GenericValue) gids.get(productId);
+ GenericValue gid = gids.get(productId);
if (gid == null) {
gid = delegator.findByPrimaryKey("GoodIdentification", UtilMisc.toMap("goodIdentificationTypeId", "UPCA", "productId", requirement.get("productId")));
gids.put(productId, gid);
@@ -157,7 +157,7 @@ public class RequirementServices {
}
// how many of the products were sold (note this is for a fixed time period across all product stores)
- BigDecimal sold = (BigDecimal) productsSold.get(productId);
+ BigDecimal sold = productsSold.get(productId);
if (sold == null) {
EntityCondition prodConditions = EntityCondition.makeCondition(UtilMisc.toList(
EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId),
@@ -214,7 +214,7 @@ public class RequirementServices {
String facilityId = productStore.getString("inventoryFacilityId");
List<GenericValue> orderItems = order.getRelated("OrderItem");
for (Iterator<GenericValue> iter = orderItems.iterator(); iter.hasNext();) {
- GenericValue item = (GenericValue) iter.next();
+ GenericValue item = iter.next();
GenericValue product = item.getRelatedOne("Product");
if (product == null) continue;
if ((!"PRODRQM_AUTO".equals(product.get("requirementMethodEnumId")) &&
@@ -270,7 +270,7 @@ public class RequirementServices {
String facilityId = productStore.getString("inventoryFacilityId");
List<GenericValue> orderItems = order.getRelated("OrderItem");
for (Iterator<GenericValue> iter = orderItems.iterator(); iter.hasNext();) {
- GenericValue item = (GenericValue) iter.next();
+ GenericValue item = iter.next();
GenericValue product = item.getRelatedOne("Product");
if (product == null) continue;
@@ -305,7 +305,7 @@ public class RequirementServices {
EntityOperator.AND);
List<GenericValue> requirements = delegator.findList("Requirement", ecl, null, null, null, false);
for (Iterator<GenericValue> riter = requirements.iterator(); riter.hasNext();) {
- GenericValue requirement = (GenericValue) riter.next();
+ GenericValue requirement = riter.next();
pendingRequirements = pendingRequirements.add(requirement.get("quantity") == null ? BigDecimal.ZERO : requirement.getBigDecimal("quantity"));
}
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Thu Mar 24 07:23:42 2011
@@ -454,7 +454,7 @@ public class ShoppingCart implements Ite
Map<String, Object> result = dispatcher.runSync("getSuppliersForProduct", params);
List<GenericValue> productSuppliers = UtilGenerics.checkList(result.get("supplierProducts"));
if ((productSuppliers != null) && (productSuppliers.size() > 0)) {
- supplierProduct = (GenericValue) productSuppliers.get(0);
+ supplierProduct = productSuppliers.get(0);
}
//} catch (GenericServiceException e) {
} catch (Exception e) {
@@ -941,7 +941,7 @@ public class ShoppingCart implements Ite
public ShoppingCart.ShoppingCartItemGroup getItemGroupByNumber(String groupNumber) {
if (UtilValidate.isEmpty(groupNumber)) return null;
- return (ShoppingCart.ShoppingCartItemGroup) this.itemGroupByNumberMap.get(groupNumber);
+ return this.itemGroupByNumberMap.get(groupNumber);
}
/** Creates a new Item Group and returns the groupNumber that represents it */
@@ -1577,7 +1577,7 @@ public class ShoppingCart implements Ite
CartPaymentInfo thisInf = this.makePaymentInfo(id, refNum, authCode, amount);
Iterator<CartPaymentInfo> i = paymentInfo.iterator();
while (i.hasNext()) {
- CartPaymentInfo inf = (CartPaymentInfo) i.next();
+ CartPaymentInfo inf = i.next();
if (inf.compareTo(thisInf) == 0) {
// update the info
if (update) {
@@ -1711,7 +1711,7 @@ public class ShoppingCart implements Ite
public void clearPaymentMethodsById(List<String> paymentMethodIdsToRemove) {
if (UtilValidate.isEmpty(paymentMethodIdsToRemove)) return;
for (Iterator<CartPaymentInfo> iter = paymentInfo.iterator(); iter.hasNext();) {
- CartPaymentInfo info = (CartPaymentInfo) iter.next();
+ CartPaymentInfo info = iter.next();
if (paymentMethodIdsToRemove.contains(info.paymentMethodId)) {
iter.remove();
}
@@ -2036,7 +2036,7 @@ public class ShoppingCart implements Ite
shipInfo.add(csi);
}
- return (CartShipInfo) shipInfo.get(idx);
+ return shipInfo.get(idx);
}
public int getShipGroupSize() {
@@ -2515,7 +2515,7 @@ public class ShoppingCart implements Ite
GenericValue orderParty = this.getDelegator().findByPrimaryKey("Party", UtilMisc.toMap("partyId", this.getPartyId()));
Collection<GenericValue> shippingContactMechList = ContactHelper.getContactMech(orderParty, "SHIPPING_LOCATION", "POSTAL_ADDRESS", false);
if (UtilValidate.isNotEmpty(shippingContactMechList)) {
- GenericValue shippingContactMech = (GenericValue)(shippingContactMechList.iterator()).next();
+ GenericValue shippingContactMech = (shippingContactMechList.iterator()).next();
this.setShippingContactMechId(shippingContactMech.getString("contactMechId"));
}
} catch (GenericEntityException e) {
@@ -2904,7 +2904,7 @@ public class ShoppingCart implements Ite
BigDecimal itemTotal = BigDecimal.ZERO;
for (ShoppingCartItem item : info.shipItemInfo.keySet()) {
- CartShipInfo.CartShipItemInfo csii = (CartShipInfo.CartShipItemInfo) info.shipItemInfo.get(item);
+ CartShipInfo.CartShipItemInfo csii = info.shipItemInfo.get(item);
if (csii != null && csii.quantity.compareTo(BigDecimal.ZERO) > 0) {
if (item.shippingApplies()) {
itemTotal = itemTotal.add(item.getItemSubTotal(csii.quantity));
@@ -3019,7 +3019,7 @@ public class ShoppingCart implements Ite
Map<String, BigDecimal> featureMap = FastMap.newInstance();
for (ShoppingCartItem item : info.shipItemInfo.keySet()) {
- CartShipInfo.CartShipItemInfo csii = (CartShipInfo.CartShipItemInfo) info.shipItemInfo.get(item);
+ CartShipInfo.CartShipItemInfo csii = info.shipItemInfo.get(item);
if (csii != null && csii.quantity.compareTo(BigDecimal.ZERO) > 0) {
featureMap.putAll(item.getFeatureIdQtyMap(csii.quantity));
}
@@ -4115,7 +4115,7 @@ public class ShoppingCart implements Ite
public TreeMap<Integer, CartShipInfo> getShipGroupsBySupplier(String supplierPartyId) {
TreeMap<Integer, CartShipInfo> shipGroups = new TreeMap<Integer, CartShipInfo>();
for (int i = 0; i < this.shipInfo.size(); i++) {
- CartShipInfo csi = (CartShipInfo) shipInfo.get(i);
+ 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);
@@ -4249,12 +4249,12 @@ 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 = ((Integer) supplierShipGroups.firstKey()).intValue();
- shipInfo = (CartShipInfo) supplierShipGroups.get(supplierShipGroups.firstKey());
+ newShipGroupIndex = (supplierShipGroups.firstKey()).intValue();
+ shipInfo = supplierShipGroups.get(supplierShipGroups.firstKey());
}
if (newShipGroupIndex == -1) {
newShipGroupIndex = addShipInfo();
- shipInfo = (CartShipInfo) this.shipInfo.get(newShipGroupIndex);
+ shipInfo = this.shipInfo.get(newShipGroupIndex);
}
shipInfo.supplierPartyId = supplierPartyId;
@@ -4524,7 +4524,7 @@ public class ShoppingCart implements Ite
}
if (estimatedShipDates.size() > 0) {
Collections.sort(estimatedShipDates);
- Timestamp estimatedShipDate = (Timestamp) estimatedShipDates.getLast();
+ Timestamp estimatedShipDate = estimatedShipDates.getLast();
shipGroup.set("estimatedShipDate", estimatedShipDate);
}
@@ -4538,7 +4538,7 @@ public class ShoppingCart implements Ite
}
if (UtilValidate.isNotEmpty(estimatedDeliveryDates)) {
Collections.sort(estimatedDeliveryDates);
- Timestamp estimatedDeliveryDate = (Timestamp) estimatedDeliveryDates.getLast();
+ Timestamp estimatedDeliveryDate = estimatedDeliveryDates.getLast();
shipGroup.set("estimatedDeliveryDate", estimatedDeliveryDate);
}
@@ -4563,7 +4563,7 @@ public class ShoppingCart implements Ite
Iterator<ShoppingCartItem> i = shipItemInfo.keySet().iterator();
while (i.hasNext()) {
ShoppingCartItem item = i.next();
- CartShipItemInfo itemInfo = (CartShipItemInfo) shipItemInfo.get(item);
+ CartShipItemInfo itemInfo = shipItemInfo.get(item);
GenericValue assoc = delegator.makeValue("OrderItemShipGroupAssoc");
assoc.set("orderItemSeqId", item.getOrderItemSeqId());
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Thu Mar 24 07:23:42 2011
@@ -918,7 +918,7 @@ public class ShoppingCartEvents {
}
ShoppingCart newCart = null;
if (cartIndex >= 0 && cartIndex < cartList.size()) {
- newCart = (ShoppingCart) cartList.remove(cartIndex);
+ newCart = cartList.remove(cartIndex);
} else {
String productStoreId = request.getParameter("productStoreId");
if (UtilValidate.isNotEmpty(productStoreId)) {
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartHelper.java Thu Mar 24 07:23:42 2011
@@ -381,7 +381,7 @@ public class ShoppingCartHelper {
String itemGroupNumberToUse = itemGroupNumber;
String originalProductId = null;
if (entry.getKey() instanceof String) {
- String key = (String) entry.getKey();
+ String key = entry.getKey();
//Debug.logInfo("Bulk Key: " + key, module);
int ignIndex = key.indexOf(ignSeparator);
@@ -983,7 +983,7 @@ public class ShoppingCartHelper {
// set the currency based on the pricing agreement
List<GenericValue> agreementItems = agreement.getRelated("AgreementItem", UtilMisc.toMap("agreementItemTypeId", "AGREEMENT_PRICING_PR"), null);
if (agreementItems.size() > 0) {
- GenericValue agreementItem = (GenericValue) agreementItems.get(0);
+ GenericValue agreementItem = agreementItems.get(0);
String currencyUomId = (String) agreementItem.get("currencyUomId");
if (UtilValidate.isNotEmpty(currencyUomId)) {
try {
@@ -1007,7 +1007,7 @@ public class ShoppingCartHelper {
List<GenericValue> agreementTerms = EntityUtil.filterByDate(agreement.getRelated("AgreementTerm"));
if (agreementTerms.size() > 0) {
for (int i = 0; agreementTerms.size() > i;i++) {
- GenericValue agreementTerm = (GenericValue) agreementTerms.get(i);
+ GenericValue agreementTerm = agreementTerms.get(i);
String termTypeId = (String) agreementTerm.get("termTypeId");
BigDecimal termValue = agreementTerm.getBigDecimal("termValue");
Long termDays = (Long) agreementTerm.get("termDays");
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Thu Mar 24 07:23:42 2011
@@ -1429,7 +1429,7 @@ public class ShoppingCartItem implements
BigDecimal quantityUsed = entry.getValue();
if (productPromoId.equals(productPromoCondActionPK.getString("productPromoId")) && productPromoRuleId.equals(productPromoCondActionPK.getString("productPromoRuleId"))) {
entryIter.remove();
- BigDecimal existingValue = (BigDecimal) this.quantityUsedPerPromoActual.get(productPromoCondActionPK);
+ BigDecimal existingValue = this.quantityUsedPerPromoActual.get(productPromoCondActionPK);
if (existingValue == null) {
this.quantityUsedPerPromoActual.put(productPromoCondActionPK, quantityUsed);
} else {
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Thu Mar 24 07:23:42 2011
@@ -1100,7 +1100,7 @@ public class ShoppingCartServices {
if (shoppingCart != null && UtilValidate.isNotEmpty(shoppingCart.items())) {
List<ShoppingCartItem> items = shoppingCart.findAllCartItems(productId);
if (items.size() > 0) {
- ShoppingCartItem item = (ShoppingCartItem)items.get(0);
+ ShoppingCartItem item = items.get(0);
int itemIndex = shoppingCart.getItemIndex(item);
result.put("itemIndex", String.valueOf(itemIndex));
}
Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java?rev=1084863&r1=1084862&r2=1084863&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java (original)
+++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductDisplayWorker.java Thu Mar 24 07:23:42 2011
@@ -195,7 +195,7 @@ public class ProductDisplayWorker {
products.put(product.getString("productId"), product);
- BigDecimal curQuant = (BigDecimal) productQuantities.get(product.get("productId"));
+ BigDecimal curQuant = productQuantities.get(product.get("productId"));
if (curQuant == null) curQuant = BigDecimal.ZERO;
BigDecimal orderQuant = orderItem.getBigDecimal("quantity");
@@ -203,7 +203,7 @@ public class ProductDisplayWorker {
if (orderQuant == null) orderQuant = BigDecimal.ZERO;
productQuantities.put(product.getString("productId"), curQuant.add(orderQuant));
- Integer curOcc = (Integer) productOccurances.get(product.get("productId"));
+ Integer curOcc = productOccurances.get(product.get("productId"));
if (curOcc == null) curOcc = Integer.valueOf(0);
productOccurances.put(product.getString("productId"), Integer.valueOf(curOcc.intValue() + 1));
@@ -215,8 +215,8 @@ public class ProductDisplayWorker {
// go through each product quantity and divide it by the occurances to get the average
for (Map.Entry<String, BigDecimal> entry : productQuantities.entrySet()) {
String prodId = entry.getKey();
- BigDecimal quantity = (BigDecimal) entry.getValue();
- Integer occs = (Integer) productOccurances.get(prodId);
+ BigDecimal quantity = entry.getValue();
+ Integer occs = productOccurances.get(prodId);
BigDecimal nqint = quantity.divide(new BigDecimal(occs), new MathContext(10));
if (nqint.compareTo(BigDecimal.ONE) < 0) nqint = BigDecimal.ONE;
@@ -280,8 +280,8 @@ public class ProductDisplayWorker {
Map<String, Object> newMetric = FastMap.newInstance();
for (Map.Entry<String, Integer> entry : productOccurances.entrySet()) {
String prodId = entry.getKey();
- Integer quantity = (Integer) entry.getValue();
- BigDecimal occs = (BigDecimal) productQuantities.get(prodId);
+ Integer quantity = entry.getValue();
+ BigDecimal occs = productQuantities.get(prodId);
BigDecimal nqdbl = quantityModifier.multiply(new BigDecimal(quantity)).add(occs.multiply(occurancesModifier));
newMetric.put(prodId, nqdbl);