svn commit: r1343521 - in /ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout: GoogleCheckoutHelper.java GoogleRequestServices.java

[doogie-3]

Author: doogie
Date: Tue May 29 04:19:40 2012
New Revision: 1343521

URL: http://svn.apache.org/viewvc?rev=1343521&view=rev
Log:
DEPRECATION: specialpurpose/googlecheckout: GenericValue.getRelated/getRelatedCache variants replaced with a getRelated that takes a boolean useCache parameter.

Modified:
    ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
    ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java

Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java?rev=1343521&r1=1343520&r2=1343521&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Tue May 29 04:19:40 2012
@@ -148,7 +148,7 @@ public class GoogleCheckoutHelper {
         }
         if (UtilValidate.isNotEmpty(orders)) {
             GenericValue order = EntityUtil.getFirst(orders);
-            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference");
+            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference", null, null, false);
             if (UtilValidate.isNotEmpty(orderPaymentPreferences)) {
                 orderPaymentPreference = EntityUtil.getFirst(orderPaymentPreferences);
                 BigDecimal maxAmount = new BigDecimal(info.getAuthorizationAmount());
@@ -177,7 +177,7 @@ public class GoogleCheckoutHelper {
         }
         if (UtilValidate.isNotEmpty(orders)) {
             GenericValue order = EntityUtil.getFirst(orders);
-            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference");
+            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference", null, null, false);
             if (UtilValidate.isNotEmpty(orderPaymentPreferences)) {
                 orderPaymentPreference = EntityUtil.getFirst(orderPaymentPreferences);
                 BigDecimal maxAmount = new BigDecimal(info.getTotalChargeAmount());
@@ -207,7 +207,7 @@ public class GoogleCheckoutHelper {
         }
         if (UtilValidate.isNotEmpty(orders)) {
             GenericValue order = EntityUtil.getFirst(orders);
-            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference");
+            List<GenericValue> orderPaymentPreferences = order.getRelated("OrderPaymentPreference", null, null, false);
             if (UtilValidate.isNotEmpty(orderPaymentPreferences)) {
                 orderPaymentPreference = EntityUtil.getFirst(orderPaymentPreferences);
                 BigDecimal maxAmount = new BigDecimal(info.getTotalRefundAmount());

Modified: ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=1343521&r1=1343520&r2=1343521&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Tue May 29 04:19:40 2012
@@ -540,10 +540,10 @@ public class GoogleRequestServices {
                         if (UtilValidate.isNotEmpty(packageContent)) {
                             GenericValue shipPackage = packageContent.getRelatedOne("ShipmentPackage", false);
                             if (UtilValidate.isNotEmpty(shipPackage)) {
-                                List<GenericValue> prs = shipPackage.getRelated("ShipmentPackageRouteSeg");
+                                List<GenericValue> prs = shipPackage.getRelated("ShipmentPackageRouteSeg", null, null, false);
                                 GenericValue packageRoute = EntityUtil.getFirst(prs);
                                 if (UtilValidate.isNotEmpty(packageRoute)) {
-                                    List<GenericValue> srs = packageRoute.getRelated("ShipmentRouteSegment");
+                                    List<GenericValue> srs = packageRoute.getRelated("ShipmentRouteSegment", null, null, false);
                                     GenericValue route = EntityUtil.getFirst(srs);
                                     String track = packageRoute.getString("trackingCode");
                                     if (UtilValidate.isNotEmpty(route)) {