svn commit: r1044931 [3/4] - in /ofbiz/trunk: applications/accounting/src/or
Locked
svn commit: r1044931 [3/4] - in /ofbiz/trunk: applications/accounting/src/or
 
|
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Sun Dec 12 21:31:27 2010 @@ -688,7 +688,7 @@ public class MacroScreenRenderer impleme if (uiLabelMap == null) { Debug.logWarning("Could not find uiLabelMap in context", module); } else { - ofLabel = (String) uiLabelMap.get("CommonOf"); + ofLabel = uiLabelMap.get("CommonOf"); ofLabel = ofLabel.toLowerCase(); } @@ -790,8 +790,8 @@ public class MacroScreenRenderer impleme if (uiLabelMap == null) { Debug.logWarning("Could not find uiLabelMap in context", module); } else { - addColumnLabel = (String) uiLabelMap.get("CommonAddColumn"); - addColumnHint = (String) uiLabelMap.get("CommonAddAColumnToThisPortalPage"); + addColumnLabel = uiLabelMap.get("CommonAddColumn"); + addColumnHint = uiLabelMap.get("CommonAddAColumnToThisPortalPage"); } StringWriter sr = new StringWriter(); @@ -835,13 +835,13 @@ public class MacroScreenRenderer impleme if (uiLabelMap == null) { Debug.logWarning("Could not find uiLabelMap in context", module); } else { - delColumnLabel = (String) uiLabelMap.get("CommonDeleteColumn"); - delColumnHint = (String) uiLabelMap.get("CommonDeleteThisColumn"); + delColumnLabel = uiLabelMap.get("CommonDeleteColumn"); + delColumnHint = uiLabelMap.get("CommonDeleteThisColumn"); - addPortletLabel = (String) uiLabelMap.get("CommonAddAPortlet"); - addPortletHint = (String) uiLabelMap.get("CommonAddPortletToPage"); - colWidthLabel = (String) uiLabelMap.get("CommonWidth"); - setColumnSizeHint = (String) uiLabelMap.get("CommonSetColumnWidth"); + addPortletLabel = uiLabelMap.get("CommonAddAPortlet"); + addPortletHint = uiLabelMap.get("CommonAddPortletToPage"); + colWidthLabel = uiLabelMap.get("CommonWidth"); + setColumnSizeHint = uiLabelMap.get("CommonSetColumnWidth"); } StringWriter sr = new StringWriter(); @@ -908,8 +908,8 @@ public class MacroScreenRenderer impleme if (uiLabelMap == null) { Debug.logWarning("Could not find uiLabelMap in context", module); } else { - delPortletHint = (String) uiLabelMap.get("CommonDeleteThisPortlet"); - editAttributeHint = (String) uiLabelMap.get("CommonEditPortletAttributes"); + delPortletHint = uiLabelMap.get("CommonDeleteThisPortlet"); + editAttributeHint = uiLabelMap.get("CommonEditPortletAttributes"); } StringWriter sr = new StringWriter(); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/MacroScreenViewHandler.java Sun Dec 12 21:31:27 2010 @@ -79,7 +79,7 @@ public class MacroScreenViewHandler exte compressOutput = "true".equals(UtilProperties.getPropertyValue("widget", "compress.HTML")); } if (!compressOutput && this.servletContext != null) { - compressOutput = "true".equals((String) this.servletContext.getAttribute("compressHTML")); + compressOutput = "true".equals(this.servletContext.getAttribute("compressHTML")); } if (compressOutput) { // StandardCompress defaults to a 2k buffer. That could be increased Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java Sun Dec 12 21:31:27 2010 @@ -159,7 +159,7 @@ public class ScreenFactory { } } - ModelScreen modelScreen = (ModelScreen) modelScreenMap.get(screenName); + ModelScreen modelScreen = modelScreenMap.get(screenName); if (modelScreen == null) { throw new IllegalArgumentException("Could not find screen with name [" + screenName + "] in webapp resource [" + resourceName + "] in the webapp [" + webappName + "]"); } Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Sun Dec 12 21:31:27 2010 @@ -230,7 +230,7 @@ public class ModelTree extends ModelWidg public void renderTreeString(StringBuffer buf, Map<String, Object> context, TreeStringRenderer treeStringRenderer) throws GeneralException { Map<String, Object> parameters = UtilGenerics.checkMap(context.get("parameters")); - ModelNode node = (ModelNode)nodeMap.get(rootNodeName); + ModelNode node = nodeMap.get(rootNodeName); String trailName = trailNameExdr.expandString(context); String treeString = (String)context.get(trailName); @@ -548,7 +548,7 @@ public class ModelTree extends ModelWidg this.subNodeValues = FastList.newInstance(); for (ModelSubNode subNode: subNodeList) { String nodeName = subNode.getNodeName(context); - ModelNode node = (ModelNode)modelTree.nodeMap.get(nodeName); + ModelNode node = modelTree.nodeMap.get(nodeName); List<ModelTreeAction> subNodeActions = subNode.getActions(); //if (Debug.infoOn()) Debug.logInfo(" context.currentValue:" + context.get("currentValue"), module); ModelTreeAction.runSubActions(subNodeActions, context); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java Sun Dec 12 21:31:27 2010 @@ -69,7 +69,7 @@ public class TreeFactory { } } - ModelTree modelTree = (ModelTree) modelTreeMap.get(treeName); + ModelTree modelTree = modelTreeMap.get(treeName); if (modelTree == null) { throw new IllegalArgumentException("Could not find tree with name [" + treeName + "] in class resource [" + resourceName + "]"); } @@ -99,7 +99,7 @@ public class TreeFactory { } } - ModelTree modelTree = (ModelTree) modelTreeMap.get(treeName); + ModelTree modelTree = modelTreeMap.get(treeName); if (modelTree == null) { throw new IllegalArgumentException("Could not find tree with name [" + treeName + "] in webapp resource [" + resourceName + "] in the webapp [" + webappName + "]"); } Modified: ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java (original) +++ ofbiz/trunk/specialpurpose/assetmaint/src/org/ofbiz/assetmaint/FixedAssetMaintServices.java Sun Dec 12 21:31:27 2010 @@ -87,7 +87,7 @@ public class FixedAssetMaintServices { List<GenericValue> inventoryItems = delegator.findList("InventoryItem", ecl, null, null, null, false); //&& inventoryItems.size() > 0 Iterator<GenericValue> itr = inventoryItems.iterator(); while (requestedQty > 0 && itr.hasNext()) { - GenericValue inventoryItem = (GenericValue)itr.next(); + GenericValue inventoryItem = itr.next(); String inventoryItemId = inventoryItem.getString("inventoryItemId"); atp = inventoryItem.getDouble("availableToPromiseTotal").doubleValue(); findCurrInventoryParams = UtilMisc.toMap("inventoryItemId", inventoryItemId); Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayHelper.java Sun Dec 12 21:31:27 2010 @@ -194,7 +194,7 @@ public class EbayHelper { if (UtilValidate.isNotEmpty(paymentPreferences)) { Iterator<GenericValue> i = paymentPreferences.iterator(); while (i.hasNext()) { - GenericValue pref = (GenericValue) i.next(); + GenericValue pref = i.next(); boolean okay = createPayment(dispatcher, userLogin, pref, orderId, externalId, orderDate, partyIdFrom); if (!okay) return false; @@ -304,10 +304,10 @@ public class EbayHelper { try { Map<String, Object> context = FastMap.newInstance(); context.put("partyId", partyId); - context.put("toName", (String) address.get("buyerName")); - context.put("address1", (String) address.get("shippingAddressStreet1")); - context.put("address2", (String) address.get("shippingAddressStreet2")); - context.put("postalCode", (String) address.get("shippingAddressPostalCode")); + context.put("toName", address.get("buyerName")); + context.put("address1", address.get("shippingAddressStreet1")); + context.put("address2", address.get("shippingAddressStreet2")); + context.put("postalCode", address.get("shippingAddressPostalCode")); context.put("userLogin", userLogin); context.put("contactMechPurposeTypeId", contactMechPurposeTypeId); @@ -469,7 +469,7 @@ public class EbayHelper { } Map<String, Object> result = ServiceUtil.returnSuccess(); - result.put("geoId", (String) geo.get("geoId")); + result.put("geoId", geo.get("geoId")); return result; } @@ -485,7 +485,7 @@ public class EbayHelper { // check them to see if one matches Iterator<GenericValue> shippingLocationsIterator = shippingLocations.iterator(); while (shippingLocationsIterator.hasNext()) { - GenericValue shippingLocation = (GenericValue) shippingLocationsIterator.next(); + GenericValue shippingLocation = shippingLocationsIterator.next(); contactMechId = shippingLocation.getString("contactMechId"); GenericValue postalAddress; try { @@ -532,7 +532,7 @@ public class EbayHelper { // check them to see if one matches Iterator<GenericValue> emailAddressesContactMechsIterator = emailAddressContactMechs.iterator(); while (emailAddressesContactMechsIterator.hasNext()) { - GenericValue emailAddressContactMech = (GenericValue) emailAddressesContactMechsIterator.next(); + GenericValue emailAddressContactMech = emailAddressesContactMechsIterator.next(); contactMechId = emailAddressContactMech.getString("contactMechId"); // now compare values. If one matches, that's our email address. // Return the related contact mech id. @@ -557,7 +557,7 @@ public class EbayHelper { // check them to see if one matches Iterator<GenericValue> phoneNumbersIterator = phoneNumbers.iterator(); while (phoneNumbersIterator.hasNext()) { - GenericValue phoneNumberContactMech = (GenericValue) phoneNumbersIterator.next(); + GenericValue phoneNumberContactMech = phoneNumbersIterator.next(); contactMechId = phoneNumberContactMech.getString("contactMechId"); GenericValue phoneNumber; try { @@ -587,7 +587,7 @@ public class EbayHelper { // First try to get an exact match: title == internalName List<GenericValue> products = delegator.findByAnd("Product", UtilMisc.toMap("internalName", title)); if (UtilValidate.isNotEmpty(products) && products.size() == 1) { - productId = (String) ((GenericValue)products.get(0)).get("productId"); + productId = (String) (products.get(0)).get("productId"); } // If it fails, attempt to get the product id from the first word of the title if (UtilValidate.isEmpty(productId)) { 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=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Sun Dec 12 21:31:27 2010 @@ -172,7 +172,7 @@ public class EbayOrderServices { Element orderIdArrayElem = UtilXml.addChildElement(transElem, "OrderIDArray", transDoc); Iterator<String> orderIdListIter = getSellerTransactionsContainingOrderList.iterator(); while (orderIdListIter.hasNext()) { - String orderId = (String) orderIdListIter.next(); + String orderId = orderIdListIter.next(); UtilXml.addChildElementValue(orderIdArrayElem, "OrderID", orderId, transDoc); } } else { @@ -285,7 +285,7 @@ public class EbayOrderServices { Debug.logInfo("The value of getMyeBaySellingList" + eBayDeletedOrdersAndTransactionList, module); Iterator<Map<String, Object>> orderListIter = orderList.iterator(); while (orderListIter.hasNext()) { - Map<String, Object> orderCtx = (Map<String, Object>) orderListIter.next(); + Map<String, Object> orderCtx = orderListIter.next(); if (eBayDeletedOrdersAndTransactionList.contains(orderCtx.get("externalId"))) { // Now finally exclude orders & transaction that has been deleted from sold list. orderList.remove(orderCtx); @@ -442,7 +442,7 @@ public class EbayOrderServices { // retrieve transaction array Iterator<? extends Element> orderArraysElemIter = orderArrays.iterator(); while (orderArraysElemIter.hasNext()) { - Element orderArraysElement = (Element) orderArraysElemIter.next(); + Element orderArraysElement = orderArraysElemIter.next(); // retrieve transaction List<? extends Element> orders = UtilXml.childElementList(orderArraysElement, "Order"); @@ -450,12 +450,12 @@ public class EbayOrderServices { while (ordersElemIter.hasNext()) { Map<String, Object> orderCtx = FastMap.newInstance(); - Element ordersElement = (Element) ordersElemIter.next(); + Element ordersElement = ordersElemIter.next(); String externalOrderId = UtilXml.childElementValue(ordersElement, "OrderID"); orderCtx.put("externalId", "EBO_" + externalOrderId); GenericValue orderExist = externalOrderExists(delegator, (String)orderCtx.get("externalId")); if (orderExist != null) { - orderCtx.put("orderId", (String)orderExist.get("orderId")); + orderCtx.put("orderId", orderExist.get("orderId")); } else { orderCtx.put("orderId", ""); } @@ -476,7 +476,7 @@ public class EbayOrderServices { List<? extends Element> shippingAddressList = UtilXml.childElementList(ordersElement, "ShippingAddress"); Iterator<? extends Element> shippingAddressElemIter = shippingAddressList.iterator(); while (shippingAddressElemIter.hasNext()) { - Element shippingAddressElement = (Element)shippingAddressElemIter.next(); + Element shippingAddressElement = shippingAddressElemIter.next(); shippingAddressCtx.put("buyerName", UtilXml.childElementValue(shippingAddressElement, "Name")); shippingAddressCtx.put("shippingAddressStreet1", UtilXml.childElementValue(shippingAddressElement, "Street1")); shippingAddressCtx.put("shippingAddressStreet2", UtilXml.childElementValue(shippingAddressElement, "Street2")); @@ -499,7 +499,7 @@ public class EbayOrderServices { List<? extends Element> shippingServiceSelectedList = UtilXml.childElementList(ordersElement, "ShippingServiceSelected"); Iterator<? extends Element> shippingServiceSelectedElemIter = shippingServiceSelectedList.iterator(); while (shippingServiceSelectedElemIter.hasNext()) { - Element shippingServiceSelectedElement = (Element)shippingServiceSelectedElemIter.next(); + Element shippingServiceSelectedElement = shippingServiceSelectedElemIter.next(); shippingServiceSelectedCtx.put("shippingService", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingService")); shippingServiceSelectedCtx.put("shippingServiceCost", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingServiceCost", "0")); String insuranceCost = UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingInsuranceCost", "0"); @@ -519,7 +519,7 @@ public class EbayOrderServices { List<? extends Element> shippingDetailsList = UtilXml.childElementList(ordersElement, "ShippingDetails"); Iterator<? extends Element> shippingDetailsElemIter = shippingDetailsList.iterator(); while (shippingDetailsElemIter.hasNext()) { - Element shippingDetailsElement = (Element) shippingDetailsElemIter.next(); + Element shippingDetailsElement = shippingDetailsElemIter.next(); shippingDetailsCtx.put("insuranceFee", UtilXml.childElementValue(shippingDetailsElement, "InsuranceFee", "0")); shippingDetailsCtx.put("insuranceOption", UtilXml.childElementValue(shippingDetailsElement, "InsuranceOption")); shippingDetailsCtx.put("insuranceWanted", UtilXml.childElementValue(shippingDetailsElement, "InsuranceWanted", "false")); @@ -528,7 +528,7 @@ public class EbayOrderServices { List<? extends Element> salesTaxList = UtilXml.childElementList(shippingDetailsElement, "SalesTax"); Iterator<? extends Element> salesTaxElemIter = salesTaxList.iterator(); while (salesTaxElemIter.hasNext()) { - Element salesTaxElement = (Element) salesTaxElemIter.next(); + Element salesTaxElement = salesTaxElemIter.next(); shippingDetailsCtx.put("salesTaxAmount", UtilXml.childElementValue(salesTaxElement, "SalesTaxAmount", "0")); shippingDetailsCtx.put("salesTaxPercent", UtilXml.childElementValue(salesTaxElement, "SalesTaxPercent", "0")); shippingDetailsCtx.put("salesTaxState", UtilXml.childElementValue(salesTaxElement, "SalesTaxState", "0")); @@ -542,7 +542,7 @@ public class EbayOrderServices { List<? extends Element> checkoutStatusList = UtilXml.childElementList(ordersElement, "CheckoutStatus"); Iterator<? extends Element> checkoutStatusElemIter = checkoutStatusList.iterator(); while (checkoutStatusElemIter.hasNext()) { - Element statusElement = (Element) checkoutStatusElemIter.next(); + Element statusElement = checkoutStatusElemIter.next(); checkoutStatusCtx.put("eBayPaymentStatus", UtilXml.childElementValue(statusElement, "eBayPaymentStatus")); checkoutStatusCtx.put("paymentMethodUsed", UtilXml.childElementValue(statusElement, "PaymentMethod")); checkoutStatusCtx.put("completeStatus", UtilXml.childElementValue(statusElement, "Status")); @@ -554,7 +554,7 @@ public class EbayOrderServices { List<? extends Element> externalTransactionList = UtilXml.childElementList(ordersElement, "ExternalTransaction"); Iterator<? extends Element> externalTransactionElemIter = externalTransactionList.iterator(); while (externalTransactionElemIter.hasNext()) { - Element externalTransactionElement = (Element) externalTransactionElemIter.next(); + Element externalTransactionElement = externalTransactionElemIter.next(); externalTransactionCtx.put("externalTransactionID", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionID")); externalTransactionCtx.put("externalTransactionTime", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionTime")); externalTransactionCtx.put("feeOrCreditAmount", UtilXml.childElementValue(externalTransactionElement, "FeeOrCreditAmount", "0")); @@ -568,21 +568,21 @@ public class EbayOrderServices { List<? extends Element> transactionArrayList = UtilXml.childElementList(ordersElement, "TransactionArray"); Iterator<? extends Element> transactionArrayElemIter = transactionArrayList.iterator(); while (transactionArrayElemIter.hasNext()) { - Element transactionArrayElement = (Element) transactionArrayElemIter.next(); + Element transactionArrayElement = transactionArrayElemIter.next(); boolean buyerEmailExists = false; List<? extends Element> transactionList = UtilXml.childElementList(transactionArrayElement, "Transaction"); Iterator<? extends Element> transactionElemIter = transactionList.iterator(); while (transactionElemIter.hasNext()) { Map<String, Object> transactionCtx = FastMap.newInstance(); - Element transactionElement = (Element) transactionElemIter.next(); + Element transactionElement = transactionElemIter.next(); // Retrieve Buyer email if (!buyerEmailExists) { List<? extends Element> buyerList = UtilXml.childElementList(transactionElement, "Buyer"); Iterator<? extends Element> buyerElemIter = buyerList.iterator(); while (buyerElemIter.hasNext()) { - Element buyerElement = (Element) buyerElemIter.next(); + Element buyerElement = buyerElemIter.next(); buyersEmailId = UtilXml.childElementValue(buyerElement, "Email"); if (UtilValidate.isNotEmpty(buyersEmailId)) { buyerEmailExists = true; @@ -594,7 +594,7 @@ public class EbayOrderServices { List<? extends Element> itemList = UtilXml.childElementList(transactionElement, "Item"); Iterator<? extends Element> itemElemIter = itemList.iterator(); while (itemElemIter.hasNext()) { - Element itemElement = (Element) itemElemIter.next(); + Element itemElement = itemElemIter.next(); transactionCtx.put("goodIdentificationIdValue", UtilXml.childElementValue(itemElement, "ItemID")); transactionCtx.put("productId", UtilXml.childElementValue(itemElement, "SKU")); } @@ -622,7 +622,7 @@ public class EbayOrderServices { List<? extends Element> errorList = UtilXml.childElementList(elemResponse, "Errors"); Iterator<? extends Element> errorElemIter = errorList.iterator(); while (errorElemIter.hasNext()) { - Element errorElement = (Element) errorElemIter.next(); + Element errorElement = errorElemIter.next(); errorMessage.append(UtilXml.childElementValue(errorElement, "ShortMessage", "")); } } @@ -644,7 +644,7 @@ public class EbayOrderServices { int totalOrders = 0; Iterator<? extends Element> paginationElemIter = paginationList.iterator(); while (paginationElemIter.hasNext()) { - Element paginationElement = (Element) paginationElemIter.next(); + Element paginationElement = paginationElemIter.next(); String totalNumberOfEntries = UtilXml.childElementValue(paginationElement, "TotalNumberOfEntries", "0"); totalOrders = Integer.valueOf(totalNumberOfEntries); } @@ -655,13 +655,13 @@ public class EbayOrderServices { List<? extends Element> transactions = UtilXml.childElementList(elemResponse, "TransactionArray"); Iterator<? extends Element> transactionsElemIter = transactions.iterator(); while (transactionsElemIter.hasNext()) { - Element transactionsElement = (Element) transactionsElemIter.next(); + Element transactionsElement = transactionsElemIter.next(); // retrieve transaction List<? extends Element> transaction = UtilXml.childElementList(transactionsElement, "Transaction"); Iterator<? extends Element> transactionElemIter = transaction.iterator(); while (transactionElemIter.hasNext()) { - Element transactionElement = (Element) transactionElemIter.next(); + Element transactionElement = transactionElemIter.next(); Map<String, Object> orderCtx = FastMap.newInstance(); orderCtx.put("amountPaid", UtilXml.childElementValue(transactionElement, "AmountPaid", "0")); @@ -678,7 +678,7 @@ public class EbayOrderServices { List<? extends Element> containingOrders = UtilXml.childElementList(transactionElement, "ContainingOrder"); Iterator<? extends Element> containingOrdersIter = containingOrders.iterator(); while (containingOrdersIter.hasNext()) { - Element containingOrdersElement = (Element) containingOrdersIter.next(); + Element containingOrdersElement = containingOrdersIter.next(); String orderId = UtilXml.childElementValue(containingOrdersElement, "OrderID"); if (getSellerTransactionsContainingOrderList != null && ! getSellerTransactionsContainingOrderList.contains(orderId)) { getSellerTransactionsContainingOrderList.add(orderId); @@ -694,7 +694,7 @@ public class EbayOrderServices { List<? extends Element> buyer = UtilXml.childElementList(transactionElement, "Buyer"); Iterator<? extends Element> buyerElemIter = buyer.iterator(); while (buyerElemIter.hasNext()) { - Element buyerElement = (Element)buyerElemIter.next(); + Element buyerElement = buyerElemIter.next(); buyerCtx.put("emailBuyer", UtilXml.childElementValue(buyerElement, "Email", "")); buyerCtx.put("eiasTokenBuyer", UtilXml.childElementValue(buyerElement, "EIASToken", "")); buyerCtx.put("ebayUserIdBuyer", UtilXml.childElementValue(buyerElement, "UserID", "")); @@ -703,13 +703,13 @@ public class EbayOrderServices { List<? extends Element> buyerInfo = UtilXml.childElementList(buyerElement, "BuyerInfo"); Iterator<? extends Element> buyerInfoElemIter = buyerInfo.iterator(); while (buyerInfoElemIter.hasNext()) { - Element buyerInfoElement = (Element)buyerInfoElemIter.next(); + Element buyerInfoElement = buyerInfoElemIter.next(); // retrieve shipping address List<? extends Element> shippingAddressInfo = UtilXml.childElementList(buyerInfoElement, "ShippingAddress"); Iterator<? extends Element> shippingAddressElemIter = shippingAddressInfo.iterator(); while (shippingAddressElemIter.hasNext()) { - Element shippingAddressElement = (Element)shippingAddressElemIter.next(); + Element shippingAddressElement = shippingAddressElemIter.next(); shippingAddressCtx.put("buyerName", UtilXml.childElementValue(shippingAddressElement, "Name", "")); shippingAddressCtx.put("shippingAddressStreet", UtilXml.childElementValue(shippingAddressElement, "Street", "")); shippingAddressCtx.put("shippingAddressStreet1", UtilXml.childElementValue(shippingAddressElement, "Street1", "")); @@ -731,7 +731,7 @@ public class EbayOrderServices { List<? extends Element> shippingServiceSelected = UtilXml.childElementList(transactionElement, "ShippingServiceSelected"); Iterator<? extends Element> shippingServiceSelectedElemIter = shippingServiceSelected.iterator(); while (shippingServiceSelectedElemIter.hasNext()) { - Element shippingServiceSelectedElement = (Element)shippingServiceSelectedElemIter.next(); + Element shippingServiceSelectedElement = shippingServiceSelectedElemIter.next(); shippingServiceSelectedCtx.put("shippingService", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingService", "")); shippingServiceSelectedCtx.put("shippingServiceCost", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingServiceCost", "0")); @@ -763,7 +763,7 @@ public class EbayOrderServices { List<? extends Element> shippingDetails = UtilXml.childElementList(transactionElement, "ShippingDetails"); Iterator<? extends Element> shippingDetailsElemIter = shippingDetails.iterator(); while (shippingDetailsElemIter.hasNext()) { - Element shippingDetailsElement = (Element)shippingDetailsElemIter.next(); + Element shippingDetailsElement = shippingDetailsElemIter.next(); shippingDetailsCtx.put("insuranceFee", UtilXml.childElementValue(shippingDetailsElement, "InsuranceFee", "0")); shippingDetailsCtx.put("insuranceOption", UtilXml.childElementValue(shippingDetailsElement, "InsuranceOption", "")); shippingDetailsCtx.put("insuranceWanted", UtilXml.childElementValue(shippingDetailsElement, "InsuranceWanted", "false")); @@ -772,7 +772,7 @@ public class EbayOrderServices { List<? extends Element> salesTax = UtilXml.childElementList(shippingDetailsElement, "SalesTax"); Iterator<? extends Element> salesTaxElemIter = salesTax.iterator(); while (salesTaxElemIter.hasNext()) { - Element salesTaxElement = (Element)salesTaxElemIter.next(); + Element salesTaxElement = salesTaxElemIter.next(); shippingDetailsCtx.put("salesTaxAmount", UtilXml.childElementValue(salesTaxElement, "SalesTaxAmount", "0")); shippingDetailsCtx.put("salesTaxPercent", UtilXml.childElementValue(salesTaxElement, "SalesTaxPercent", "0")); shippingDetailsCtx.put("salesTaxState", UtilXml.childElementValue(salesTaxElement, "SalesTaxState", "0")); @@ -783,12 +783,12 @@ public class EbayOrderServices { List<? extends Element> taxTable = UtilXml.childElementList(shippingDetailsElement, "TaxTable"); Iterator<? extends Element> taxTableElemIter = taxTable.iterator(); while (taxTableElemIter.hasNext()) { - Element taxTableElement = (Element)taxTableElemIter.next(); + Element taxTableElement = taxTableElemIter.next(); List<? extends Element> taxJurisdiction = UtilXml.childElementList(taxTableElement, "TaxJurisdiction"); Iterator<? extends Element> taxJurisdictionElemIter = taxJurisdiction.iterator(); while (taxJurisdictionElemIter.hasNext()) { - Element taxJurisdictionElement = (Element)taxJurisdictionElemIter.next(); + Element taxJurisdictionElement = taxJurisdictionElemIter.next(); shippingDetailsCtx.put("jurisdictionID", UtilXml.childElementValue(taxJurisdictionElement, "JurisdictionID", "")); shippingDetailsCtx.put("jurisdictionSalesTaxPercent", UtilXml.childElementValue(taxJurisdictionElement, "SalesTaxPercent", "0")); @@ -803,7 +803,7 @@ public class EbayOrderServices { List<? extends Element> status = UtilXml.childElementList(transactionElement, "Status"); Iterator<? extends Element> statusElemIter = status.iterator(); while (statusElemIter.hasNext()) { - Element statusElement = (Element)statusElemIter.next(); + Element statusElement = statusElemIter.next(); checkoutStatusCtx.put("eBayPaymentStatus", UtilXml.childElementValue(statusElement, "eBayPaymentStatus", "")); checkoutStatusCtx.put("checkoutStatus", UtilXml.childElementValue(statusElement, "CheckoutStatus", "")); checkoutStatusCtx.put("paymentMethodUsed", UtilXml.childElementValue(statusElement, "PaymentMethodUsed", "")); @@ -817,7 +817,7 @@ public class EbayOrderServices { List<? extends Element> externalTransaction = UtilXml.childElementList(transactionElement, "ExternalTransaction"); Iterator<? extends Element> externalTransactionElemIter = externalTransaction.iterator(); while (externalTransactionElemIter.hasNext()) { - Element externalTransactionElement = (Element)externalTransactionElemIter.next(); + Element externalTransactionElement = externalTransactionElemIter.next(); externalTransactionCtx.put("externalTransactionID", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionID", "")); externalTransactionCtx.put("externalTransactionTime", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionTime", "")); externalTransactionCtx.put("feeOrCreditAmount", UtilXml.childElementValue(externalTransactionElement, "FeeOrCreditAmount", "0")); @@ -833,7 +833,7 @@ public class EbayOrderServices { Iterator<? extends Element> itemElemIter = item.iterator(); while (itemElemIter.hasNext()) { Map<String, Object> orderItemCtx = FastMap.newInstance(); - Element itemElement = (Element)itemElemIter.next(); + Element itemElement = itemElemIter.next(); itemId = UtilXml.childElementValue(itemElement, "ItemID", ""); orderItemCtx.put("paymentMethods", UtilXml.childElementValue(itemElement, "PaymentMethods", "")); orderItemCtx.put("quantity", quantityPurchased); @@ -852,7 +852,7 @@ public class EbayOrderServices { List<? extends Element> sellingStatus = UtilXml.childElementList(itemElement, "SellingStatus"); Iterator<? extends Element> sellingStatusitemElemIter = sellingStatus.iterator(); while (sellingStatusitemElemIter.hasNext()) { - Element sellingStatusElement = (Element)sellingStatusitemElemIter.next(); + Element sellingStatusElement = sellingStatusitemElemIter.next(); orderItemCtx.put("amount", UtilXml.childElementValue(sellingStatusElement, "CurrentPrice", "0")); orderItemCtx.put("quantitySold", UtilXml.childElementValue(sellingStatusElement, "QuantitySold", "0")); orderItemCtx.put("listingStatus", UtilXml.childElementValue(sellingStatusElement, "ListingStatus", "")); @@ -874,7 +874,7 @@ public class EbayOrderServices { GenericValue orderExist = externalOrderExists(delegator, (String)orderCtx.get("externalId")); if (orderExist != null) { - orderCtx.put("orderId", (String) orderExist.get("orderId")); + orderCtx.put("orderId", orderExist.get("orderId")); } else { orderCtx.put("orderId", ""); } @@ -904,7 +904,7 @@ public class EbayOrderServices { List<? extends Element> errorList = UtilXml.childElementList(elemResponse, "Errors"); Iterator<? extends Element> errorElemIter = errorList.iterator(); while (errorElemIter.hasNext()) { - Element errorElement = (Element) errorElemIter.next(); + Element errorElement = errorElemIter.next(); errorMessage.append(UtilXml.childElementValue(errorElement, "ShortMessage", "")); } } @@ -927,21 +927,21 @@ public class EbayOrderServices { List<? extends Element> deletedFromSoldList = UtilXml.childElementList(elemResponse, "DeletedFromSoldList"); Iterator<? extends Element> deletedFromSoldElemIter = deletedFromSoldList.iterator(); while (deletedFromSoldElemIter.hasNext()) { - Element deletedFromSoldElement = (Element) deletedFromSoldElemIter.next(); + Element deletedFromSoldElement = deletedFromSoldElemIter.next(); // retrieve transaction List<? extends Element> orderTransactionArrayList = UtilXml.childElementList(deletedFromSoldElement, "OrderTransactionArray"); Iterator<? extends Element> orderTransactionArrayElemIter = orderTransactionArrayList.iterator(); while (orderTransactionArrayElemIter.hasNext()) { - Element orderTransactionArrayElement = (Element) orderTransactionArrayElemIter.next(); + Element orderTransactionArrayElement = orderTransactionArrayElemIter.next(); List<? extends Element> orderTransactionList = UtilXml.childElementList(orderTransactionArrayElement, "OrderTransaction"); Iterator<? extends Element> orderTransactionElemIter = orderTransactionList.iterator(); while (orderTransactionElemIter.hasNext()) { - Element orderTransactionElement = (Element) orderTransactionElemIter.next(); + Element orderTransactionElement = orderTransactionElemIter.next(); List<? extends Element> sellerOrderList = UtilXml.childElementList(orderTransactionElement, "Order"); Iterator<? extends Element> sellerOrderElemIter = sellerOrderList.iterator(); while (sellerOrderElemIter.hasNext()) { - Element sellerOrderElement = (Element) sellerOrderElemIter.next(); + Element sellerOrderElement = sellerOrderElemIter.next(); String orderId = UtilXml.childElementValue(sellerOrderElement, "OrderID"); if (UtilValidate.isNotEmpty(orderId)) { fetchDeletedOrdersAndTransactions.add(orderId); @@ -950,12 +950,12 @@ public class EbayOrderServices { List<? extends Element> transactionList = UtilXml.childElementList(orderTransactionElement, "Transaction"); Iterator<? extends Element> transactionElemIter = transactionList.iterator(); while (transactionElemIter.hasNext()) { - Element transactionElement = (Element) transactionElemIter.next(); + Element transactionElement = transactionElemIter.next(); List<? extends Element> itemList = UtilXml.childElementList(transactionElement, "Item"); Iterator<? extends Element> itemElemIter = itemList.iterator(); while (itemElemIter.hasNext()) { - Element itemElement = (Element) itemElemIter.next(); + Element itemElement = itemElemIter.next(); String itemId = UtilXml.childElementValue(itemElement, "ItemID"); if (UtilValidate.isNotEmpty(itemId)) { fetchDeletedOrdersAndTransactions.add(itemId); @@ -969,7 +969,7 @@ public class EbayOrderServices { List<? extends Element> errorList = UtilXml.childElementList(elemResponse, "Errors"); Iterator<? extends Element> errorElemIter = errorList.iterator(); while (errorElemIter.hasNext()) { - Element errorElement = (Element) errorElemIter.next(); + Element errorElement = errorElemIter.next(); errorMessage.append(UtilXml.childElementValue(errorElement, "ShortMessage", "")); } } @@ -1048,7 +1048,7 @@ public class EbayOrderServices { List<Map<String, Object>> orderItemList = UtilGenerics.checkList(context.get("orderItemList")); Iterator<Map<String, Object>> orderItemIter = orderItemList.iterator(); while (orderItemIter.hasNext()) { - Map<String, Object> orderItem = (Map<String, Object>) orderItemIter.next(); + Map<String, Object> orderItem = orderItemIter.next(); addItem(cart, orderItem, dispatcher, delegator, 0); } @@ -1107,8 +1107,8 @@ public class EbayOrderServices { Map<String, Object> shippingAddressCtx = UtilGenerics.checkMap(context.get("shippingAddressCtx")); if (UtilValidate.isNotEmpty(shippingAddressCtx)) { String buyerName = (String) shippingAddressCtx.get("buyerName"); - String firstName = (String) buyerName.substring(0, buyerName.indexOf(" ")); - String lastName = (String) buyerName.substring(buyerName.indexOf(" ")+1); + String firstName = buyerName.substring(0, buyerName.indexOf(" ")); + String lastName = buyerName.substring(buyerName.indexOf(" ")+1); String country = (String) shippingAddressCtx.get("shippingAddressCountry"); String state = (String) shippingAddressCtx.get("shippingAddressStateOrProvince"); 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=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java (original) +++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ImportOrdersFromEbay.java Sun Dec 12 21:31:27 2010 @@ -88,32 +88,32 @@ public class ImportOrdersFromEbay { Map<String, Object> order = FastMap.newInstance(); Map<String, Object> result = FastMap.newInstance(); try { - order.put("productStoreId", (String) context.get("productStoreId")); - order.put("userLogin", (GenericValue) context.get("userLogin")); - order.put("externalId", (String) context.get("externalId")); - order.put("createdDate", (String) context.get("createdDate")); - order.put("productId", (String) context.get("productId")); - order.put("quantityPurchased", (String) context.get("quantityPurchased")); - order.put("transactionPrice", (String) context.get("transactionPrice")); - order.put("shippingService", (String) context.get("shippingService")); - order.put("shippingServiceCost", (String) context.get("shippingServiceCost")); - order.put("shippingTotalAdditionalCost", (String) context.get("shippingTotalAdditionalCost")); - order.put("salesTaxAmount", (String) context.get("salesTaxAmount")); - order.put("salesTaxPercent", (String) context.get("salesTaxPercent")); - order.put("amountPaid", (String) context.get("amountPaid")); - order.put("paidTime", (String) context.get("paidTime")); - order.put("shippedTime", (String) context.get("shippedTime")); - - order.put("buyerName", (String) context.get("buyerName")); - order.put("emailBuyer", (String) context.get("emailBuyer")); - order.put("shippingAddressPhone", (String) context.get("shippingAddressPhone")); - order.put("shippingAddressStreet", (String) context.get("shippingAddressStreet")); - order.put("shippingAddressStreet1", (String) context.get("shippingAddressStreet1")); - order.put("shippingAddressStreet2", (String) context.get("shippingAddressStreet2")); - order.put("shippingAddressPostalCode", (String) context.get("shippingAddressPostalCode")); - order.put("shippingAddressCountry", (String) context.get("shippingAddressCountry")); - order.put("shippingAddressStateOrProvince", (String) context.get("shippingAddressStateOrProvince")); - order.put("shippingAddressCityName", (String) context.get("shippingAddressCityName")); + order.put("productStoreId", context.get("productStoreId")); + order.put("userLogin", context.get("userLogin")); + order.put("externalId", context.get("externalId")); + order.put("createdDate", context.get("createdDate")); + order.put("productId", context.get("productId")); + order.put("quantityPurchased", context.get("quantityPurchased")); + order.put("transactionPrice", context.get("transactionPrice")); + order.put("shippingService", context.get("shippingService")); + order.put("shippingServiceCost", context.get("shippingServiceCost")); + order.put("shippingTotalAdditionalCost", context.get("shippingTotalAdditionalCost")); + order.put("salesTaxAmount", context.get("salesTaxAmount")); + order.put("salesTaxPercent", context.get("salesTaxPercent")); + order.put("amountPaid", context.get("amountPaid")); + order.put("paidTime", context.get("paidTime")); + order.put("shippedTime", context.get("shippedTime")); + + order.put("buyerName", context.get("buyerName")); + order.put("emailBuyer", context.get("emailBuyer")); + order.put("shippingAddressPhone", context.get("shippingAddressPhone")); + order.put("shippingAddressStreet", context.get("shippingAddressStreet")); + order.put("shippingAddressStreet1", context.get("shippingAddressStreet1")); + order.put("shippingAddressStreet2", context.get("shippingAddressStreet2")); + order.put("shippingAddressPostalCode", context.get("shippingAddressPostalCode")); + order.put("shippingAddressCountry", context.get("shippingAddressCountry")); + order.put("shippingAddressStateOrProvince", context.get("shippingAddressStateOrProvince")); + order.put("shippingAddressCityName", context.get("shippingAddressCityName")); result = createShoppingCart(delegator, dispatcher, locale, order, true); } catch (Exception e) { @@ -191,9 +191,9 @@ public class ImportOrdersFromEbay { } else { Iterator<Map<String, Object>> orderIter = orders.iterator(); while (orderIter.hasNext()) { - Map<String, Object> order = (Map<String, Object>) orderIter.next(); - order.put("productStoreId", (String) context.get("productStoreId")); - order.put("userLogin", (GenericValue) context.get("userLogin")); + Map<String, Object> order = orderIter.next(); + order.put("productStoreId", context.get("productStoreId")); + order.put("userLogin", context.get("userLogin")); Map<String, Object> error = createShoppingCart(delegator, dispatcher, locale, order, false); String errorMsg = ServiceUtil.getErrorMessage(error); if (UtilValidate.isNotEmpty(errorMsg)) { @@ -317,7 +317,7 @@ public class ImportOrdersFromEbay { List<? extends Element> errorList = UtilXml.childElementList(elemResponse, "Errors"); Iterator<? extends Element> errorElemIter = errorList.iterator(); while (errorElemIter.hasNext()) { - Element errorElement = (Element) errorElemIter.next(); + Element errorElement = errorElemIter.next(); errorMessage = UtilXml.childElementValue(errorElement, "ShortMessage", ""); } return ServiceUtil.returnFailure(errorMessage); @@ -340,7 +340,7 @@ public class ImportOrdersFromEbay { int totalOrders = 0; Iterator<? extends Element> paginationElemIter = paginationList.iterator(); while (paginationElemIter.hasNext()) { - Element paginationElement = (Element) paginationElemIter.next(); + Element paginationElement = paginationElemIter.next(); String totalNumberOfEntries = UtilXml.childElementValue(paginationElement, "TotalNumberOfEntries", "0"); totalOrders = Integer.valueOf(totalNumberOfEntries); } @@ -352,7 +352,7 @@ public class ImportOrdersFromEbay { List<? extends Element> transactions = UtilXml.childElementList(elemResponse, "TransactionArray"); Iterator<? extends Element> transactionsElemIter = transactions.iterator(); while (transactionsElemIter.hasNext()) { - Element transactionsElement = (Element) transactionsElemIter.next(); + Element transactionsElement = transactionsElemIter.next(); // retrieve transaction List<? extends Element> transaction = UtilXml.childElementList(transactionsElement, "Transaction"); @@ -361,7 +361,7 @@ public class ImportOrdersFromEbay { Map<String, Object> order = FastMap.newInstance(); String itemId = ""; - Element transactionElement = (Element) transactionElemIter.next(); + Element transactionElement = transactionElemIter.next(); List<? extends Element> containingOrders = UtilXml.childElementList(transactionElement, "ContainingOrder"); if (UtilValidate.isNotEmpty(containingOrders)) { continue; @@ -372,7 +372,7 @@ public class ImportOrdersFromEbay { List<? extends Element> buyer = UtilXml.childElementList(transactionElement, "Buyer"); Iterator<? extends Element> buyerElemIter = buyer.iterator(); while (buyerElemIter.hasNext()) { - Element buyerElement = (Element)buyerElemIter.next(); + Element buyerElement = buyerElemIter.next(); order.put("emailBuyer", UtilXml.childElementValue(buyerElement, "Email", "")); order.put("eiasTokenBuyer", UtilXml.childElementValue(buyerElement, "EIASToken", "")); order.put("ebayUserIdBuyer", UtilXml.childElementValue(buyerElement, "UserID", "")); @@ -381,13 +381,13 @@ public class ImportOrdersFromEbay { List<? extends Element> buyerInfo = UtilXml.childElementList(buyerElement, "BuyerInfo"); Iterator<? extends Element> buyerInfoElemIter = buyerInfo.iterator(); while (buyerInfoElemIter.hasNext()) { - Element buyerInfoElement = (Element)buyerInfoElemIter.next(); + Element buyerInfoElement = buyerInfoElemIter.next(); // retrieve shipping address List<? extends Element> shippingAddressInfo = UtilXml.childElementList(buyerInfoElement, "ShippingAddress"); Iterator<? extends Element> shippingAddressElemIter = shippingAddressInfo.iterator(); while (shippingAddressElemIter.hasNext()) { - Element shippingAddressElement = (Element)shippingAddressElemIter.next(); + Element shippingAddressElement = shippingAddressElemIter.next(); order.put("buyerName", UtilXml.childElementValue(shippingAddressElement, "Name", "")); order.put("shippingAddressStreet", UtilXml.childElementValue(shippingAddressElement, "Street", "")); order.put("shippingAddressStreet1", UtilXml.childElementValue(shippingAddressElement, "Street1", "")); @@ -406,7 +406,7 @@ public class ImportOrdersFromEbay { List<? extends Element> shippingDetails = UtilXml.childElementList(transactionElement, "ShippingDetails"); Iterator<? extends Element> shippingDetailsElemIter = shippingDetails.iterator(); while (shippingDetailsElemIter.hasNext()) { - Element shippingDetailsElement = (Element)shippingDetailsElemIter.next(); + Element shippingDetailsElement = shippingDetailsElemIter.next(); order.put("insuranceFee", UtilXml.childElementValue(shippingDetailsElement, "InsuranceFee", "0")); order.put("insuranceOption", UtilXml.childElementValue(shippingDetailsElement, "InsuranceOption", "")); order.put("insuranceWanted", UtilXml.childElementValue(shippingDetailsElement, "InsuranceWanted", "false")); @@ -415,7 +415,7 @@ public class ImportOrdersFromEbay { List<? extends Element> salesTax = UtilXml.childElementList(shippingDetailsElement, "SalesTax"); Iterator<? extends Element> salesTaxElemIter = salesTax.iterator(); while (salesTaxElemIter.hasNext()) { - Element salesTaxElement = (Element)salesTaxElemIter.next(); + Element salesTaxElement = salesTaxElemIter.next(); order.put("salesTaxAmount", UtilXml.childElementValue(salesTaxElement, "SalesTaxAmount", "0")); order.put("salesTaxPercent", UtilXml.childElementValue(salesTaxElement, "SalesTaxPercent", "0")); order.put("salesTaxState", UtilXml.childElementValue(salesTaxElement, "SalesTaxState", "0")); @@ -426,12 +426,12 @@ public class ImportOrdersFromEbay { List<? extends Element> taxTable = UtilXml.childElementList(shippingDetailsElement, "TaxTable"); Iterator<? extends Element> taxTableElemIter = taxTable.iterator(); while (taxTableElemIter.hasNext()) { - Element taxTableElement = (Element)taxTableElemIter.next(); + Element taxTableElement = taxTableElemIter.next(); List<? extends Element> taxJurisdiction = UtilXml.childElementList(taxTableElement, "TaxJurisdiction"); Iterator<? extends Element> taxJurisdictionElemIter = taxJurisdiction.iterator(); while (taxJurisdictionElemIter.hasNext()) { - Element taxJurisdictionElement = (Element)taxJurisdictionElemIter.next(); + Element taxJurisdictionElement = taxJurisdictionElemIter.next(); order.put("jurisdictionID", UtilXml.childElementValue(taxJurisdictionElement, "JurisdictionID", "")); order.put("jurisdictionSalesTaxPercent", UtilXml.childElementValue(taxJurisdictionElement, "SalesTaxPercent", "0")); @@ -447,7 +447,7 @@ public class ImportOrdersFromEbay { List<? extends Element> item = UtilXml.childElementList(transactionElement, "Item"); Iterator<? extends Element> itemElemIter = item.iterator(); while (itemElemIter.hasNext()) { - Element itemElement = (Element)itemElemIter.next(); + Element itemElement = itemElemIter.next(); itemId = UtilXml.childElementValue(itemElement, "ItemID", ""); order.put("paymentMethods", UtilXml.childElementValue(itemElement, "PaymentMethods", "")); order.put("quantity", UtilXml.childElementValue(itemElement, "Quantity", "0")); @@ -467,7 +467,7 @@ public class ImportOrdersFromEbay { List<? extends Element> sellingStatus = UtilXml.childElementList(itemElement, "SellingStatus"); Iterator<? extends Element> sellingStatusitemElemIter = sellingStatus.iterator(); while (sellingStatusitemElemIter.hasNext()) { - Element sellingStatusElement = (Element)sellingStatusitemElemIter.next(); + Element sellingStatusElement = sellingStatusitemElemIter.next(); order.put("amount", UtilXml.childElementValue(sellingStatusElement, "CurrentPrice", "0")); order.put("quantitySold", UtilXml.childElementValue(sellingStatusElement, "QuantitySold", "0")); order.put("listingStatus", UtilXml.childElementValue(sellingStatusElement, "ListingStatus", "")); @@ -481,7 +481,7 @@ public class ImportOrdersFromEbay { List<? extends Element> status = UtilXml.childElementList(transactionElement, "Status"); Iterator<? extends Element> statusElemIter = status.iterator(); while (statusElemIter.hasNext()) { - Element statusElement = (Element)statusElemIter.next(); + Element statusElement = statusElemIter.next(); order.put("eBayPaymentStatus", UtilXml.childElementValue(statusElement, "eBayPaymentStatus", "")); order.put("checkoutStatus", UtilXml.childElementValue(statusElement, "CheckoutStatus", "")); order.put("paymentMethodUsed", UtilXml.childElementValue(statusElement, "PaymentMethodUsed", "")); @@ -502,7 +502,7 @@ public class ImportOrdersFromEbay { GenericValue orderExist = externalOrderExists(delegator, (String)order.get("externalId")); if (orderExist != null) { - order.put("orderId", (String)orderExist.get("orderId")); + order.put("orderId", orderExist.get("orderId")); } else { order.put("orderId", ""); } @@ -514,7 +514,7 @@ public class ImportOrdersFromEbay { List<? extends Element> externalTransaction = UtilXml.childElementList(transactionElement, "ExternalTransaction"); Iterator<? extends Element> externalTransactionElemIter = externalTransaction.iterator(); while (externalTransactionElemIter.hasNext()) { - Element externalTransactionElement = (Element)externalTransactionElemIter.next(); + Element externalTransactionElement = externalTransactionElemIter.next(); order.put("externalTransactionID", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionID", "")); order.put("externalTransactionTime", UtilXml.childElementValue(externalTransactionElement, "ExternalTransactionTime", "")); order.put("feeOrCreditAmount", UtilXml.childElementValue(externalTransactionElement, "FeeOrCreditAmount", "0")); @@ -525,7 +525,7 @@ public class ImportOrdersFromEbay { List<? extends Element> shippingServiceSelected = UtilXml.childElementList(transactionElement, "ShippingServiceSelected"); Iterator<? extends Element> shippingServiceSelectedElemIter = shippingServiceSelected.iterator(); while (shippingServiceSelectedElemIter.hasNext()) { - Element shippingServiceSelectedElement = (Element)shippingServiceSelectedElemIter.next(); + Element shippingServiceSelectedElement = shippingServiceSelectedElemIter.next(); order.put("shippingService", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingService", "")); order.put("shippingServiceCost", UtilXml.childElementValue(shippingServiceSelectedElement, "ShippingServiceCost", "0")); @@ -570,7 +570,7 @@ public class ImportOrdersFromEbay { List<? extends Element> errorList = UtilXml.childElementList(elemResponse, "Errors"); Iterator<? extends Element> errorElemIter = errorList.iterator(); while (errorElemIter.hasNext()) { - Element errorElement = (Element) errorElemIter.next(); + Element errorElement = errorElemIter.next(); errorMessage.append(UtilXml.childElementValue(errorElement, "ShortMessage", "")); } } 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=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Sun Dec 12 21:31:27 2010 @@ -329,7 +329,7 @@ public class EbayEvents { Debug.logError("Required productStoreId for get ebay API config data.", module); return null; } - ApiContext apiContext = EbayStoreHelper.getApiContext((String)request.getParameter("productStoreId") != null ? request.getParameter("productStoreId"):(String)request.getAttribute("productStoreId"), locale, delegator); + ApiContext apiContext = EbayStoreHelper.getApiContext(request.getParameter("productStoreId") != null ? request.getParameter("productStoreId"):(String)request.getAttribute("productStoreId"), locale, delegator); return apiContext; } @@ -376,7 +376,7 @@ public class EbayEvents { return categories; } if (request.getParameter("categoryId") != null || request.getAttribute("categoryId") != null) { - categoryId = (String) request.getParameter("categoryId") != null ? request.getParameter("categoryId") : (String) request.getAttribute("categoryId"); + categoryId = request.getParameter("categoryId") != null ? request.getParameter("categoryId") : (String) request.getAttribute("categoryId"); Debug.logInfo("Load child categories from session following site id and categoryId is ".concat(categoryId), module); } else { Debug.logWarning("No categoryId to get child categories.", module); @@ -434,7 +434,7 @@ public class EbayEvents { return categories; } if (UtilValidate.isNotEmpty(request.getParameter("categoryId")) || UtilValidate.isNotEmpty(request.getAttribute("categoryId"))) { - categoryId = (String) request.getParameter("categoryId") != null ? request.getParameter("categoryId") : (String) request.getAttribute("categoryId"); + categoryId = request.getParameter("categoryId") != null ? request.getParameter("categoryId") : (String) request.getAttribute("categoryId"); Debug.logInfo("Load child categories from session following site id and categoryId is ".concat(categoryId), module); } else { Debug.logWarning("No categoryId to get child categories.", module); @@ -488,7 +488,7 @@ public class EbayEvents { return null; } if (request.getParameter("categoryId") != null || request.getAttribute("categoryId") != null) { - categoryId = (String)request.getParameter("categoryId") != null ? request.getParameter("categoryId") : (String)request.getAttribute("categoryId"); + categoryId = request.getParameter("categoryId") != null ? request.getParameter("categoryId") : (String)request.getAttribute("categoryId"); Debug.logInfo("Load child categories from session following site id and categoryId is ".concat(categoryId), module); } else { Debug.logWarning("No categoryId to get child categories.", module); @@ -710,8 +710,8 @@ public class EbayEvents { NameValueListArrayType nameValueListArray = new NameValueListArrayType(); NameValueListType[] nameValueListTypes = new NameValueListType[nameSpecificList.size()]; for (int i = 0; i < itemSpecificsSize; i++) { - String name = (String) nameSpecificList.get(i); - String value = (String) valueSpecificList.get(i); + String name = nameSpecificList.get(i); + String value = valueSpecificList.get(i); String[] valueArray = new String[] { value }; // set Name value list type. @@ -972,7 +972,7 @@ public class EbayEvents { resp = (VerifyAddItemResponseType) verifyCall.execute(req); if (resp != null && "SUCCESS".equals(resp.getAck().toString())) { itemObj.put("isVerify", "Y"); - FeesType feest = (FeesType) resp.getFees(); + FeesType feest = resp.getFees(); FeeType[] fees = feest.getFee(); for (FeeType fee : fees) { double dfee = fee.getFee().getValue(); Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Sun Dec 12 21:31:27 2010 @@ -462,9 +462,9 @@ public class EbayStore { productStore = delegator.findByPrimaryKey("ProductStore",UtilMisc.toMap("productStoreId", context.get("productStoreId").toString())); } Element itemElem = UtilXml.addChildElement(storeRequestElem, "Store", storeDocument); - UtilXml.addChildElementValue(itemElem, "Name", (String) productStore.getString("storeName"), storeDocument); + UtilXml.addChildElementValue(itemElem, "Name", productStore.getString("storeName"), storeDocument); UtilXml.addChildElementValue(itemElem, "SubscriptionLevel", "Basic", storeDocument); - UtilXml.addChildElementValue(itemElem, "Description", (String) productStore.getString("title"), storeDocument); + UtilXml.addChildElementValue(itemElem, "Description", productStore.getString("title"), storeDocument); dataStoreXml.append(UtilXml.writeXmlDocument(storeDocument)); } catch (Exception e) { @@ -939,7 +939,7 @@ public class EbayStore { Map<String,Object> storeColorSchemeMap = null; while (i < storeBasicTheme.length) { - StoreThemeType storeThemeType = (StoreThemeType) storeBasicTheme[i]; + StoreThemeType storeThemeType = storeBasicTheme[i]; if (themeId.equals(storeThemeType.getThemeID().toString())) { StoreColorSchemeType colorSchemeType = storeThemeType.getColorScheme(); if (colorSchemeType != null) { @@ -998,7 +998,7 @@ public class EbayStore { List<Map<String,Object>> logoList = FastList.newInstance(); while (i < returnedLogoArray.getLogoLength()) { Map<String,Object> logo = FastMap.newInstance(); - StoreLogoType storeLogoType = (StoreLogoType) returnedLogoArray.getLogo(i); + StoreLogoType storeLogoType = returnedLogoArray.getLogo(i); logo.put("storeLogoId", storeLogoType.getLogoID()); logo.put("storeLogoName", storeLogoType.getName()); logo.put("storeLogoURL", storeLogoType.getURL()); @@ -1043,7 +1043,7 @@ public class EbayStore { List<Map<String,Object>> themeList = FastList.newInstance(); while (i < returnedBasicThemeArray.getThemeLength()) { Map<String,Object> basictheme = FastMap.newInstance(); - StoreThemeType storeBasicThemeType = (StoreThemeType) returnedBasicThemeArray.getTheme(i); + StoreThemeType storeBasicThemeType = returnedBasicThemeArray.getTheme(i); basictheme.put("storeThemeId", storeBasicThemeType.getThemeID()); basictheme.put("storeThemeName", storeBasicThemeType.getName()); @@ -1109,7 +1109,7 @@ public class EbayStore { List<Map<String,Object>> themeColorList = FastList.newInstance(); while (j < storeColorSchemeTypes.length) { Map<String,Object> advanceColorTheme = FastMap.newInstance(); - StoreColorSchemeType storeColorSchemeType = (StoreColorSchemeType) storeColorSchemeTypes[j]; + StoreColorSchemeType storeColorSchemeType = storeColorSchemeTypes[j]; advanceColorTheme.put("storeColorSchemeId", storeColorSchemeType.getColorSchemeID()); advanceColorTheme.put("storeColorName", storeColorSchemeType.getName()); themeColorList.add(advanceColorTheme); @@ -1156,7 +1156,7 @@ public class EbayStore { StoreColorSchemeType[] storeColorSchemeTypes = returnedThemeArray.getGenericColorSchemeArray().getColorScheme(); while (i < storeColorSchemeTypes.length) { - StoreColorSchemeType storeColorSchemeType = (StoreColorSchemeType) storeColorSchemeTypes[i]; + StoreColorSchemeType storeColorSchemeType = storeColorSchemeTypes[i]; StoreFontType storeFontType = storeColorSchemeType.getFont(); advanceFontTheme.put("storeFontTypeNameFaceColor",storeFontType.getNameColor()); int j = 0; @@ -1165,7 +1165,7 @@ public class EbayStore { List<Map<String,Object>> nameFaces = FastList.newInstance(); while (j < storeFontNameFaceCodeTypes.length) { Map<String,Object> storeFontNameFaceCodeTypeMap = FastMap.newInstance(); - StoreFontFaceCodeType storeFontNameFaceCodeType = (StoreFontFaceCodeType) storeFontNameFaceCodeTypes[j]; + StoreFontFaceCodeType storeFontNameFaceCodeType = storeFontNameFaceCodeTypes[j]; storeFontNameFaceCodeTypeMap.put("storeFontValue", storeFontNameFaceCodeType.value()); storeFontNameFaceCodeTypeMap.put("storeFontName", storeFontNameFaceCodeType.name()); nameFaces.add(storeFontNameFaceCodeTypeMap); @@ -1178,7 +1178,7 @@ public class EbayStore { List<Map<String,Object>> sizeFaces = FastList.newInstance(); while (j < storeFontSizeCodeTypes.length) { Map<String,Object> storeFontSizeCodeTypeMap = FastMap.newInstance(); - StoreFontSizeCodeType storeFontSizeCodeType = (StoreFontSizeCodeType) storeFontSizeCodeTypes[j]; + StoreFontSizeCodeType storeFontSizeCodeType = storeFontSizeCodeTypes[j]; storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value()); storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name()); sizeFaces.add(storeFontSizeCodeTypeMap); @@ -1193,7 +1193,7 @@ public class EbayStore { List<Map<String,Object>> titleFaces = FastList.newInstance(); while (j < storeFontTypeTitleFaces.length) { Map<String,Object> storeFontTypeTitleFaceMap = FastMap.newInstance(); - StoreFontFaceCodeType storeFontTypeTitleFace = (StoreFontFaceCodeType) storeFontTypeTitleFaces[j]; + StoreFontFaceCodeType storeFontTypeTitleFace = storeFontTypeTitleFaces[j]; storeFontTypeTitleFaceMap.put("storeFontValue", storeFontTypeTitleFace.value()); storeFontTypeTitleFaceMap.put("storeFontName", storeFontTypeTitleFace.name()); titleFaces.add(storeFontTypeTitleFaceMap); @@ -1207,7 +1207,7 @@ public class EbayStore { List<Map<String,Object>> titleSizes = FastList.newInstance(); while (j < storeTitleSizeCodeTypes.length) { Map<String,Object> storeFontSizeCodeTypeMap = FastMap.newInstance(); - StoreFontSizeCodeType storeFontSizeCodeType = (StoreFontSizeCodeType) storeTitleSizeCodeTypes[j]; + StoreFontSizeCodeType storeFontSizeCodeType = storeTitleSizeCodeTypes[j]; storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value()); storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name()); titleSizes.add(storeFontSizeCodeTypeMap); @@ -1223,7 +1223,7 @@ public class EbayStore { List<Map<String,Object>> descFaces = FastList.newInstance(); while (j < storeFontTypeDescFaces.length) { Map<String,Object> storeFontTypeDescFaceMap = FastMap.newInstance(); - StoreFontFaceCodeType storeFontTypeDescFace = (StoreFontFaceCodeType) storeFontTypeDescFaces[j]; + StoreFontFaceCodeType storeFontTypeDescFace = storeFontTypeDescFaces[j]; storeFontTypeDescFaceMap.put("storeFontValue", storeFontTypeDescFace.value()); storeFontTypeDescFaceMap.put("storeFontName", storeFontTypeDescFace.name()); descFaces.add(storeFontTypeDescFaceMap); @@ -1237,7 +1237,7 @@ public class EbayStore { List<Map<String,Object>> descSizes = FastList.newInstance(); while (j < storeDescSizeCodeTypes.length) { Map<String,Object> storeFontSizeCodeTypeMap = FastMap.newInstance(); - StoreFontSizeCodeType storeFontSizeCodeType = (StoreFontSizeCodeType) storeDescSizeCodeTypes[j]; + StoreFontSizeCodeType storeFontSizeCodeType = storeDescSizeCodeTypes[j]; storeFontSizeCodeTypeMap.put("storeFontSizeValue", storeFontSizeCodeType.value()); storeFontSizeCodeTypeMap.put("storeFontSizeName", storeFontSizeCodeType.name()); descSizes.add(storeFontSizeCodeTypeMap); Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Sun Dec 12 21:31:27 2010 @@ -799,7 +799,7 @@ public class EbayStoreAutoPreferences { if (soldGroupList.size() > 1) { for (int j = 0; j < soldGroupList.size(); j++) { - Map<String, Object> myMap = (Map<String, Object>) soldGroupList.get(j); + Map<String, Object> myMap = soldGroupList.get(j); SellingManagerSoldOrderType soldorder = (SellingManagerSoldOrderType) myMap.get("soldorder"); Timestamp createdate = UtilDateTime.toTimestamp(soldorder.getCreationTime().getTime()); if (myMap.get("group").toString().length() == 0) { @@ -826,7 +826,7 @@ public class EbayStoreAutoPreferences { int totalQty = 0; for (int j = 0; j < soldGroupList.size(); j++) { - Map<String, Object> myMap = (Map<String, Object>) soldGroupList.get(j); + Map<String, Object> myMap = soldGroupList.get(j); if (UtilValidate.isNotEmpty(myMap.get("group"))) { if (x == Integer.parseInt(myMap.get("group").toString())) { SellingManagerSoldOrderType sellingManagerSoldOrder = (SellingManagerSoldOrderType) myMap.get("soldorder"); @@ -915,7 +915,7 @@ public class EbayStoreAutoPreferences { public static void runCheckAndGroup(int groupRunning, Timestamp startTimestamp, long countDays, List<Map<String, Object>> inList) { Timestamp endDate = UtilDateTime.getDayEnd(UtilDateTime.toTimestamp(startTimestamp), countDays); for (Map<String, Object> inMap : inList) { - String group = (String) inMap.get("group").toString(); + String group = inMap.get("group").toString(); SellingManagerSoldOrderType soldorder = (SellingManagerSoldOrderType) inMap.get("soldorder"); if (group.length() == 0) { Timestamp createtimestamp = UtilDateTime.toTimestamp(soldorder.getCreationTime().getTime()); @@ -955,7 +955,7 @@ public class EbayStoreAutoPreferences { if (allBidders.size() != 0) { // call to send email to bidder for (int j = 0; j < allBidders.size(); j++) { - Map<String, Object> bidder = (Map<String, Object>) allBidders.get(j); + Map<String, Object> bidder = allBidders.get(j); UserType user = (UserType) bidder.get("bidder"); String buyerUserId = bidder.get("userId").toString(); @@ -1171,7 +1171,7 @@ public class EbayStoreAutoPreferences { GenericValue userLogin = delegator.findOne("UserLogin", false, "userLoginId", "system"); String jobId = (String) context.get("jobId"); String productStoreId = (String) context.get("productStoreId"); - GenericValue ebayProductStorePref = (GenericValue) delegator.findByPrimaryKey("EbayProductStorePref", UtilMisc.toMap("productStoreId", productStoreId, "autoPrefEnumId", "EBAY_AUTO_BEST_OFFER")); + GenericValue ebayProductStorePref = delegator.findByPrimaryKey("EbayProductStorePref", UtilMisc.toMap("productStoreId", productStoreId, "autoPrefEnumId", "EBAY_AUTO_BEST_OFFER")); String parentPrefCondId = ebayProductStorePref.getString("parentPrefCondId"); List<GenericValue> ebayProductStorePrefCond = delegator.findByAnd("EbayProductStorePrefCond", UtilMisc.toMap("parentPrefCondId", parentPrefCondId)); //Parameters Modified: ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java?rev=1044931&r1=1044930&r2=1044931&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java (original) +++ ofbiz/trunk/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java Sun Dec 12 21:31:27 2010 @@ -166,7 +166,7 @@ public class EbayStoreCategoryFacade { al.add(pm); } } - return (BuyerPaymentMethodCodeType[])al.toArray(new BuyerPaymentMethodCodeType[0]); + return al.toArray(new BuyerPaymentMethodCodeType[0]); } /** |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |