You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Scott Gray <le...@gmail.com> on 2007/10/21 20:41:10 UTC
Re: svn commit: r586925 [1/2] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/finaccount/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/content/src
That looks like a PITA, do we have to include <String, Object> on all toMap
calls now?
Scott
On 22/10/2007, doogie@apache.org <do...@apache.org> wrote:
>
> Author: doogie
> Date: Sun Oct 21 11:19:34 2007
> New Revision: 586925
>
> URL: http://svn.apache.org/viewvc?rev=586925&view=rev
> Log:
> Fix stupid problems with javac and type inference.
>
> Modified:
>
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
>
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
>
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
>
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
>
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
>
> ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java
>
> ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
>
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java
>
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
>
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
>
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
>
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
>
> ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
>
> ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
>
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
>
> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
>
> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
>
> ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java
>
> Modified:
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
> (original)
> +++
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
> Sun Oct 21 11:19:34 2007
> @@ -226,7 +226,7 @@
> thruDate = UtilDateTime.getDayEnd(
> UtilDateTime.nowTimestamp(), 30); // default 30 days for an auth
> }
>
> - Map tmpResult = dispatcher.runSync("createFinAccountAuth",
> UtilMisc.toMap("finAccountId", finAccountId,
> + Map tmpResult = dispatcher.runSync("createFinAccountAuth",
> UtilMisc.<String, Object>toMap("finAccountId", finAccountId,
> "amount", amount, "thruDate", thruDate,
> "userLogin", userLogin));
>
> if (ServiceUtil.isError(tmpResult)) {
> @@ -370,7 +370,7 @@
> // cancel the authorization before doing the withdraw to avoid
> problems with way negative available amount on account; should happen in
> same transaction to avoid conflict problems
> Map releaseResult;
> try {
> - releaseResult = dispatcher.runSync("expireFinAccountAuth",
> UtilMisc.toMap("userLogin", userLogin, "finAccountAuthId",
> finAccountAuthId));
> + releaseResult = dispatcher.runSync("expireFinAccountAuth",
> UtilMisc.<String, Object>toMap("userLogin", userLogin, "finAccountAuthId",
> finAccountAuthId));
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> return ServiceUtil.returnError(e.getMessage());
> @@ -845,7 +845,7 @@
> // say we are in good standing again
> if ("FNACT_NEGPENDREPL".equals(statusId)) {
> try {
> - Map ufaResp = dispatcher.runSync("updateFinAccount",
> UtilMisc.toMap("finAccountId", finAccountId, "statusId", "FNACT_ACTIVE",
> "userLogin", userLogin));
> + Map ufaResp = dispatcher.runSync("updateFinAccount",
> UtilMisc.<String, Object>toMap("finAccountId", finAccountId, "statusId",
> "FNACT_ACTIVE", "userLogin", userLogin));
> if (ServiceUtil.isError(ufaResp)) {
> return ufaResp;
> }
>
> Modified:
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
> (original)
> +++
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
> Sun Oct 21 11:19:34 2007
> @@ -798,14 +798,14 @@
> if (invoiceType.equals("PURCHASE_INVOICE")) {
> nextStatusId = "INVOICE_IN_PROCESS";
> }
> - Map setInvoiceStatusResult = dispatcher.runSync("setInvoiceStatus",
> UtilMisc.toMap("invoiceId", invoiceId, "statusId", nextStatusId,
> "userLogin", userLogin));
> + Map setInvoiceStatusResult = dispatcher.runSync("setInvoiceStatus",
> UtilMisc.<String, Object>toMap("invoiceId", invoiceId, "statusId",
> nextStatusId, "userLogin", userLogin));
> if (ServiceUtil.isError(setInvoiceStatusResult)) {
> return ServiceUtil.returnError(
> UtilProperties.getMessage(resource,"AccountingErrorCreatingInvoiceFromOrder",locale),
> null, null, setInvoiceStatusResult);
> }
> }
>
> // check to see if we are all paid up
> - Map checkResp = dispatcher.runSync("checkInvoicePaymentApplications",
> UtilMisc.toMap("invoiceId", invoiceId, "userLogin", userLogin));
> + Map checkResp = dispatcher.runSync("checkInvoicePaymentApplications",
> UtilMisc.<String, Object>toMap("invoiceId", invoiceId, "userLogin",
> userLogin));
> if (ServiceUtil.isError(checkResp)) {
> return ServiceUtil.returnError(UtilProperties.getMessage(resource,"AccountingErrorCreatingInvoiceFromOrderCheckPaymentAppl",locale),
> null, null, checkResp);
> }
> @@ -879,7 +879,7 @@
>
> // Determine commission parties for this invoiceItem
> if (productId != null && productId.length() > 0) {
> - Map outMap = dispatcher.runSync("getCommissionForProduct",
> UtilMisc.toMap(
> + Map outMap = dispatcher.runSync("getCommissionForProduct",
> UtilMisc.<String, Object>toMap(
> "productId", productId,
> "invoiceItemTypeId", invoiceItem.getString
> ("invoiceItemTypeId"),
> "amount", amount,
> @@ -1014,7 +1014,7 @@
> try {
> while (it.hasNext()) {
> String invoiceId = (String) it.next();
> - Map setInvoiceStatusResult = dispatcher.runSync("setInvoiceStatus",
> UtilMisc.toMap("invoiceId", invoiceId, "statusId", nextStatusId,
> "userLogin", userLogin));
> + Map setInvoiceStatusResult = dispatcher.runSync("setInvoiceStatus",
> UtilMisc.<String, Object>toMap("invoiceId", invoiceId, "statusId",
> nextStatusId, "userLogin", userLogin));
> if (ServiceUtil.isError(setInvoiceStatusResult)) {
> return ServiceUtil.returnError(
> UtilProperties.getMessage(resource,"AccountingInvoiceCommissionError",locale),
> null, null, setInvoiceStatusResult);
> }
> @@ -1853,7 +1853,7 @@
> }
>
> // Set the invoice to READY
> - serviceResults = dispatcher.runSync("setInvoiceStatus",
> UtilMisc.toMap("invoiceId", invoiceId, "statusId", "INVOICE_READY",
> "userLogin", userLogin));
> + serviceResults = dispatcher.runSync("setInvoiceStatus",
> UtilMisc.<String, Object>toMap("invoiceId", invoiceId, "statusId",
> "INVOICE_READY", "userLogin", userLogin));
> if (ServiceUtil.isError(serviceResults)) {
> return ServiceUtil.returnError(errorMsg, null, null,
> serviceResults);
> }
> @@ -3000,7 +3000,7 @@
> GenericValue paymentApplication = (GenericValue)
> iter.next();
> String invoiceId = paymentApplication.getString
> ("invoiceId");
> if (invoiceId != null) {
> - Map serviceResult = dispatcher.runSync("checkInvoicePaymentApplications",
> UtilMisc.toMap("invoiceId", invoiceId, "userLogin", userLogin));
> + Map serviceResult = dispatcher.runSync("checkInvoicePaymentApplications",
> UtilMisc.<String, Object>toMap("invoiceId", invoiceId, "userLogin",
> userLogin));
> if (ServiceUtil.isError(serviceResult)) return
> serviceResult;
> }
> }
>
> Modified:
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
> (original)
> +++
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/BillingAccountWorker.java
> Sun Oct 21 11:19:34 2007
> @@ -68,7 +68,7 @@
> public static List makePartyBillingAccountList(GenericValue
> userLogin, String currencyUomId, String partyId, GenericDelegator delegator,
> LocalDispatcher dispatcher) throws GeneralException {
> List billingAccountList = FastList.newInstance();
>
> - Map agentResult = dispatcher.runSync("getRelatedParties",
> UtilMisc.toMap("userLogin", userLogin, "partyIdFrom", partyId,
> + Map agentResult = dispatcher.runSync("getRelatedParties",
> UtilMisc.<String, Object>toMap("userLogin", userLogin, "partyIdFrom",
> partyId,
> "roleTypeIdFrom", "AGENT", "roleTypeIdTo", "CUSTOMER",
> "partyRelationshipTypeId", "AGENT", "includeFromToSwitched", "Y"));
> if (ServiceUtil.isError(agentResult)) {
> throw new GeneralException("Error while finding party
> BillingAccounts when getting Customers that this party is an agent of: " +
> ServiceUtil.getErrorMessage(agentResult));
>
> Modified:
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
> (original)
> +++
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java
> Sun Oct 21 11:19:34 2007
> @@ -109,7 +109,7 @@
> acctCtx.put("userLogin", userLogin);
> acctResult = dispatcher.runSync("createFinAccount",
> acctCtx);
> } else {
> - acctResult = dispatcher.runSync("createFinAccountForStore",
> UtilMisc.toMap("productStoreId", productStoreId, "finAccountTypeId",
> FinAccountHelper.giftCertFinAccountTypeId, "userLogin", userLogin));
> + acctResult = dispatcher.runSync("createFinAccountForStore",
> UtilMisc.<String, Object>toMap("productStoreId", productStoreId,
> "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId,
> "userLogin", userLogin));
> if (acctResult.get("finAccountId") != null) {
> cardNumber = (String) acctResult.get("finAccountId");
> }
> @@ -396,7 +396,7 @@
> }
>
> // now release the authorization should this use the gift
> card release service?
> - Map releaseResult = dispatcher.runSync("expireFinAccountAuth",
> UtilMisc.toMap("userLogin", userLogin, "finAccountAuthId",
> finAccountAuthId));
> + Map releaseResult = dispatcher.runSync("expireFinAccountAuth",
> UtilMisc.<String, Object>toMap("userLogin", userLogin, "finAccountAuthId",
> finAccountAuthId));
> if (ServiceUtil.isError(releaseResult)) {
> return releaseResult;
> }
> @@ -480,7 +480,7 @@
> if (giftCertSettings.getLong("authValidDays") != null) {
> thruDate = UtilDateTime.getDayEnd(
> UtilDateTime.nowTimestamp(), giftCertSettings.getLong
> ("authValidDays").intValue());
> }
> - Map tmpResult = dispatcher.runSync("createFinAccountAuth",
> UtilMisc.toMap("finAccountId", finAccountId, "amount", amount,
> "currencyUomId", currency,
> + Map tmpResult = dispatcher.runSync("createFinAccountAuth",
> UtilMisc.<String, Object>toMap("finAccountId", finAccountId, "amount",
> amount, "currencyUomId", currency,
> "thruDate", thruDate, "userLogin", userLogin));
> if (ServiceUtil.isError(tmpResult)) {
> return tmpResult;
>
> Modified:
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
> (original)
> +++
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java
> Sun Oct 21 11:19:34 2007
> @@ -1094,7 +1094,7 @@
> if (UtilValidate.isNotEmpty(invoiceId)) {
> Map captureResult = null;
> try {
> - captureResult = dispatcher.runSync("captureBillingAccountPayments",
> UtilMisc.toMap("invoiceId", invoiceId,
> + captureResult = dispatcher.runSync("captureBillingAccountPayments",
> UtilMisc.<String, Object>toMap("invoiceId", invoiceId,
>
> "billingAccountId", billingAccountId,
>
> "captureAmount", new Double(amountThisCapture.doubleValue()),
>
> "orderId", orderId,
> @@ -1343,7 +1343,7 @@
> }
>
> String paymentId = (String) tmpResult.get("paymentId");
> - tmpResult = dispatcher.runSync("createPaymentApplication",
> UtilMisc.toMap("paymentId", paymentId, "invoiceId", invoiceId,
> "billingAccountId", billingAccountId,
> + tmpResult = dispatcher.runSync("createPaymentApplication",
> UtilMisc.<String, Object>toMap("paymentId", paymentId, "invoiceId",
> invoiceId, "billingAccountId", billingAccountId,
> "amountApplied", captureAmount, "userLogin",
> userLogin));
> if (ServiceUtil.isError(tmpResult)) {
> return tmpResult;
> @@ -2374,7 +2374,7 @@
> // run the auth service and check for failure(s)
> Map serviceResult = null;
> try {
> - serviceResult = dispatcher.runSync("authOrderPayments",
> UtilMisc.toMap("orderId", orderId, "userLogin", userLogin));
> + serviceResult = dispatcher.runSync("authOrderPayments",
> UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> return ServiceUtil.returnError(e.toString());
> @@ -2430,7 +2430,7 @@
> if (!processList.contains(orderId)) { // just try
> each order once
> try {
> // each re-try is independent of each other;
> if one fails it should not effect the others
> - dispatcher.runAsync("retryFailedOrderAuth",
> UtilMisc.toMap("orderId", orderId, "userLogin", userLogin));
> + dispatcher.runAsync("retryFailedOrderAuth",
> UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
> processList.add(orderId);
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> @@ -2479,7 +2479,7 @@
> if (!processList.contains(orderId)) { // just try
> each order once
> try {
> // each re-try is independent of each other;
> if one fails it should not effect the others
> - dispatcher.runAsync("retryFailedOrderAuthNsf",
> UtilMisc.toMap("orderId", orderId, "userLogin", userLogin));
> + dispatcher.runAsync("retryFailedOrderAuthNsf",
> UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
> processList.add(orderId);
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
>
> Modified:
> ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java
> (original)
> +++
> ofbiz/trunk/applications/content/src/org/ofbiz/content/email/EmailServices.java
> Sun Oct 21 11:19:34 2007
> @@ -602,7 +602,7 @@
>
> if (!UtilValidate.isEmpty(emailAddress)) {
> result = dispatcher.runSync
> ("findPartyFromEmailAddress",
> - UtilMisc.toMap("address",
> emailAddress.getAddress(), "userLogin", userLogin));
> + UtilMisc.<String, Object>toMap("address",
> emailAddress.getAddress(), "userLogin", userLogin));
> if (result.get("partyId") != null) {
> tempResults.add(result);
> }
> @@ -796,7 +796,7 @@
>
> // if partyIdTo not found try to find the "to" address using
> the delivered-to header
> if ((partyIdTo == null) && (deliveredTo != null)) {
> - result = dispatcher.runSync("findPartyFromEmailAddress",
> UtilMisc.toMap("address", deliveredTo, "userLogin", userLogin));
> + result = dispatcher.runSync("findPartyFromEmailAddress",
> UtilMisc.<String, Object>toMap("address", deliveredTo, "userLogin",
> userLogin));
> partyIdTo = (String)result.get("partyId");
> contactMechIdTo = (String)result.get("contactMechId");
> }
> @@ -953,7 +953,7 @@
> // Check if "_NA_" role exists for the partyId. If
> not, then first associate that role with the partyId
> GenericValue partyRole = delegator.findByPrimaryKey("PartyRole",
> UtilMisc.toMap("partyId", partyId, "roleTypeId", "_NA_"));
> if (partyRole == null) {
> - dispatcher.runSync("createPartyRole",
> UtilMisc.toMap("partyId", partyId, "roleTypeId", "_NA_", "userLogin",
> userLogin));
> + dispatcher.runSync("createPartyRole",
> UtilMisc.<String, Object>toMap("partyId", partyId, "roleTypeId", "_NA_",
> "userLogin", userLogin));
> }
> Map input = UtilMisc.toMap("communicationEventId",
> communicationEventId, "partyId", partyId, "roleTypeId", "_NA_", "userLogin",
> userLogin, "contactMechId", (String)address.get("contactMechId"));
> dispatcher.runSync("createCommunicationEventRole",
> input);
>
> Modified:
> ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
> (original)
> +++
> ofbiz/trunk/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java
> Sun Oct 21 11:19:34 2007
> @@ -103,7 +103,7 @@
>
> // create a SurveyQuestionCategory to put the questions in
> Map createCategoryResultMap = dispatcher.runSync
> ("createSurveyQuestionCategory",
> - UtilMisc.toMap("description", "From AcroForm in
> Content [" + contentId + "] for Survey [" + surveyId + "]", "userLogin",
> userLogin));
> + UtilMisc.<String, Object>toMap("description", "From
> AcroForm in Content [" + contentId + "] for Survey [" + surveyId + "]",
> "userLogin", userLogin));
> String surveyQuestionCategoryId = (String)
> createCategoryResultMap.get("surveyQuestionCategoryId");
>
> pdfStamper.setFormFlattening(true);
>
> Modified:
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java
> (original)
> +++
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMHelper.java
> Sun Oct 21 11:19:34 2007
> @@ -153,7 +153,7 @@
> Debug.logError("Production Run for order item (" +
> orderItem.getString("orderId") + "/" + orderItem.getString("orderItemSeqId")
> + ") not created.", module);
> continue;
> }
> - Map result = dispatcher.runSync("createProductionRunsForOrder",
> UtilMisc.toMap("quantity", shipmentPlan.getDouble("quantity"), "orderId",
> shipmentPlan.getString("orderId"), "orderItemSeqId",
> shipmentPlan.getString("orderItemSeqId"), "shipmentId", shipmentId,
> "userLogin", userLogin));
> + Map result = dispatcher.runSync("createProductionRunsForOrder",
> UtilMisc.<String, Object>toMap("quantity", shipmentPlan.getDouble("quantity"),
> "orderId", shipmentPlan.getString("orderId"), "orderItemSeqId",
> shipmentPlan.getString("orderItemSeqId"), "shipmentId", shipmentId,
> "userLogin", userLogin));
> }
> } catch (Exception e) {
> // if there is an exception for either, the other probably
> wont work
>
> Modified:
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
> (original)
> +++
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/bom/BOMServices.java
> Sun Oct 21 11:19:34 2007
> @@ -227,7 +227,7 @@
> while (productsIt.hasNext()) {
> GenericValue product = (GenericValue)productsIt.next();
> try {
> - Map depthResult = dispatcher.runSync("updateLowLevelCode",
> UtilMisc.toMap("productIdTo", product.getString("productId"),
> "alsoComponents", Boolean.valueOf(false), "alsoVariants", Boolean.valueOf
> (false)));
> + Map depthResult = dispatcher.runSync("updateLowLevelCode",
> UtilMisc.<String, Object>toMap("productIdTo", product.getString("productId"),
> "alsoComponents", Boolean.valueOf(false), "alsoVariants", Boolean.valueOf
> (false)));
> Debug.logInfo("Product [" + product.getString("productId")
> + "] Low Level Code [" + depthResult.get("lowLevelCode") + "]", module);
> } catch(Exception exc) {
> Debug.logWarning(exc.getMessage(), module);
> @@ -704,7 +704,7 @@
> // If needed, create the package
> if (shipmentPackageSeqId == null) {
> try {
> - Map resultService = dispatcher.runSync("createShipmentPackage",
> UtilMisc.toMap("shipmentId", orderShipment.getString("shipmentId"),
> "shipmentBoxTypeId", boxTypeId, "userLogin", userLogin));
> + Map resultService = dispatcher.runSync("createShipmentPackage",
> UtilMisc.<String, Object>toMap("shipmentId", orderShipment.getString("shipmentId"),
> "shipmentBoxTypeId", boxTypeId, "userLogin", userLogin));
> shipmentPackageSeqId =
> (String)resultService.get("shipmentPackageSeqId");
> } catch (GenericServiceException e) {
> return ServiceUtil.returnError(
> UtilProperties.getMessage(resource,
> "ManufacturingPackageConfiguratorError", locale));
>
> Modified:
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
> (original)
> +++
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
> Sun Oct 21 11:19:34 2007
> @@ -926,7 +926,7 @@
> BigDecimal totalCost = ZERO;
> while (tasksIt.hasNext()) {
> GenericValue task = (GenericValue)tasksIt.next();
> - Map outputMap = dispatcher.runSync("getWorkEffortCosts",
> UtilMisc.toMap("userLogin", userLogin, "workEffortId", task.getString
> ("workEffortId")));
> + Map outputMap = dispatcher.runSync("getWorkEffortCosts",
> UtilMisc.<String, Object>toMap("userLogin", userLogin, "workEffortId",
> task.getString("workEffortId")));
> BigDecimal taskCost =
> (BigDecimal)outputMap.get("totalCost");
> totalCost = totalCost.add(taskCost);
> }
> @@ -1518,7 +1518,7 @@
> // calculate the inventory item unit cost
> BigDecimal unitCost = ZERO;
> try {
> - Map outputMap = dispatcher.runSync("getProductionRunCost",
> UtilMisc.toMap("userLogin", userLogin, "workEffortId", productionRunId));
> + Map outputMap = dispatcher.runSync("getProductionRunCost",
> UtilMisc.<String, Object>toMap("userLogin", userLogin, "workEffortId",
> productionRunId));
> BigDecimal totalCost =
> (BigDecimal)outputMap.get("totalCost");
> // FIXME
> unitCost = totalCost.divide(BigDecimal.valueOf(
> quantity.doubleValue()), decimals, rounding);
> @@ -1771,7 +1771,7 @@
> // TODO: if the task is not running, then return an error
> message.
>
> try {
> - Map inventoryResult = dispatcher.runSync("productionRunTaskProduce",
> UtilMisc.toMap("workEffortId", productionRunTaskId,
> + Map inventoryResult = dispatcher.runSync("productionRunTaskProduce",
> UtilMisc.<String, Object>toMap("workEffortId", productionRunTaskId,
>
> "productId", productId,
>
> "quantity", quantity,
>
> "inventoryItemTypeId", inventoryItemTypeId,
> @@ -1924,7 +1924,7 @@
> return ServiceUtil.returnError(UtilProperties.getMessage(resource,
> "ManufacturingRequirementNotExists", locale));
> }
> try {
> - result = dispatcher.runSync("updateRequirement",
> UtilMisc.toMap("requirementId", requirementId, "statusId", "REQ_APPROVED",
> "requirementTypeId", requirement.getString("requirementTypeId"),
> "userLogin", userLogin));
> + result = dispatcher.runSync("updateRequirement",
> UtilMisc.<String, Object>toMap("requirementId", requirementId, "statusId",
> "REQ_APPROVED", "requirementTypeId", requirement.getString("requirementTypeId"),
> "userLogin", userLogin));
> } catch (GenericServiceException e) {
> return ServiceUtil.returnError(UtilProperties.getMessage(resource,
> "ManufacturingRequirementNotUpdated", locale));
> }
> @@ -2120,7 +2120,7 @@
> try {
> // first figure out how much of this product we already have
> in stock (ATP)
> double existingAtp = 0.0;
> - Map tmpResults = dispatcher.runSync("getInventoryAvailableByFacility",
> UtilMisc.toMap("productId", orderItem.getString("productId"),
> "facilityId", facilityId, "userLogin", userLogin));
> + Map tmpResults = dispatcher.runSync("getInventoryAvailableByFacility",
> UtilMisc.<String, Object>toMap("productId", orderItem.getString("productId"),
> "facilityId", facilityId, "userLogin", userLogin));
> if (tmpResults.get("availableToPromiseTotal") != null) {
> existingAtp = ((Double) tmpResults.get
> ("availableToPromiseTotal")).doubleValue();
> }
>
> Modified:
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
> (original)
> +++
> ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
> Sun Oct 21 11:19:34 2007
> @@ -656,7 +656,7 @@
> // The components are also loaded thru the
> configurator
> Map serviceResponse = null;
> try {
> - serviceResponse = dispatcher.runSync("getManufacturingComponents",
> UtilMisc.toMap("productId", product.getString("productId"), "quantity",
> new Double(positiveEventQuantity), "excludeWIPs", Boolean.FALSE,
> "userLogin", userLogin));
> + serviceResponse = dispatcher.runSync("getManufacturingComponents",
> UtilMisc.<String, Object>toMap("productId", product.getString("productId"),
> "quantity", new Double(positiveEventQuantity), "excludeWIPs",
> Boolean.FALSE, "userLogin", userLogin));
> } catch (Exception e) {
> return ServiceUtil.returnError("An error
> occurred exploding the product [" + product.getString("productId") + "]");
> }
> @@ -688,7 +688,7 @@
> // The components are also loaded thru the
> configurator
> Map serviceResponse = null;
> try {
> - serviceResponse = dispatcher.runSync("getManufacturingComponents",
> UtilMisc.toMap("productId", product.getString("productId"), "quantity",
> new Double(proposedOrder.getQuantity()), "excludeWIPs", Boolean.FALSE,
> "userLogin", userLogin));
> + serviceResponse = dispatcher.runSync("getManufacturingComponents",
> UtilMisc.<String, Object>toMap("productId", product.getString("productId"),
> "quantity", new Double(proposedOrder.getQuantity()), "excludeWIPs",
> Boolean.FALSE, "userLogin", userLogin));
> } catch (Exception e) {
> return ServiceUtil.returnError("An error
> occurred exploding the product [" + product.getString("productId") + "]");
> }
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/ImportOrdersFromEbay.java
> Sun Oct 21 11:19:34 2007
> @@ -1027,7 +1027,7 @@
> lastName = name;
> }
>
> - Map summaryResult = dispatcher.runSync("createPerson",
> UtilMisc.toMap("description", name, "firstName", firstName, "lastName",
> lastName,
> + Map summaryResult = dispatcher.runSync("createPerson",
> UtilMisc.<String, Object>toMap("description", name, "firstName", firstName,
> "lastName", lastName,
>
> "userLogin", userLogin, "comments", "Created via eBay"));
> partyId = (String) summaryResult.get("partyId");
> Debug.logVerbose("Created Customer Party: "+partyId,
> module);
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderChangeHelper.java
> Sun Oct 21 11:19:34 2007
> @@ -274,7 +274,7 @@
> if (payments == null || payments.size() == 0) {
> // only do this one time; if we have payment
> already for this pref ignore.
> Map results = dispatcher.runSync
> ("createPaymentFromPreference",
> - UtilMisc.toMap("userLogin", userLogin,
> "orderPaymentPreferenceId", opp.getString("orderPaymentPreferenceId"),
> + UtilMisc.<String,
> Object>toMap("userLogin", userLogin, "orderPaymentPreferenceId",
> opp.getString("orderPaymentPreferenceId"),
> "paymentRefNum",
> UtilDateTime.nowTimestamp().toString(), "paymentFromId", partyId));
> if (results.get(ModelService.RESPONSE_MESSAGE
> ).equals(ModelService.RESPOND_ERROR)) {
> Debug.logError((String) results.get(
> ModelService.ERROR_MESSAGE), module);
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
> Sun Oct 21 11:19:34 2007
> @@ -585,7 +585,7 @@
> // to the final status
> if (currentStatus != null &&
> "RETURN_ACCEPTED".equals(currentStatus)) {
> try {
> - dispatcher.runSync("updateReturnHeader",
> UtilMisc.toMap("returnId", returnId,
> + dispatcher.runSync("updateReturnHeader",
> UtilMisc.<String, Object>toMap("returnId", returnId,
>
> "statusId", "RETURN_RECEIVED",
>
> "userLogin", userLogin));
> } catch (GenericServiceException e) {
> @@ -594,7 +594,7 @@
> }
> } else if (currentStatus != null &&
> "RETURN_RECEIVED".equals(currentStatus)) {
> try {
> - dispatcher.runSync("updateReturnHeader",
> UtilMisc.toMap("returnId", returnId,
> + dispatcher.runSync("updateReturnHeader",
> UtilMisc.<String, Object>toMap("returnId", returnId,
>
> "statusId", "RETURN_COMPLETED",
>
> "userLogin", userLogin));
> } catch (GenericServiceException e) {
> @@ -766,7 +766,7 @@
> // create the payment applications for the return invoice
> try {
> serviceResults = dispatcher.runSync
> ("createPaymentApplicationsFromReturnItemResponse",
> - UtilMisc.toMap("returnItemResponseId",
> itemResponseId, "userLogin", userLogin));
> + UtilMisc.<String,
> Object>toMap("returnItemResponseId", itemResponseId, "userLogin",
> userLogin));
> if (ServiceUtil.isError(serviceResults)) {
> return ServiceUtil.returnError(
> UtilProperties.getMessage(resource_error,"OrderProblemCreatingPaymentApplicationRecord",
> locale), null, null, serviceResults);
> }
> @@ -1026,7 +1026,7 @@
> if (electronicTypes.contains(paymentMethodTypeId))
> {
> try {
> // for electronic types such as
> CREDIT_CARD and EFT_ACCOUNT, use refundPayment service
> - serviceResult = dispatcher.runSync("refundPayment",
> UtilMisc.toMap("orderPaymentPreference", orderPaymentPreference,
> "refundAmount", new Double(amountToRefund.setScale(decimals,
> rounding).doubleValue()), "userLogin", userLogin));
> + serviceResult = dispatcher.runSync("refundPayment",
> UtilMisc.<String, Object>toMap("orderPaymentPreference",
> orderPaymentPreference, "refundAmount", new Double(amountToRefund.setScale(decimals,
> rounding).doubleValue()), "userLogin", userLogin));
> if (ServiceUtil.isError(serviceResult)
> || ServiceUtil.isFailure(serviceResult)) {
> Debug.logError("Error in refund
> payment: " + ServiceUtil.getErrorMessage(serviceResult), module);
> continue;
> @@ -1039,7 +1039,7 @@
> } else if (paymentMethodTypeId.equals("EXT_BILLACT"))
> {
> try {
> // for Billing Account refunds
> - serviceResult = dispatcher.runSync("refundBillingAccountPayment",
> UtilMisc.toMap("orderPaymentPreference", orderPaymentPreference,
> "refundAmount", new Double(amountToRefund.setScale(decimals,
> rounding).doubleValue()), "userLogin", userLogin));
> + serviceResult = dispatcher.runSync("refundBillingAccountPayment",
> UtilMisc.<String, Object>toMap("orderPaymentPreference",
> orderPaymentPreference, "refundAmount", new Double(amountToRefund.setScale(decimals,
> rounding).doubleValue()), "userLogin", userLogin));
> if (ServiceUtil.isError(serviceResult)
> || ServiceUtil.isFailure(serviceResult)) {
> Debug.logError("Error in refund
> payment: " + ServiceUtil.getErrorMessage(serviceResult), module);
> continue;
> @@ -1108,7 +1108,7 @@
> // Create the payment applications for the
> return invoice
> try {
> serviceResults = dispatcher.runSync
> ("createPaymentApplicationsFromReturnItemResponse",
> - UtilMisc.toMap("returnItemResponseId",
> responseId, "userLogin", userLogin));
> + UtilMisc.<String,
> Object>toMap("returnItemResponseId", responseId, "userLogin", userLogin));
> if (ServiceUtil.isError(serviceResults))
> {
> return ServiceUtil.returnError(
> UtilProperties.getMessage(resource_error,"OrderProblemUpdatingReturnItemReturnItemResponseId",
> locale), null, null, serviceResults);
> }
> @@ -1227,7 +1227,7 @@
> GenericValue billingAccount = orh.getBillingAccount();
> if (UtilValidate.isNotEmpty(billingAccount.getString("billingAccountId")))
> {
> try {
> - Map paymentApplResult = dispatcher.runSync("createPaymentApplication",
> UtilMisc.toMap("paymentId", paymentId, "billingAccountId",
> billingAccount.getString("billingAccountId"),
> + Map paymentApplResult = dispatcher.runSync("createPaymentApplication",
> UtilMisc.<String, Object>toMap("paymentId", paymentId, "billingAccountId",
> billingAccount.getString("billingAccountId"),
> "amountApplied", refundAmount,
> "userLogin", userLogin));
> if (ServiceUtil.isError(paymentApplResult)) {
> return paymentApplResult;
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
> Sun Oct 21 11:19:34 2007
> @@ -261,7 +261,7 @@
> try {
> // count product ordered quantities
> // run this synchronously so it will run in the same
> transaction
> - dispatcher.runSync("countProductQuantityOrdered",
> UtilMisc.toMap("productId", currentProductId, "quantity",
> orderItem.getDouble("quantity"), "userLogin", userLogin));
> + dispatcher.runSync("countProductQuantityOrdered",
> UtilMisc.<String, Object>toMap("productId", currentProductId, "quantity",
> orderItem.getDouble("quantity"), "userLogin", userLogin));
> } catch (GenericServiceException e1) {
> Debug.logError(e1, "Error calling
> countProductQuantityOrdered service", module);
> return ServiceUtil.returnError(
> UtilProperties.getMessage(resource_error,"OrderErrorCallingCountProductQuantityOrderedService",locale)
> + e1.toString());
> @@ -584,7 +584,7 @@
> while (orderInternalNotesIt.hasNext()) {
> String orderInternalNote = (String)
> orderInternalNotesIt.next();
> try {
> - Map noteOutputMap = dispatcher.runSync("createOrderNote",
> UtilMisc.toMap("orderId", orderId,
> + Map noteOutputMap = dispatcher.runSync("createOrderNote",
> UtilMisc.<String, Object>toMap("orderId", orderId,
> "internalNote",
> "Y",
> "note",
> orderInternalNote,
> "userLogin",
> userLogin));
> @@ -606,7 +606,7 @@
> while (orderNotesIt.hasNext()) {
> String orderNote = (String) orderNotesIt.next();
> try {
> - Map noteOutputMap = dispatcher.runSync("createOrderNote",
> UtilMisc.toMap("orderId", orderId,
> + Map noteOutputMap = dispatcher.runSync("createOrderNote",
> UtilMisc.<String, Object>toMap("orderId", orderId,
> "internalNote",
> "N",
> "note",
> orderNote,
> "userLogin",
> userLogin));
> @@ -1266,7 +1266,7 @@
> String orderId = orderHeader.getString("orderId");
> Map resetResult = null;
> try {
> - resetResult = dispatcher.runSync("resetGrandTotal",
> UtilMisc.toMap("orderId", orderId, "userLogin", userLogin));
> + resetResult = dispatcher.runSync("resetGrandTotal",
> UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, "ERROR: Cannot reset order totals -
> " + orderId, module);
> }
> @@ -1957,7 +1957,7 @@
>
> if (newItemStatusId != null) {
> try {
> - Map resp = dispatcher.runSync("changeOrderItemStatus",
> UtilMisc.toMap("orderId", orderId, "statusId", newItemStatusId,
> "userLogin", userLogin));
> + Map resp = dispatcher.runSync("changeOrderItemStatus",
> UtilMisc.<String, Object>toMap("orderId", orderId, "statusId",
> newItemStatusId, "userLogin", userLogin));
> if (ServiceUtil.isError(resp)) {
> return ServiceUtil.returnError("Error changing
> item status to " + newItemStatusId, null, null, resp);
> }
> @@ -3089,7 +3089,7 @@
>
> // log an order note
> try {
> - dispatcher.runSync("createOrderNote", UtilMisc.toMap("orderId",
> orderId, "note", "Added item to order: " +
> + dispatcher.runSync("createOrderNote", UtilMisc.<String,
> Object>toMap("orderId", orderId, "note", "Added item to order: " +
> productId + " (" + quantity + ")", "internalNote",
> "Y", "userLogin", userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> @@ -3253,7 +3253,7 @@
>
> // log an order note
> try {
> - dispatcher.runSync("createOrderNote", UtilMisc.toMap("orderId",
> orderId, "note", "Updated order.", "internalNote", "Y", "userLogin",
> userLogin));
> + dispatcher.runSync("createOrderNote", UtilMisc.<String,
> Object>toMap("orderId", orderId, "note", "Updated order.", "internalNote",
> "Y", "userLogin", userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> }
> @@ -3276,7 +3276,7 @@
> // load the order into a shopping cart
> Map loadCartResp = null;
> try {
> - loadCartResp = dispatcher.runSync("loadCartFromOrder",
> UtilMisc.toMap("orderId", orderId,
> + loadCartResp = dispatcher.runSync("loadCartFromOrder",
> UtilMisc.<String, Object>toMap("orderId", orderId,
>
> "skipInventoryChecks", Boolean.TRUE, // the items are already reserved, no
> need to check again
>
> "skipProductChecks", Boolean.TRUE, // the products are already in the
> order, no need to check their validity now
>
> "userLogin", userLogin));
> @@ -3373,7 +3373,7 @@
> // cancel exiting authorizations
> Map releaseResp = null;
> try {
> - releaseResp = dispatcher.runSync("releaseOrderPayments",
> UtilMisc.toMap("orderId", orderId, "userLogin", userLogin));
> + releaseResp = dispatcher.runSync("releaseOrderPayments",
> UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> throw new GeneralException(e.getMessage());
> @@ -4124,7 +4124,7 @@
> while (cqit.hasNext()) {
> String productId = (String) cqit.next();
> Double requiredQuantity = (Double)
> productRequirementQuantities.get(productId);
> - Map createRequirementResult = dispatcher.runSync("createRequirement",
> UtilMisc.toMap("requirementTypeId", "PRODUCT_REQUIREMENT", "facilityId",
> facilityId, "productId", productId, "quantity", requiredQuantity,
> "userLogin", userLogin));
> + Map createRequirementResult = dispatcher.runSync("createRequirement",
> UtilMisc.<String, Object>toMap("requirementTypeId", "PRODUCT_REQUIREMENT",
> "facilityId", facilityId, "productId", productId, "quantity",
> requiredQuantity, "userLogin", userLogin));
> if (ServiceUtil.isError(createRequirementResult)) return
> createRequirementResult;
> }
>
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java
> Sun Oct 21 11:19:34 2007
> @@ -121,7 +121,7 @@
> if (UtilValidate.isNotEmpty(taxAuthPartyGeoIds)) {
> try {
> Map createCustomerTaxAuthInfoResult =
> dispatcher.runSync("createCustomerTaxAuthInfo",
> - UtilMisc.toMap("partyId", cart.getPartyId(),
> "taxAuthPartyGeoIds", taxAuthPartyGeoIds, "partyTaxId", partyTaxId,
> "isExempt", isExempt, "userLogin", userLogin));
> + UtilMisc.<String, Object>toMap("partyId",
> cart.getPartyId(), "taxAuthPartyGeoIds", taxAuthPartyGeoIds, "partyTaxId",
> partyTaxId, "isExempt", isExempt, "userLogin", userLogin));
> ServiceUtil.getMessages(request,
> createCustomerTaxAuthInfoResult, null);
> if (ServiceUtil.isError(createCustomerTaxAuthInfoResult))
> {
> return "error";
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java
> Sun Oct 21 11:19:34 2007
> @@ -947,7 +947,7 @@
> try {
> // invoke the payment gateway service.
> paymentResult = dispatcher.runSync("authOrderPayments",
> - UtilMisc.toMap("orderId", orderId, "userLogin",
> userLogin), 180, false);
> + UtilMisc.<String, Object>toMap("orderId",
> orderId, "userLogin", userLogin), 180, false);
> } catch (GenericServiceException e) {
> Debug.logWarning(e, module);
> throw new GeneralException("Error in authOrderPayments
> service: " + e.toString(), e.getNested());
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
> Sun Oct 21 11:19:34 2007
> @@ -3865,7 +3865,7 @@
> // Find a supplier for the product
> String supplierPartyId = null;
> try {
> - Map getSuppliersForProductResult = dispatcher.runSync("getSuppliersForProduct",
> UtilMisc.toMap("productId", productId, "quantity", new
> Double(dropShipQuantity), "canDropShip", "Y", "currencyUomId",
> getCurrency()));
> + Map getSuppliersForProductResult = dispatcher.runSync("getSuppliersForProduct",
> UtilMisc.<String, Object>toMap("productId", productId, "quantity", new
> Double(dropShipQuantity), "canDropShip", "Y", "currencyUomId",
> getCurrency()));
> List supplierProducts = (List)
> getSuppliersForProductResult.get("supplierProducts");
>
> // Order suppliers by supplierPrefOrderId so that
> preferred suppliers are used first
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
> Sun Oct 21 11:19:34 2007
> @@ -1150,7 +1150,7 @@
> ShoppingCart cart = null;
> try {
> Map outMap = dispatcher.runSync("loadCartFromShoppingList",
> - UtilMisc.toMap("shoppingListId", shoppingListId,
> + UtilMisc.<String, Object>toMap("shoppingListId",
> shoppingListId,
> "userLogin", userLogin));
> cart = (ShoppingCart)outMap.get("shoppingCart");
> } catch(GenericServiceException exc) {
> @@ -1177,7 +1177,7 @@
> ShoppingCart cart = null;
> try {
> Map outMap = dispatcher.runSync("loadCartFromQuote",
> - UtilMisc.toMap("quoteId", quoteId,
> + UtilMisc.<String, Object>toMap("quoteId", quoteId,
> "applyQuoteAdjustments", "true",
> "userLogin", userLogin));
> cart = (ShoppingCart) outMap.get("shoppingCart");
> @@ -1210,7 +1210,7 @@
> ShoppingCart cart = null;
> try {
> Map outMap = dispatcher.runSync("loadCartFromOrder",
> - UtilMisc.toMap("orderId",
> quoteId,
> + UtilMisc.<String,
> Object>toMap("orderId", quoteId,
> "userLogin",
> userLogin));
> cart = (ShoppingCart) outMap.get("shoppingCart");
> } catch (GenericServiceException exc) {
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
> Sun Oct 21 11:19:34 2007
> @@ -891,7 +891,7 @@
> protected boolean isInventoryAvailableOrNotRequired(double quantity,
> String productStoreId, LocalDispatcher dispatcher) throws
> CartItemModifyException {
> boolean inventoryAvailable = true;
> try {
> - Map invReqResult = dispatcher.runSync("isStoreInventoryAvailableOrNotRequired",
> UtilMisc.toMap("productStoreId", productStoreId, "productId", productId,
> "product", this.getProduct(), "quantity", new Double(quantity)));
> + Map invReqResult = dispatcher.runSync("isStoreInventoryAvailableOrNotRequired",
> UtilMisc.<String, Object>toMap("productStoreId", productStoreId,
> "productId", productId, "product", this.getProduct(), "quantity", new
> Double(quantity)));
> if (ServiceUtil.isError(invReqResult)) {
> Debug.logError("Error calling
> isStoreInventoryAvailableOrNotRequired service, result is: " + invReqResult,
> module);
> throw new CartItemModifyException((String)
> invReqResult.get(ModelService.ERROR_MESSAGE));
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java
> Sun Oct 21 11:19:34 2007
> @@ -1104,7 +1104,7 @@
> // check inventory on this product, make sure it
> is available before going on
> //NOTE: even though the store may not require
> inventory for purchase, we will always require inventory for gifts
> try {
> - Map invReqResult = dispatcher.runSync("isStoreInventoryAvailable",
> UtilMisc.toMap("productStoreId", productStoreId, "productId", productId,
> "product", product, "quantity", new Double(quantity)));
> + Map invReqResult = dispatcher.runSync("isStoreInventoryAvailable",
> UtilMisc.<String, Object>toMap("productStoreId", productStoreId,
> "productId", productId, "product", product, "quantity", new
> Double(quantity)));
> if (ServiceUtil.isError(invReqResult)) {
> Debug.logError("Error calling
> isStoreInventoryAvailable service, result is: " + invReqResult, module);
> throw new
> CartItemModifyException((String) invReqResult.get(
> ModelService.ERROR_MESSAGE));
> @@ -1133,7 +1133,7 @@
> String optionProductId = (String)
> optionProductIdIter.next();
>
> try {
> - Map invReqResult = dispatcher.runSync("isStoreInventoryAvailable",
> UtilMisc.toMap("productStoreId", productStoreId, "productId",
> optionProductId, "product", product, "quantity", new Double(quantity)));
> + Map invReqResult = dispatcher.runSync("isStoreInventoryAvailable",
> UtilMisc.<String, Object>toMap("productStoreId", productStoreId,
> "productId", optionProductId, "product", product, "quantity", new
> Double(quantity)));
> if (ServiceUtil.isError(invReqResult)) {
> Debug.logError("Error calling
> isStoreInventoryAvailable service, result is: " + invReqResult, module);
> throw new CartItemModifyException((String)
> invReqResult.get(ModelService.ERROR_MESSAGE));
>
> Modified:
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
> (original)
> +++
> ofbiz/trunk/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListEvents.java
> Sun Oct 21 11:19:34 2007
> @@ -97,7 +97,7 @@
> // create a new shopping list
> Map newListResult = null;
> try {
> - newListResult = dispatcher.runSync("createShoppingList",
> UtilMisc.toMap("userLogin", userLogin, "productStoreId",
> cart.getProductStoreId(), "partyId", cart.getOrderPartyId(),
> "currencyUom", cart.getCurrency()));
> + newListResult = dispatcher.runSync("createShoppingList",
> UtilMisc.<String, Object>toMap("userLogin", userLogin, "productStoreId",
> cart.getProductStoreId(), "partyId", cart.getOrderPartyId(),
> "currencyUom", cart.getCurrency()));
> } catch (GenericServiceException e) {
> Debug.logError(e, "Problems creating new ShoppingList",
> module);
> errMsg = UtilProperties.getMessage(resource,"
> shoppinglistevents.cannot_create_new_shopping_list", cart.getLocale());
>
> Modified:
> ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
> (original)
> +++
> ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
> Sun Oct 21 11:19:34 2007
> @@ -105,7 +105,7 @@
> if (ServiceUtil.isError(tmpResult)) {
> errorMessages.add(ServiceUtil.getErrorMessage
> (tmpResult));
> } else {
> - Map completeResult = dispatcher.runSync("setCommEventComplete",
> UtilMisc.toMap("communicationEventId", communicationEventId, "userLogin",
> userLogin));
> + Map completeResult = dispatcher.runSync("setCommEventComplete",
> UtilMisc.<String, Object>toMap("communicationEventId", communicationEventId,
> "userLogin", userLogin));
> if (ServiceUtil.isError(completeResult)) {
> errorMessages.add(ServiceUtil.getErrorMessage
> (completeResult));
> }
> @@ -308,7 +308,7 @@
> // assume it's a success unless updateCommunicationEvent gives us
> an error
> Map result = ServiceUtil.returnSuccess();
> try {
> - Map tmpResult = dispatcher.runSync("updateCommunicationEvent",
> UtilMisc.toMap("communicationEventId", communicationEventId,
> + Map tmpResult = dispatcher.runSync("updateCommunicationEvent",
> UtilMisc.<String, Object>toMap("communicationEventId", communicationEventId,
> "statusId", "COM_COMPLETE", "userLogin", userLogin));
> if (ServiceUtil.isError(result)) {
> result = ServiceUtil.returnError(
> ServiceUtil.getErrorMessage(result));
>
> Modified:
> ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
> (original)
> +++
> ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
> Sun Oct 21 11:19:34 2007
> @@ -1011,7 +1011,7 @@
> String contactMechId = contactMech.getString
> ("contactMechId");
>
> // create a new party contact mech for the partyIdTo
> - Map serviceResults = dispatcher.runSync("createPartyContactMech",
> UtilMisc.toMap("partyId", partyIdTo, "userLogin", userLogin,
> + Map serviceResults = dispatcher.runSync("createPartyContactMech",
> UtilMisc.<String, Object>toMap("partyId", partyIdTo, "userLogin", userLogin,
> "contactMechId", contactMechId, "fromDate",
> UtilDateTime.nowTimestamp(),
> "allowSolicitation",
> partyContactMech.getString("allowSolicitation"), "extension",
> partyContactMech.getString("extension")));
> if (ServiceUtil.isError(serviceResults)) {
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
> Sun Oct 21 11:19:34 2007
> @@ -625,7 +625,7 @@
> String orderId = (String) orderNotifyIter.next();
>
> try {
> - dispatcher.runAsync("sendOrderBackorderNotification",
> UtilMisc.toMap("orderId", orderId, "userLogin", userLogin));
> + dispatcher.runAsync("sendOrderBackorderNotification",
> UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, "Problems sending off the
> notification", module);
> continue;
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductServices.java
> Sun Oct 21 11:19:34 2007
> @@ -239,7 +239,7 @@
>
> // next check inventory for each item: if inventory is not
> required or is available
> try {
> - Map invReqResult = dispatcher.runSync("isStoreInventoryAvailableOrNotRequired",
> UtilMisc.toMap("productStoreId", productStoreId, "productId", productIdTo,
> "quantity", new Double(1.0)));
> + Map invReqResult = dispatcher.runSync("isStoreInventoryAvailableOrNotRequired",
> UtilMisc.<String, Object>toMap("productStoreId", productStoreId,
> "productId", productIdTo, "quantity", new Double(1.0)));
> if (ServiceUtil.isError(invReqResult)) {
> return ServiceUtil.returnError("Error calling the
> isStoreInventoryRequired when building the variant product tree.", null,
> null, invReqResult);
> } else if ("Y".equals((String) invReqResult.get("availableOrNotRequired")))
> {
> @@ -909,7 +909,7 @@
> if (salesDiscontinuationDate != null &&
> salesDiscontinuationDate.before(UtilDateTime.nowTimestamp())) {
> Map invRes = null;
> try {
> - invRes = dispatcher.runSync("getProductInventoryAvailable",
> UtilMisc.toMap("productId", productId, "userLogin", userLogin));
> + invRes = dispatcher.runSync("getProductInventoryAvailable",
> UtilMisc.<String, Object>toMap("productId", productId, "userLogin",
> userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> return ServiceUtil.returnError(e.getMessage
> ());
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java
> Sun Oct 21 11:19:34 2007
> @@ -277,7 +277,7 @@
> // Debug.logInfo("Virtual product ID to make
> stand-alone: " + productId, module);
> //}
> // for all virtuals with one variant move all info
> from virtual to variant and remove virtual, make variant as not a variant
> - dispatcher.runSync("mergeVirtualWithSingleVariant",
> UtilMisc.toMap("productId", productId, "removeOld", Boolean.TRUE,
> "userLogin", userLogin));
> + dispatcher.runSync("mergeVirtualWithSingleVariant",
> UtilMisc.<String, Object>toMap("productId", productId, "removeOld",
> Boolean.TRUE, "userLogin", userLogin));
>
> numWithOneOnly++;
> if (numWithOneOnly % 100 == 0) {
> @@ -312,7 +312,7 @@
> Debug.logInfo("Virtual product with ID " + productId
> + " should have 1 assoc, has " + paList.size(), module);
> } else {
> // for all virtuals with one valid variant move info
> from virtual to variant, put variant in categories from virtual, remove
> virtual from all categories but leave "family" otherwise intact, mark
> variant as not a variant
> - dispatcher.runSync("mergeVirtualWithSingleVariant",
> UtilMisc.toMap("productId", productId, "removeOld", Boolean.FALSE,
> "userLogin", userLogin));
> + dispatcher.runSync("mergeVirtualWithSingleVariant",
> UtilMisc.<String, Object>toMap("productId", productId, "removeOld",
> Boolean.FALSE, "userLogin", userLogin));
>
> numWithOneValid++;
> if (numWithOneValid % 100 == 0) {
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/product/promo/PromoServices.java
> Sun Oct 21 11:19:34 2007
> @@ -205,7 +205,7 @@
> if (line.length() > 0 && !line.startsWith("#")) {
> if (UtilValidate.isEmail(line)) {
> // valid email address
> - Map result = dispatcher.runSync("createProductPromoCodeEmail",
> UtilMisc.toMap("productPromoCodeId",
> + Map result = dispatcher.runSync("createProductPromoCodeEmail",
> UtilMisc.<String, Object>toMap("productPromoCodeId",
> productPromoCodeId, "emailAddress", line,
> "userLogin", userLogin));
> if (result != null && ServiceUtil.isError(result))
> {
> errors.add(line + ": " +
> ServiceUtil.getErrorMessage(result));
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
> Sun Oct 21 11:19:34 2007
> @@ -806,7 +806,7 @@
> // remove the shipment info
> Map clearResp = null;
> try {
> - clearResp = dispatcher.runSync("clearShipmentStaging",
> UtilMisc.toMap("shipmentId", shipmentId, "userLogin", userLogin));
> + clearResp = dispatcher.runSync("clearShipmentStaging",
> UtilMisc.<String, Object>toMap("shipmentId", shipmentId, "userLogin",
> userLogin));
> } catch (GenericServiceException e) {
> Debug.logError(e, module);
> return ServiceUtil.returnError(e.getMessage());
> @@ -853,7 +853,7 @@
> // If there are shipment receipts, the shipment must have
> been shipped, so set the shipment status to PURCH_SHIP_SHIPPED if it's only
> PURCH_SHIP_CREATED
> GenericValue shipment = delegator.findByPrimaryKey("Shipment",
> UtilMisc.toMap("shipmentId", shipmentId));
> if ((! UtilValidate.isEmpty(shipment)) &&
> "PURCH_SHIP_CREATED".equals(shipment.getString("statusId"))) {
> - Map updateShipmentMap = dispatcher.runSync("updateShipment",
> UtilMisc.toMap("shipmentId", shipmentId, "statusId", "PURCH_SHIP_SHIPPED",
> "userLogin", userLogin));
> + Map updateShipmentMap = dispatcher.runSync("updateShipment",
> UtilMisc.<String, Object>toMap("shipmentId", shipmentId, "statusId",
> "PURCH_SHIP_SHIPPED", "userLogin", userLogin));
> if (ServiceUtil.isError(updateShipmentMap)) return
> updateShipmentMap;
> }
>
> @@ -888,7 +888,7 @@
> }
>
> // now update the shipment
> - dispatcher.runSync("updateShipment", UtilMisc.toMap("shipmentId",
> shipmentId, "statusId", "PURCH_SHIP_RECEIVED", "userLogin", userLogin));
> + dispatcher.runSync("updateShipment", UtilMisc.<String,
> Object>toMap("shipmentId", shipmentId, "statusId", "PURCH_SHIP_RECEIVED",
> "userLogin", userLogin));
> } catch (GenericEntityException e) {
> Debug.logError(e, module);
> return ServiceUtil.returnError(e.getMessage());
> @@ -1039,7 +1039,7 @@
>
> // Convert the value to the shipment currency, if
> necessary
> GenericValue orderHeader = packageContent.getRelatedOne
> ("OrderHeader");
> - Map convertUomResult = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", orderHeader.getString("currencyUom"), "uomIdTo",
> currencyUomId, "originalValue", new Double(packageContentValue.doubleValue
> ())));
> + Map convertUomResult = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", orderHeader.getString("currencyUom"),
> "uomIdTo", currencyUomId, "originalValue", new Double(
> packageContentValue.doubleValue())));
> if (ServiceUtil.isError(convertUomResult)) return
> convertUomResult;
> if (convertUomResult.containsKey("convertedValue")) {
> packageContentValue = new BigDecimal(((Double)
> convertUomResult.get("convertedValue")).doubleValue()).setScale(decimals,
> rounding);
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
> Sun Oct 21 11:19:34 2007
> @@ -589,7 +589,7 @@
> billingWeightUomId = "WT_lb"; // TODO: this should be
> specified in a properties file
> }
> // convert
> - Map results = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", billingWeightUomId, "uomIdTo", DHL_WEIGHT_UOM_ID,
> "originalValue", billingWeight));
> + Map results = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", billingWeightUomId, "uomIdTo",
> DHL_WEIGHT_UOM_ID, "originalValue", billingWeight));
> if (ServiceUtil.isError(results) || (results.get("convertedValue")
> == null)) {
> Debug.logWarning("Unable to convert billing weights
> for shipmentId " + shipmentId , module);
> // try getting the weight from package instead
> @@ -644,7 +644,7 @@
> Debug.logWarning("Shipment Route Segment missing
> weightUomId in shipmentId " + shipmentId, module);
> weightUomId = "WT_lb"; // TODO: this should be
> specified in a properties file
> }
> - Map results = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", weightUomId, "uomIdTo", DHL_WEIGHT_UOM_ID,
> "originalValue", packageWeight));
> + Map results = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", weightUomId, "uomIdTo",
> DHL_WEIGHT_UOM_ID, "originalValue", packageWeight));
> if ((results == null) || (results.get(
> ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_ERROR)) || (
> results.get("convertedValue") == null)) {
> Debug.logWarning("Unable to convert weights for
> shipmentId " + shipmentId , module);
> packageWeight = new Double(1.0);
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
> Sun Oct 21 11:19:34 2007
> @@ -658,7 +658,7 @@
>
> // Convert the weight if necessary
> if (! billingWeightUomId.equals(weightUomId)) {
> - Map results = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", billingWeightUomId, "uomIdTo", weightUomId,
> "originalValue", billingWeight));
> + Map results = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", billingWeightUomId, "uomIdTo",
> weightUomId, "originalValue", billingWeight));
> if (ServiceUtil.isError(results) || (results.get("convertedValue")
> == null)) {
> Debug.logWarning("Unable to convert billing
> weights for shipmentId " + shipmentId , module);
>
> @@ -720,7 +720,7 @@
> }
> if (dimensionsLength != null &&
> dimensionsLength.doubleValue() > 0) {
> if (! boxDimensionsUomId.equals(dimensionsUomId))
> {
> - Map results = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", boxDimensionsUomId, "uomIdTo", dimensionsUomId,
> "originalValue", dimensionsLength));
> + Map results = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", boxDimensionsUomId, "uomIdTo",
> dimensionsUomId, "originalValue", dimensionsLength));
> if (ServiceUtil.isError(results) || (
> results.get("convertedValue") == null)) {
> Debug.logWarning("Unable to convert
> length for package " + shipmentPackage.getString("shipmentPackageSeqId") +
> " of shipmentRouteSegment " + shipmentRouteSegmentId + " of shipment " +
> shipmentId , module);
> dimensionsLength = null;
> @@ -732,7 +732,7 @@
> }
> if (dimensionsWidth != null &&
> dimensionsWidth.doubleValue() > 0) {
> if (! boxDimensionsUomId.equals(dimensionsUomId))
> {
> - Map results = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", boxDimensionsUomId, "uomIdTo", dimensionsUomId,
> "originalValue", dimensionsWidth));
> + Map results = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", boxDimensionsUomId, "uomIdTo",
> dimensionsUomId, "originalValue", dimensionsWidth));
> if (ServiceUtil.isError(results) || (
> results.get("convertedValue") == null)) {
> Debug.logWarning("Unable to convert width
> for package " + shipmentPackage.getString("shipmentPackageSeqId") + " of
> shipmentRouteSegment " + shipmentRouteSegmentId + " of shipment " +
> shipmentId , module);
> dimensionsWidth = null;
> @@ -744,7 +744,7 @@
> }
> if (dimensionsHeight != null &&
> dimensionsHeight.doubleValue() > 0) {
> if (! boxDimensionsUomId.equals(dimensionsUomId))
> {
> - Map results = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", boxDimensionsUomId, "uomIdTo", dimensionsUomId,
> "originalValue", dimensionsHeight));
> + Map results = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", boxDimensionsUomId, "uomIdTo",
> dimensionsUomId, "originalValue", dimensionsHeight));
> if (ServiceUtil.isError(results) || (
> results.get("convertedValue") == null)) {
> Debug.logWarning("Unable to convert
> height for package " + shipmentPackage.getString("shipmentPackageSeqId") +
> " of shipmentRouteSegment " + shipmentRouteSegmentId + " of shipment " +
> shipmentId , module);
> dimensionsHeight = null;
> @@ -779,7 +779,7 @@
> packageWeightUomId = weightUomId;
> }
> if (! packageWeightUomId.equals(weightUomId)) {
> - Map results = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", packageWeightUomId, "uomIdTo", weightUomId,
> "originalValue", packageWeight));
> + Map results = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", packageWeightUomId, "uomIdTo",
> weightUomId, "originalValue", packageWeight));
> if (ServiceUtil.isError(results) || (results.get("convertedValue")
> == null)) {
> ServiceUtil.returnError("Unable to convert
> weight for package " + shipmentPackage.getString("shipmentPackageSeqId") +
> " of shipmentRouteSegment " + shipmentRouteSegmentId + " of shipment " +
> shipmentId);
> } else {
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
> Sun Oct 21 11:19:34 2007
> @@ -475,7 +475,7 @@
> BigDecimal packageValue = (BigDecimal)
> getPackageValueResult.get("packageValue");
>
> // Convert the value of the COD surcharge to the
> shipment currency, if necessary
> - Map convertUomResult = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", codSurchargeCurrencyUomId, "uomIdTo",
> currencyCode, "originalValue", new Double(
> codSurchargePackageAmount.doubleValue())));
> + Map convertUomResult = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", codSurchargeCurrencyUomId,
> "uomIdTo", currencyCode, "originalValue", new Double(
> codSurchargePackageAmount.doubleValue())));
> if (ServiceUtil.isError(convertUomResult)) return
> convertUomResult;
> if (convertUomResult.containsKey("convertedValue")) {
> codSurchargePackageAmount = new
> BigDecimal(((Double) convertUomResult.get("convertedValue")).doubleValue()).setScale(decimals,
> rounding);
>
> Modified:
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
> (original)
> +++
> ofbiz/trunk/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
> Sun Oct 21 11:19:34 2007
> @@ -295,7 +295,7 @@
> // attempt a conversion to pounds
> Map result = new HashMap();
> try {
> - result = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", weightUomId, "uomIdTo", "WT_lb", "originalValue",
> new Double(productWeight)));
> + result = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", weightUomId, "uomIdTo", "WT_lb",
> "originalValue", new Double(productWeight)));
> } catch (GenericServiceException ex) {
> Debug.logError(ex, module);
> }
> @@ -905,7 +905,7 @@
> // attempt a conversion to pounds
> Map result = new HashMap();
> try {
> - result = dispatcher.runSync("convertUom",
> UtilMisc.toMap("uomId", weightUomId, "uomIdTo", "WT_lb", "originalValue",
> new Double(weight)));
> + result = dispatcher.runSync("convertUom",
> UtilMisc.<String, Object>toMap("uomId", weightUomId, "uomIdTo", "WT_lb",
> "originalValue", new Double(weight)));
> } catch (GenericServiceException ex) {
> return ServiceUtil.returnError(ex.getMessage());
> }
>
> Modified:
> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=586925&r1=586924&r2=586925&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
> (original)
> +++
> ofbiz/trunk/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java
> Sun Oct 21 11:19:34 2007
> @@ -1086,8 +1086,8 @@
> }
>
> if (fullReturnReceived) {
> - dispatcher.runSync("updateReturnHeader",
> UtilMisc.toMap("statusId", "RETURN_RECEIVED", "returnId", returnId,
> "userLogin", userLogin));
> - dispatcher.runSync("updateReturnHeader",
> UtilMisc.toMap("statusId", "RETURN_COMPLETED", "returnId", returnId,
> "userLogin", userLogin));
> + dispatcher.runSync("updateReturnHeader",
> UtilMisc.<String, Object>toMap("statusId", "RETURN_RECEIVED", "returnId",
> returnId, "userLogin", userLogin));
> + dispatcher.runSync("updateReturnHeader",
> UtilMisc.<String, Object>toMap("statusId", "RETURN_COMPLETED", "returnId",
> returnId, "userLogin", userLogin));
> }
> }
> }
>
>
>
Re: svn commit: r586925 [1/2] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/finaccount/
applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/
applications/content/src
Posted by Jacopo Cappellato <ti...@sastau.it>.
Adam Heath wrote:
> David E Jones wrote:
>> I'm interested in hearing other opinions, but I think this is a good
>> reason to delay our use of generics for certain things, especially for
>> things that should be minimally cumbersome, like dispatcher calls with
>> UtilMisc.toMap inline, which is really the primary use scenario for the
>> toMap method...
>>
>> Hopefully this new feature in Java will mature more in the near future,
>> but in the mean time we shouldn't be too aggressive in adopting and
>> using it. I know the intentions are good, but the result is what is
>> important. I'm all for progress, but from a pragmatic perspective only.
>
> I think for configuration/status methods/operations, it's ok. But I'm
> willing to undo those high-facing methods in delegator/dispatcher.
This sounds like a plan.
What is the next step on this? Adam, are you going to revert some of the
last changes or you don't have time and it is better to file a Jira
issue for this?
Jacopo
Re: svn commit: r586925 [1/2] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/finaccount/
applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/
applications/content/src
Posted by Adam Heath <do...@brainfood.com>.
David E Jones wrote:
>
> On Oct 21, 2007, at 1:04 PM, Adam Heath wrote:
>
>> It's only when you have it inline that it is a problem. javac is not
>> currently smart enough when it comes to type-inference; I've discussed
>> this with the openjdk people, and they confirmed it.
>>
>> If any part of the line uses generics, then javac attempts to make all
>> parts use it. It javac applied type-erasure to the return of toMap,
>> *and* to the call to runSync, then it would be able to find a matching
>> method to call.
>
> I'm interested in hearing other opinions, but I think this is a good
> reason to delay our use of generics for certain things, especially for
> things that should be minimally cumbersome, like dispatcher calls with
> UtilMisc.toMap inline, which is really the primary use scenario for the
> toMap method...
>
> Hopefully this new feature in Java will mature more in the near future,
> but in the mean time we shouldn't be too aggressive in adopting and
> using it. I know the intentions are good, but the result is what is
> important. I'm all for progress, but from a pragmatic perspective only.
I think for configuration/status methods/operations, it's ok. But I'm
willing to undo those high-facing methods in delegator/dispatcher.
Re: svn commit: r586925 [1/2] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/finaccount/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/content/src
Posted by David E Jones <jo...@hotwaxmedia.com>.
On Oct 21, 2007, at 1:04 PM, Adam Heath wrote:
> Scott Gray wrote:
>> That looks like a PITA, do we have to include <String, Object> on
>> all toMap
>> calls now?
>
> No.
>
> ==
> Map context = UtilMisc.toMap(....);
> dispatcher.runSync(serviceName, context);
> ==
>
> It's only when you have it inline that it is a problem. javac is not
> currently smart enough when it comes to type-inference; I've discussed
> this with the openjdk people, and they confirmed it.
>
> If any part of the line uses generics, then javac attempts to make all
> parts use it. It javac applied type-erasure to the return of toMap,
> *and* to the call to runSync, then it would be able to find a matching
> method to call.
I'm interested in hearing other opinions, but I think this is a good
reason to delay our use of generics for certain things, especially
for things that should be minimally cumbersome, like dispatcher calls
with UtilMisc.toMap inline, which is really the primary use scenario
for the toMap method...
Hopefully this new feature in Java will mature more in the near
future, but in the mean time we shouldn't be too aggressive in
adopting and using it. I know the intentions are good, but the result
is what is important. I'm all for progress, but from a pragmatic
perspective only.
-David
Re: svn commit: r586925 [1/2] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/finaccount/
applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/
applications/content/src
Posted by Adam Heath <do...@brainfood.com>.
Scott Gray wrote:
> That looks like a PITA, do we have to include <String, Object> on all toMap
> calls now?
No.
==
Map context = UtilMisc.toMap(....);
dispatcher.runSync(serviceName, context);
==
It's only when you have it inline that it is a problem. javac is not
currently smart enough when it comes to type-inference; I've discussed
this with the openjdk people, and they confirmed it.
If any part of the line uses generics, then javac attempts to make all
parts use it. It javac applied type-erasure to the return of toMap,
*and* to the call to runSync, then it would be able to find a matching
method to call.