You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/10/05 02:08:39 UTC
svn commit: r821643 [2/15] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/test/
applications/accounting/src/org/ofbiz/accounting/
applications/accounting/src/org/ofbiz/accounting/agreement/
applications/accounting/src/org/ofbiz/...
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=821643&r1=821642&r2=821643&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 Mon Oct 5 00:08:27 2009
@@ -43,7 +43,7 @@
import org.ofbiz.base.util.UtilNumber;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntity;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -99,7 +99,7 @@
* TODO: it might be nice to return the paymentGatewayResponseId
*/
public static Map<String, Object> authOrderPaymentPreference(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -301,7 +301,7 @@
* @return APPROVED|FAILED|ERROR for complete processing of ALL payment methods.
*/
public static Map<String, Object> authOrderPayments(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
String orderId = (String) context.get("orderId");
Map<String, Object> result = FastMap.newInstance();
@@ -589,7 +589,7 @@
}
private static GenericValue getPaymentSettings(GenericValue orderHeader, GenericValue paymentPreference, String paymentServiceType, boolean anyServiceType) {
- GenericDelegator delegator = orderHeader.getDelegator();
+ Delegator delegator = orderHeader.getDelegator();
GenericValue paymentSettings = null;
String paymentMethodTypeId = paymentPreference.getString("paymentMethodTypeId");
@@ -677,7 +677,7 @@
* @return COMPLETE|FAILED|ERROR for complete processing of ALL payments.
*/
public static Map<String, Object> releaseOrderPayments(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String orderPaymentPreferenceId = (String) context.get("orderPaymentPreferenceId");
@@ -761,7 +761,7 @@
}
public static Map<String, Object> processCreditResult(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String currencyUomId = (String) context.get("currencyUomId");
@@ -844,7 +844,7 @@
* @return SUCCESS|FAILED|ERROR for complete processing of payment.
*/
public static Map<String, Object> releaseOrderPaymentPreference(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String orderPaymentPreferenceId = (String) context.get("orderPaymentPreferenceId");
@@ -952,7 +952,7 @@
}
public static Map<String, Object> processReleaseResult(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String currencyUomId = (String) context.get("currencyUomId");
@@ -1035,7 +1035,7 @@
* @return COMPLETE|FAILED|ERROR for complete processing of ALL payment methods.
*/
public static Map<String, Object> capturePaymentsByInvoice(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String invoiceId = (String) context.get("invoiceId");
@@ -1113,7 +1113,7 @@
* @return COMPLETE|FAILED|ERROR for complete processing of ALL payment methods.
*/
public static Map<String, Object> captureOrderPayments(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String orderId = (String) context.get("orderId");
@@ -1360,7 +1360,7 @@
public static Map<String, Object> processCaptureSplitPayment(DispatchContext dctx, Map<String, ? extends Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
@@ -1432,7 +1432,7 @@
// Deprecated: use captureBillingAccountPayments instead of this.
public static Map<String, Object> captureBillingAccountPayment(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String invoiceId = (String) context.get("invoiceId");
@@ -1515,7 +1515,7 @@
}
public static Map<String, Object> captureBillingAccountPayments(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String invoiceId = (String) context.get("invoiceId");
String billingAccountId = (String) context.get("billingAccountId");
BigDecimal captureAmount = (BigDecimal) context.get("captureAmount");
@@ -1733,7 +1733,7 @@
}
public static Map<String, Object> storePaymentErrorMessage(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
String serviceType = (String) context.get("paymentServiceTypeEnumId");
String transactionCode = (String) context.get("transCodeEnumId");
@@ -1809,7 +1809,7 @@
}
public static Map<String, Object> processAuthResult(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
Boolean authResult = (Boolean) context.get("authResult");
String authType = (String) context.get("serviceTypeEnum");
@@ -1955,7 +1955,7 @@
return ServiceUtil.returnSuccess();
}
- private static boolean needsNsfRetry(GenericValue orderPaymentPreference, Map<String, ? extends Object> processContext, GenericDelegator delegator) throws GenericEntityException {
+ private static boolean needsNsfRetry(GenericValue orderPaymentPreference, Map<String, ? extends Object> processContext, Delegator delegator) throws GenericEntityException {
boolean needsNsfRetry = false;
if (Boolean.TRUE.equals((Boolean) processContext.get("resultNsf"))) {
// only track this for auto-orders, since we will only not fail and re-try on those
@@ -2109,7 +2109,7 @@
}
public static Map<String, Object> processCaptureResult(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue paymentPreference = (GenericValue) context.get("orderPaymentPreference");
@@ -2293,7 +2293,7 @@
}
public static Map<String, Object> refundOrderPaymentPreference(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String orderPaymentPreferenceId = (String) context.get("orderPaymentPreferenceId");
@@ -2428,7 +2428,7 @@
public static Map<String, Object> processRefundResult(DispatchContext dctx, Map<String, ? extends Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
@@ -2530,7 +2530,7 @@
}
public static Map<String, Object>retryFailedOrderAuth(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
String orderId = (String) context.get("orderId");
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -2594,7 +2594,7 @@
public static Map<String, Object>retryFailedAuths(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -2639,7 +2639,7 @@
}
public static Map<String, Object>retryFailedAuthNsfs(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
LocalDispatcher dispatcher = dctx.getDispatcher();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -2810,7 +2810,7 @@
private static void savePgr(DispatchContext dctx, GenericValue pgr) {
Map<String, GenericValue> context = UtilMisc.<String, GenericValue>toMap("paymentGatewayResponse", pgr);
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
try {
dispatcher.addRollbackService("savePaymentGatewayResponse", context, true);
@@ -2821,7 +2821,7 @@
}
public static Map<String, Object> savePaymentGatewayResponse(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue pgr = (GenericValue) context.get("paymentGatewayResponse");
String message = pgr.getString("gatewayMessage");
if (message.length() > 255) {
@@ -2841,7 +2841,7 @@
public static Map<String, Object> processManualCcAuth(DispatchContext dctx, Map<String, ? extends Object> context) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
// security check
@@ -2966,7 +2966,7 @@
public static Map<String, Object> processManualCcTx(DispatchContext dctx, Map<String, ? extends Object> context) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Security security = dctx.getSecurity();
// security check
if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin)) {
@@ -3123,7 +3123,7 @@
// Verify Credit Card (Manually) Service
public static Map<String, Object>verifyCreditCard(DispatchContext dctx, Map<String, ? extends Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String productStoreId = (String) context.get("productStoreId");
String mode = (String) context.get("mode");
String paymentMethodId = (String) context.get("paymentMethodId");
@@ -3518,7 +3518,7 @@
return result;
}
- public static String getPaymentCustomMethod(GenericDelegator delegator, String customMethodId) {
+ public static String getPaymentCustomMethod(Delegator delegator, String customMethodId) {
String serviceName = null;
GenericValue customMethod = null;
try {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Mon Oct 5 00:08:27 2009
@@ -29,7 +29,7 @@
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
@@ -52,7 +52,7 @@
*/
public static Map deletePaymentMethod(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -115,7 +115,7 @@
*/
public static Map createCreditCard(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -231,7 +231,7 @@
*/
public static Map updateCreditCard(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -408,7 +408,7 @@
String paymentMethodId = (String) context.get("paymentMethodId");
// get the cc object
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue creditCard;
try {
creditCard = delegator.findByPrimaryKey("CreditCard", UtilMisc.toMap("paymentMethodId", paymentMethodId));
@@ -446,7 +446,7 @@
public static Map createGiftCard(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -499,7 +499,7 @@
public static Map updateGiftCard(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -625,7 +625,7 @@
*/
public static Map createEftAccount(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
@@ -717,7 +717,7 @@
*/
public static Map updateEftAccount(DispatchContext ctx, Map context) {
Map result = new HashMap();
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Security security = ctx.getSecurity();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentWorker.java Mon Oct 5 00:08:27 2009
@@ -33,7 +33,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilNumber;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -52,11 +52,11 @@
private static int rounding = UtilNumber.getBigDecimalRoundingMode("invoice.rounding");
// to be able to use in minilanguage where Boolean cannot be used
- public static List<Map<String, GenericValue>> getPartyPaymentMethodValueMaps(GenericDelegator delegator, String partyId) {
+ public static List<Map<String, GenericValue>> getPartyPaymentMethodValueMaps(Delegator delegator, String partyId) {
return(getPartyPaymentMethodValueMaps(delegator, partyId, false));
}
- public static List<Map<String, GenericValue>> getPartyPaymentMethodValueMaps(GenericDelegator delegator, String partyId, Boolean showOld) {
+ public static List<Map<String, GenericValue>> getPartyPaymentMethodValueMaps(Delegator delegator, String partyId, Boolean showOld) {
List<Map<String, GenericValue>> paymentMethodValueMaps = FastList.newInstance();
try {
List<GenericValue> paymentMethods = delegator.findByAnd("PaymentMethod", UtilMisc.toMap("partyId", partyId));
@@ -86,7 +86,7 @@
}
public static Map<String, Object> getPaymentMethodAndRelated(ServletRequest request, String partyId) {
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
Map<String, Object> results = FastMap.newInstance();
Boolean tryEntity = true;
@@ -155,7 +155,7 @@
return results;
}
- public static GenericValue getPaymentAddress(GenericDelegator delegator, String partyId) {
+ public static GenericValue getPaymentAddress(Delegator delegator, String partyId) {
List<GenericValue> paymentAddresses = null;
try {
paymentAddresses = delegator.findByAnd("PartyContactMechPurpose",
@@ -204,11 +204,11 @@
* @param payment GenericValue object of the Payment
* @return the applied total as BigDecimal
*/
- public static BigDecimal getPaymentApplied(GenericDelegator delegator, String paymentId) {
+ public static BigDecimal getPaymentApplied(Delegator delegator, String paymentId) {
return getPaymentApplied(delegator, paymentId, false);
}
- public static BigDecimal getPaymentApplied(GenericDelegator delegator, String paymentId, Boolean actual) {
+ public static BigDecimal getPaymentApplied(Delegator delegator, String paymentId, Boolean actual) {
if (delegator == null) {
throw new IllegalArgumentException("Null delegator is not allowed in this method");
}
@@ -231,7 +231,7 @@
* @param String paymentApplicationId
* @return the applied amount as BigDecimal
*/
- public static BigDecimal getPaymentAppliedAmount(GenericDelegator delegator, String paymentApplicationId) {
+ public static BigDecimal getPaymentAppliedAmount(Delegator delegator, String paymentApplicationId) {
GenericValue paymentApplication = null;
BigDecimal appliedAmount = BigDecimal.ZERO;
try {
@@ -307,11 +307,11 @@
return payment.getBigDecimal("amount").subtract(getPaymentApplied(payment)).setScale(decimals,rounding);
}
- public static BigDecimal getPaymentNotApplied(GenericDelegator delegator, String paymentId) {
+ public static BigDecimal getPaymentNotApplied(Delegator delegator, String paymentId) {
return getPaymentNotApplied(delegator,paymentId, false);
}
- public static BigDecimal getPaymentNotApplied(GenericDelegator delegator, String paymentId, Boolean actual) {
+ public static BigDecimal getPaymentNotApplied(Delegator delegator, String paymentId, Boolean actual) {
if (delegator == null) {
throw new IllegalArgumentException("Null delegator is not allowed in this method");
}
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java Mon Oct 5 00:08:27 2009
@@ -25,7 +25,7 @@
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -41,7 +41,7 @@
* CustomTimePeriod
*/
public static Map<String, Object> findLastClosedDate(DispatchContext dctx, Map<String, ?> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String organizationPartyId = (String) context.get("organizationPartyId"); // input parameters
String periodTypeId = (String) context.get("periodTypeId");
Timestamp findDate = (Timestamp) context.get("findDate");
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Mon Oct 5 00:08:27 2009
@@ -35,7 +35,7 @@
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.UtilNumber;
import org.ofbiz.common.geo.GeoWorker;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityCondition;
@@ -64,7 +64,7 @@
public static int salestaxRounding = UtilNumber.getBigDecimalRoundingMode("salestax.rounding");
public static Map rateProductTaxCalcForDisplay(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String productStoreId = (String) context.get("productStoreId");
String billToPartyId = (String) context.get("billToPartyId");
String productId = (String) context.get("productId");
@@ -136,7 +136,7 @@
}
public static Map rateProductTaxCalc(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String productStoreId = (String) context.get("productStoreId");
String payToPartyId = (String) context.get("payToPartyId");
String billToPartyId = (String) context.get("billToPartyId");
@@ -217,7 +217,7 @@
return result;
}
- private static void getTaxAuthorities(GenericDelegator delegator, GenericValue shippingAddress, Set taxAuthoritySet) throws GenericEntityException {
+ private static void getTaxAuthorities(Delegator delegator, GenericValue shippingAddress, Set taxAuthoritySet) throws GenericEntityException {
Set geoIdSet = FastSet.newInstance();
if (shippingAddress != null) {
if (UtilValidate.isNotEmpty(shippingAddress.getString("countryGeoId"))) {
@@ -247,7 +247,7 @@
//Debug.logInfo("Tax calc taxAuthoritySet after expand:" + taxAuthoritySet, module);
}
- private static List getTaxAdjustments(GenericDelegator delegator, GenericValue product, GenericValue productStore, String payToPartyId, String billToPartyId, Set taxAuthoritySet, BigDecimal itemPrice, BigDecimal itemAmount, BigDecimal shippingAmount, BigDecimal orderPromotionsAmount) {
+ private static List getTaxAdjustments(Delegator delegator, GenericValue product, GenericValue productStore, String payToPartyId, String billToPartyId, Set taxAuthoritySet, BigDecimal itemPrice, BigDecimal itemAmount, BigDecimal shippingAmount, BigDecimal orderPromotionsAmount) {
Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
List adjustments = FastList.newInstance();
@@ -407,7 +407,7 @@
return adjustments;
}
- private static void handlePartyTaxExempt(GenericValue adjValue, Set billToPartyIdSet, String taxAuthGeoId, String taxAuthPartyId, BigDecimal taxAmount, Timestamp nowTimestamp, GenericDelegator delegator) throws GenericEntityException {
+ private static void handlePartyTaxExempt(GenericValue adjValue, Set billToPartyIdSet, String taxAuthGeoId, String taxAuthPartyId, BigDecimal taxAmount, Timestamp nowTimestamp, Delegator delegator) throws GenericEntityException {
Debug.logInfo("Checking for tax exemption : " + taxAuthGeoId + " / " + taxAuthPartyId, module);
List ptiConditionList = UtilMisc.toList(
EntityCondition.makeCondition("partyId", EntityOperator.IN, billToPartyIdSet),
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.DispatchContext;
@@ -74,7 +74,7 @@
}
public static Map<String, Object> ccAuth(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> request = FastMap.newInstance();
Properties props = buildAIMProperties(context, delegator);
@@ -98,7 +98,7 @@
}
public static Map<String, Object> ccCapture(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
GenericValue creditCard = null;
try {
@@ -143,7 +143,7 @@
}
public static Map<String, Object> ccRefund(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
GenericValue creditCard = null;
try {
@@ -224,7 +224,7 @@
}
public static Map<String, Object> ccRelease(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
if (authTransaction == null) {
@@ -239,7 +239,7 @@
return results;
}
- private static Map<String, Object> voidTransaction(GenericValue authTransaction, Map<String, Object> context, GenericDelegator delegator) {
+ private static Map<String, Object> voidTransaction(GenericValue authTransaction, Map<String, Object> context, Delegator delegator) {
context.put("authTransaction", authTransaction);
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> request = FastMap.newInstance();
@@ -266,7 +266,7 @@
}
public static Map<String, Object> ccAuthCapture(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> request = FastMap.newInstance();
Properties props = buildAIMProperties(context, delegator);
@@ -333,7 +333,7 @@
return "true".equalsIgnoreCase((String)AIMProperties.get("testReq"));
}
- private static Properties buildAIMProperties(Map<String, Object> context, GenericDelegator delegator) {
+ private static Properties buildAIMProperties(Map<String, Object> context, Delegator delegator) {
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
String configStr = (String) context.get("paymentConfig");
if (configStr == null) {
@@ -639,7 +639,7 @@
Debug.logInfo("processAuthTransResult: " + results.toString(),module);
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName) {
String returnValue = "";
if (UtilValidate.isNotEmpty(paymentGatewayConfigId)) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Mon Oct 5 00:08:27 2009
@@ -39,7 +39,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.service.DispatchContext;
@@ -60,7 +60,7 @@
}
public static Map<String, Object> ccAuth(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
// generate the request/properties
Properties props = buildCsProperties(context, delegator);
if (props == null) {
@@ -93,7 +93,7 @@
}
public static Map<String, Object> ccCapture(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
//lets see if there is a auth transaction already in context
GenericValue authTransaction = (GenericValue) context.get("authTrans");
@@ -130,7 +130,7 @@
}
public static Map<String, Object> ccRelease(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
if (authTransaction == null) {
@@ -164,7 +164,7 @@
}
public static Map<String, Object> ccRefund(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
if (authTransaction == null) {
@@ -199,7 +199,7 @@
}
public static Map<String, Object> ccCredit(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
// generate the request/properties
Properties props = buildCsProperties(context, delegator);
if (props == null) {
@@ -227,7 +227,7 @@
return result;
}
- private static Properties buildCsProperties(Map<String, ? extends Object> context, GenericDelegator delegator) {
+ private static Properties buildCsProperties(Map<String, ? extends Object> context, Delegator delegator) {
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
String configString = (String) context.get("paymentConfig");
if (configString == null) {
@@ -268,7 +268,7 @@
return props;
}
- private static Map<String, Object> buildAuthRequest(Map<String, ? extends Object> context, GenericDelegator delegator) {
+ private static Map<String, Object> buildAuthRequest(Map<String, ? extends Object> context, Delegator delegator) {
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
String configString = (String) context.get("paymentConfig");
String currency = (String) context.get("currency");
@@ -289,7 +289,7 @@
return request;
}
- private static Map<String, Object> buildCaptureRequest(Map<String, ? extends Object> context, GenericValue authTransaction, GenericDelegator delegator) {
+ private static Map<String, Object> buildCaptureRequest(Map<String, ? extends Object> context, GenericValue authTransaction, Delegator delegator) {
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
String configString = (String) context.get("paymentConfig");
@@ -330,7 +330,7 @@
return request;
}
- private static Map<String, Object> buildRefundRequest(Map<String, ? extends Object> context, GenericValue authTransaction, GenericDelegator delegator) {
+ private static Map<String, Object> buildRefundRequest(Map<String, ? extends Object> context, GenericValue authTransaction, Delegator delegator) {
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
String configString = (String) context.get("paymentConfig");
@@ -365,7 +365,7 @@
return request;
}
- private static void appendAvsRules(Map<String, Object> request, Map<String, ? extends Object> context, GenericDelegator delegator) {
+ private static void appendAvsRules(Map<String, Object> request, Map<String, ? extends Object> context, Delegator delegator) {
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
String configString = (String) context.get("paymentConfig");
if (configString == null) {
@@ -629,7 +629,7 @@
return decision;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName) {
String returnValue = "";
if (UtilValidate.isNotEmpty(paymentGatewayConfigId)) {
@@ -653,7 +653,7 @@
return returnValue;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName, String defaultValue) {
String returnValue = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, paymentGatewayConfigParameterName, resource, parameterName);
if (UtilValidate.isEmpty(returnValue)) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java Mon Oct 5 00:08:27 2009
@@ -39,7 +39,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilDateTime;
import org.ofbiz.entity.GenericValue;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.accounting.payment.PaymentGatewayServices;
@@ -327,7 +327,7 @@
public static Map ccRefund(DispatchContext dctx, Map context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
GenericValue orderHeader = null;
try {
@@ -379,7 +379,7 @@
}
}
- private static void setCreditCardInfo(RitaApi api, GenericDelegator delegator, Map context) throws GeneralException {
+ private static void setCreditCardInfo(RitaApi api, Delegator delegator, Map context) throws GeneralException {
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
GenericValue creditCard = (GenericValue) context.get("creditCard");
if (creditCard == null) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java Mon Oct 5 00:08:27 2009
@@ -29,7 +29,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilNumber;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
@@ -63,7 +63,7 @@
public static RequestIF request = null;
public static Map<String, Object> ccAuth(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> props = buildOrbitalProperties(context, delegator);
props.put("transType", "AUTH_ONLY");
@@ -90,7 +90,7 @@
}
public static Map<String, Object> ccAuthCapture(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> props = buildOrbitalProperties(context, delegator);
props.put("transType", "AUTH_CAPTURE");
@@ -117,7 +117,7 @@
}
public static Map<String, Object> ccCapture(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> props = buildOrbitalProperties(context, delegator);
@@ -161,7 +161,7 @@
}
public static Map<String, Object> ccRefund(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> props = buildOrbitalProperties(context, delegator);
GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
@@ -203,7 +203,7 @@
}
public static Map<String, Object> ccRelease(DispatchContext ctx, Map<String, Object> context) {
- GenericDelegator delegator = ctx.getDelegator();
+ Delegator delegator = ctx.getDelegator();
Map<String, Object> results = ServiceUtil.returnSuccess();
Map<String, Object> props = buildOrbitalProperties(context, delegator);
@@ -245,7 +245,7 @@
}
- private static Map<String, Object> buildOrbitalProperties(Map<String, Object> context, GenericDelegator delegator) {
+ private static Map<String, Object> buildOrbitalProperties(Map<String, Object> context, Delegator delegator) {
//TODO: Will move this to property file and then will read it from there.
String configFile = "/applications/accounting/config/linehandler.properties";
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
@@ -276,7 +276,7 @@
return buildConfiguratorContext;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId,
String paymentGatewayConfigParameterName) {
String returnValue = "";
if (UtilValidate.isNotEmpty(paymentGatewayConfigId)) {
@@ -295,7 +295,7 @@
return returnValue;
}
- private static void buildAuthOrAuthCaptureTransaction(Map<String, Object> params, GenericDelegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) {
+ private static void buildAuthOrAuthCaptureTransaction(Map<String, Object> params, Delegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) {
GenericValue cc = (GenericValue) params.get("creditCard");
BigDecimal amount = (BigDecimal) params.get("processAmount");
String amountValue = amount.setScale(decimals, rounding).movePointRight(2).toPlainString();
@@ -376,7 +376,7 @@
}
}
- private static void buildCaptureTransaction(Map<String, Object> params, GenericDelegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) {
+ private static void buildCaptureTransaction(Map<String, Object> params, Delegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) {
GenericValue authTransaction = (GenericValue) params.get("authTransaction");
GenericValue creditCard = (GenericValue) params.get("creditCard");
BigDecimal amount = (BigDecimal) params.get("captureAmount");
@@ -447,7 +447,7 @@
}
}
- private static void buildReleaseTransaction(Map<String, Object> params, GenericDelegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) {
+ private static void buildReleaseTransaction(Map<String, Object> params, Delegator delegator, Map<String, Object> props, RequestIF request, Map<String, Object> results) {
BigDecimal amount = (BigDecimal) params.get("releaseAmount");
GenericValue authTransaction = (GenericValue) params.get("authTransaction");
String orderId = UtilFormatOut.checkNull((String)params.get("orderId"));
@@ -617,7 +617,7 @@
return formatedDate;
}
- private static String getShippingRefForOrder(String orderId, GenericDelegator delegator) {
+ private static String getShippingRefForOrder(String orderId, Delegator delegator) {
String shippingRef = "";
try {
GenericValue orderHeader = delegator.findOne("OrderHeader", false, UtilMisc.toMap("orderId", orderId));
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java Mon Oct 5 00:08:27 2009
@@ -45,7 +45,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.transaction.GenericTransactionException;
@@ -67,7 +67,7 @@
/** Initiate PayPal Request */
public static String callPayPal(HttpServletRequest request, HttpServletResponse response) {
Locale locale = UtilHttp.getLocale(request);
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
// get the orderId
@@ -181,7 +181,7 @@
/** PayPal Call-Back Event */
public static String payPalIPN(HttpServletRequest request, HttpServletResponse response) {
Locale locale = UtilHttp.getLocale(request);
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
// get the product store
@@ -404,7 +404,7 @@
return "success";
}
- private static boolean setPaymentPreferences(GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) {
+ private static boolean setPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) {
Debug.logVerbose("Setting payment prefrences..", module);
List <GenericValue> paymentPrefs = null;
try {
@@ -461,7 +461,7 @@
toStore.add(paymentPreference);
- GenericDelegator delegator = paymentPreference.getDelegator();
+ Delegator delegator = paymentPreference.getDelegator();
// create the PaymentGatewayResponse
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
@@ -509,7 +509,7 @@
return true;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName) {
String returnValue = "";
if (UtilValidate.isNotEmpty(paymentGatewayConfigId)) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Mon Oct 5 00:08:27 2009
@@ -46,7 +46,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.condition.EntityComparisonOperator;
@@ -167,7 +167,7 @@
public static Map<String, Object> payPalCheckoutUpdate(DispatchContext dctx, Map<String, Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
HttpServletRequest request = (HttpServletRequest) context.get("request");
HttpServletResponse response = (HttpServletResponse) context.get("response");
@@ -344,7 +344,7 @@
public static Map<String, Object> getExpressCheckout(DispatchContext dctx, Map<String, Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
ShoppingCart cart = (ShoppingCart) context.get("cart");
GenericValue payPalConfig = getPaymentMethodGatewayPayPal(dctx, context, null);
@@ -661,7 +661,7 @@
// that may occur.
public static Map<String, Object> doExpressCheckout(DispatchContext dctx, Map<String, Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
OrderReadHelper orh = new OrderReadHelper(delegator, paymentPref.getString("orderId"));
@@ -738,7 +738,7 @@
}
public static Map<String, Object> doAuthorization(DispatchContext dctx, Map<String, Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String orderId = (String) context.get("orderId");
BigDecimal processAmount = (BigDecimal) context.get("processAmount");
GenericValue payPalPaymentMethod = (GenericValue) context.get("payPalPaymentMethod");
@@ -929,7 +929,7 @@
}
private static GenericValue getPaymentMethodGatewayPayPal(DispatchContext dctx, Map<String, ? extends Object> context, String paymentServiceTypeEnumId) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
GenericValue payPalGatewayConfig = null;
@@ -987,7 +987,7 @@
return decoder;
}
- private static String getCountryGeoIdFromGeoCode(String geoCode, GenericDelegator delegator) {
+ private static String getCountryGeoIdFromGeoCode(String geoCode, Delegator delegator) {
String geoId = null;
try {
EntityCondition cond =EntityCondition.makeCondition(UtilMisc.toMap("geoTypeId", "COUNTRY", "geoCode", geoCode));
@@ -1001,7 +1001,7 @@
return geoId;
}
- private static String parseStateProvinceGeoId(String payPalShipToState, String countryGeoId, GenericDelegator delegator) {
+ private static String parseStateProvinceGeoId(String payPalShipToState, String countryGeoId, Delegator delegator) {
String lookupField = "geoName";
List<EntityCondition> conditionList = FastList.newInstance();
conditionList.add(EntityCondition.makeCondition("geoAssocTypeId", "REGIONS"));
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Mon Oct 5 00:08:27 2009
@@ -64,7 +64,7 @@
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -79,7 +79,7 @@
private static Map objectCache = new HashMap();
// instance variables
- protected GenericDelegator delegator = null;
+ protected Delegator delegator = null;
protected Properties props = null;
protected SecretKey kek = null;
protected SecretKey mwk = null;
@@ -89,7 +89,7 @@
protected boolean debug = false;
protected ValueLinkApi() {}
- protected ValueLinkApi(GenericDelegator delegator, Properties props) {
+ protected ValueLinkApi(Delegator delegator, Properties props) {
String mId = (String) props.get("payment.valuelink.merchantId");
String tId = (String) props.get("payment.valuelink.terminalId");
this.delegator = delegator;
@@ -109,12 +109,12 @@
/**
* Obtain an instance of the ValueLinkApi
- * @param delegator GenericDelegator used to query the encryption keys
+ * @param delegator Delegator used to query the encryption keys
* @param props Properties to use for the Api (usually payment.properties)
* @param reload When true, will replace an existing instance in the cache and reload all properties
* @return ValueLinkApi reference
*/
- public static ValueLinkApi getInstance(GenericDelegator delegator, Properties props, boolean reload) {
+ public static ValueLinkApi getInstance(Delegator delegator, Properties props, boolean reload) {
String merchantId = (String) props.get("payment.valuelink.merchantId");
if (props == null) {
throw new IllegalArgumentException("Properties cannot be null");
@@ -140,11 +140,11 @@
/**
* Obtain an instance of the ValueLinkApi; this method will always return an existing reference if one is available
- * @param delegator GenericDelegator used to query the encryption keys
+ * @param delegator Delegator used to query the encryption keys
* @param props Properties to use for the Api (usually payment.properties)
* @return
*/
- public static ValueLinkApi getInstance(GenericDelegator delegator, Properties props) {
+ public static ValueLinkApi getInstance(Delegator delegator, Properties props) {
return getInstance(delegator, props, false);
}
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Mon Oct 5 00:08:27 2009
@@ -35,7 +35,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.collections.ResourceBundleMapWrapper;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
@@ -57,7 +57,7 @@
// generate/display new public/private/kek keys
public static Map createKeys(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
ValueLinkApi vl = ValueLinkApi.getInstance(delegator, props);
vl.reload();
@@ -77,7 +77,7 @@
// test the KEK encryption
public static Map testKekEncryption(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
//GenericValue userLogin = (GenericValue) context.get("userLogin");
Properties props = getProperties(context);
@@ -127,7 +127,7 @@
// change working key service
public static Map assignWorkingKey(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
Properties props = getProperties(context);
@@ -192,7 +192,7 @@
}
public static Map activate(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String vlPromoCode = (String) context.get("vlPromoCode");
String cardNumber = (String) context.get("cardNumber");
@@ -269,7 +269,7 @@
}
public static Map linkPhysicalCard(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String virtualCard = (String) context.get("virtualCard");
String virtualPin = (String) context.get("virtualPin");
@@ -323,7 +323,7 @@
}
public static Map disablePin(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String cardNumber = (String) context.get("cardNumber");
String pin = (String) context.get("pin");
@@ -379,7 +379,7 @@
}
public static Map redeem(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String cardNumber = (String) context.get("cardNumber");
String pin = (String) context.get("pin");
@@ -446,7 +446,7 @@
}
public static Map reload(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String cardNumber = (String) context.get("cardNumber");
String pin = (String) context.get("pin");
@@ -512,7 +512,7 @@
}
public static Map balanceInquire(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String cardNumber = (String) context.get("cardNumber");
String pin = (String) context.get("pin");
@@ -568,7 +568,7 @@
}
public static Map transactionHistory(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String cardNumber = (String) context.get("cardNumber");
String pin = (String) context.get("pin");
@@ -623,7 +623,7 @@
}
public static Map refund(DispatchContext dctx, Map context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
Properties props = getProperties(context);
String cardNumber = (String) context.get("cardNumber");
String pin = (String) context.get("pin");
@@ -975,7 +975,7 @@
public static Map giftCardPurchase(DispatchContext dctx, Map context) {
// this service should always be called via FULFILLMENT_EXTASYNC
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
GenericValue orderItem = (GenericValue) context.get("orderItem");
Locale locale = (Locale) context.get("locale");
@@ -1252,7 +1252,7 @@
public static Map giftCardReload(DispatchContext dctx, Map context) {
// this service should always be called via FULFILLMENT_EXTSYNC
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
GenericValue orderItem = (GenericValue) context.get("orderItem");
Locale locale = (Locale) context.get("locale");
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/verisign/PayflowPro.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.string.FlexibleStringExpander;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.order.order.OrderReadHelper;
@@ -65,7 +65,7 @@
* @return Response map, including RESPMSG, and RESULT keys.
*/
public static Map<String, Object> ccProcessor(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
GenericValue authTrans = (GenericValue) context.get("authTrans");
String orderId = (String) context.get("orderId");
@@ -187,7 +187,7 @@
}
public static Map<String, Object> ccCapture(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
GenericValue authTrans = (GenericValue) context.get("authTrans");
BigDecimal amount = (BigDecimal) context.get("captureAmount");
@@ -262,7 +262,7 @@
}
public static Map<String, Object> ccVoid(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
GenericValue authTrans = (GenericValue) context.get("authTrans");
BigDecimal amount = (BigDecimal) context.get("releaseAmount");
@@ -338,7 +338,7 @@
}
public static Map<String, Object> ccRefund(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
BigDecimal amount = (BigDecimal) context.get("refundAmount");
String paymentGatewayConfigId = (String) context.get("paymentGatewayConfigId");
@@ -414,7 +414,7 @@
public static Map<String, Object> setExpressCheckout(DispatchContext dctx, Map<String, ? extends Object> context) {
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
ShoppingCart cart = (ShoppingCart) context.get("cart");
Locale locale = cart.getLocale();
GenericValue payPalPaymentSetting = ProductStoreWorker.getProductStorePaymentSetting(delegator, cart.getProductStoreId(), "EXT_PAYPAL", null, true);
@@ -526,7 +526,7 @@
public static Map<String, Object> getExpressCheckout(DispatchContext dctx, Map<String, Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
ShoppingCart cart = (ShoppingCart) context.get("cart");
Locale locale = cart.getLocale();
GenericValue payPalPaymentSetting = ProductStoreWorker.getProductStorePaymentSetting(delegator, cart.getProductStoreId(), "EXT_PAYPAL", null, true);
@@ -594,7 +594,7 @@
public static Map<String, Object> doExpressCheckout(DispatchContext dctx, Map<String, Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- GenericDelegator delegator = dctx.getDelegator();
+ Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
GenericValue paymentPref = (GenericValue) context.get("orderPaymentPreference");
OrderReadHelper orh = new OrderReadHelper(delegator, paymentPref.getString("orderId"));
@@ -677,7 +677,7 @@
}
return parameters;
}
- private static void parseAuthResponse(GenericDelegator delegator, String paymentGatewayConfigId, String resp, Map<String, Object> result, String resource, boolean isReAuth, boolean isPayPal) {
+ private static void parseAuthResponse(Delegator delegator, String paymentGatewayConfigId, String resp, Map<String, Object> result, String resource, boolean isReAuth, boolean isPayPal) {
Map<String, String> parameters = parseResponse(resp);
// txType
@@ -860,7 +860,7 @@
return buf.toString();
}
- private static StringBuilder makeBaseParams(GenericDelegator delegator, String paymentGatewayConfigId, String resource) {
+ private static StringBuilder makeBaseParams(Delegator delegator, String paymentGatewayConfigId, String resource) {
StringBuilder buf = new StringBuilder();
try {
@@ -882,7 +882,7 @@
return buf;
}
- private static PayflowAPI init(GenericDelegator delegator, String paymentGatewayConfigId, String resource, Map<String, ? extends Object> context) {
+ private static PayflowAPI init(Delegator delegator, String paymentGatewayConfigId, String resource, Map<String, ? extends Object> context) {
// No more used
// String certsPath = FlexibleStringExpander.expandString(getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "certsPath", resource, "payment.verisign.certsPath", "pfcerts"), context);
String hostAddress = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "hostAddress", resource, "payment.verisign.hostAddress", "pilot-payflowpro.paypal.com");
@@ -906,7 +906,7 @@
return pfp;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName) {
String returnValue = "";
if (UtilValidate.isNotEmpty(paymentGatewayConfigId)) {
@@ -930,7 +930,7 @@
return returnValue;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName, String defaultValue) {
String returnValue = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, paymentGatewayConfigParameterName, resource, parameterName);
if (UtilValidate.isEmpty(returnValue)) {
@@ -939,7 +939,7 @@
return returnValue;
}
- private static boolean comparePaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static boolean comparePaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName, String compareValue) {
boolean returnValue = false;
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java Mon Oct 5 00:08:27 2009
@@ -39,7 +39,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.transaction.GenericTransactionException;
@@ -63,7 +63,7 @@
public static String worldPayRequest(HttpServletRequest request, HttpServletResponse response) {
Locale locale = UtilHttp.getLocale(request);
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
// get the orderId from the request, stored by previous event(s)
String orderId = (String) request.getAttribute("orderId");
// get the order header
@@ -311,7 +311,7 @@
/** WorldPay notification */
public static String worldPayNotify(HttpServletRequest request, HttpServletResponse response) {
Locale locale = UtilHttp.getLocale(request);
- GenericDelegator delegator = (GenericDelegator) request.getAttribute("delegator");
+ Delegator delegator = (Delegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
GenericValue userLogin = (GenericValue) request.getSession().getAttribute("userLogin");
Map <String, Object> parametersMap = UtilHttp.getParameterMap(request);
@@ -409,7 +409,7 @@
return "success";
}
- private static boolean setPaymentPreferences(GenericDelegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) {
+ private static boolean setPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) {
Debug.logVerbose("Setting payment preferences..", module);
List<GenericValue> paymentPrefs = null;
try {
@@ -457,7 +457,7 @@
paymentPreference.set("statusId", "PAYMENT_NOT_RECEIVED");
}
toStore.add(paymentPreference);
- GenericDelegator delegator = paymentPreference.getDelegator();
+ Delegator delegator = paymentPreference.getDelegator();
// create the PaymentGatewayResponse
String responseId = delegator.getNextSeqId("PaymentGatewayResponse");
GenericValue response = delegator.makeValue("PaymentGatewayResponse");
@@ -501,7 +501,7 @@
return true;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName) {
String returnValue = "";
if (UtilValidate.isNotEmpty(paymentGatewayConfigId)) {
@@ -525,7 +525,7 @@
return returnValue;
}
- private static String getPaymentGatewayConfigValue(GenericDelegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
+ private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
String resource, String parameterName, String defaultValue) {
String returnValue = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, paymentGatewayConfigParameterName, resource, parameterName);
if (UtilValidate.isEmpty(returnValue)) {
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/util/UtilAccounting.java Mon Oct 5 00:08:27 2009
@@ -26,7 +26,7 @@
import org.ofbiz.accounting.AccountingException;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilMisc;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -50,7 +50,7 @@
* @throws AccountingException When the no accounts found or an entity exception occurs
*/
public static String getProductOrgGlAccountId(String productId,
- String glAccountTypeId, String organizationPartyId, GenericDelegator delegator)
+ String glAccountTypeId, String organizationPartyId, Delegator delegator)
throws AccountingException {
GenericValue account = null;
@@ -88,7 +88,7 @@
* @return The default account ID (glAccountId) for this type
* @throws AccountingException When the default is not configured
*/
- public static String getDefaultAccountId(String glAccountTypeId, String organizationPartyId, GenericDelegator delegator) throws AccountingException {
+ public static String getDefaultAccountId(String glAccountTypeId, String organizationPartyId, Delegator delegator) throws AccountingException {
return getProductOrgGlAccountId(null, glAccountTypeId, organizationPartyId, delegator);
}
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy Mon Oct 5 00:08:27 2009
@@ -22,7 +22,7 @@
import org.ofbiz.entity.condition.EntityCondition;
import org.ofbiz.entity.condition.EntityConditionList;
import org.ofbiz.entity.condition.EntityOperator;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.util.EntityUtil;
import javolution.util.FastList;
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java?rev=821643&r1=821642&r2=821643&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java Mon Oct 5 00:08:27 2009
@@ -37,7 +37,7 @@
import org.ofbiz.base.util.UtilHttp;
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.base.util.UtilValidate;
-import org.ofbiz.entity.GenericDelegator;
+import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.security.Security;
@@ -61,7 +61,7 @@
GenericValue userLogin = (GenericValue)session.getAttribute("userLogin");
ServletContext servletContext = session.getServletContext();
String webSiteId = (String) servletContext.getAttribute("webSiteId");
- GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator");
+ Delegator delegator = (Delegator)request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher");
Map paramMap = UtilHttp.getParameterMap(request);
//if (Debug.infoOn()) Debug.logInfo("in updateStaticValues, paramMap:" + paramMap , module);
@@ -162,7 +162,7 @@
GenericValue userLogin = (GenericValue)session.getAttribute("userLogin");
ServletContext servletContext = session.getServletContext();
String webSiteId = (String) servletContext.getAttribute("webSiteId");
- GenericDelegator delegator = (GenericDelegator)request.getAttribute("delegator");
+ Delegator delegator = (Delegator)request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher)request.getAttribute("dispatcher");
Map paramMap = UtilHttp.getParameterMap(request);
//if (Debug.infoOn()) Debug.logInfo("in updatePublishLinks, paramMap:" + paramMap , module);