You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2010/08/04 09:28:25 UTC
svn commit: r982144 - in /ofbiz/trunk:
applications/party/src/org/ofbiz/party/party/
applications/party/webapp/partymgr/WEB-INF/actions/party/
specialpurpose/ebay/src/org/ofbiz/ebay/
specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/
Author: lektran
Date: Wed Aug 4 07:28:25 2010
New Revision: 982144
URL: http://svn.apache.org/viewvc?rev=982144&view=rev
Log:
Replace usage of deprecated method.
Modified:
ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy
ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java
Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=982144&r1=982143&r2=982144&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java Wed Aug 4 07:28:25 2010
@@ -213,7 +213,7 @@ public class PartyWorker {
String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId,
String firstName, String middleName, String lastName) throws GeneralException {
- List<GenericValue> matching = findMatchingPartyAndPostalAddress(delegator, address1, address2, city, stateProvinceGeoId, postalCode,
+ List<GenericValue> matching = findMatchingPersonPostalAddresses(delegator, address1, address2, city, stateProvinceGeoId, postalCode,
postalCodeExt, countryGeoId, firstName, middleName, lastName);
GenericValue v = EntityUtil.getFirst(matching);
if (v != null) {
Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy?rev=982144&r1=982143&r2=982144&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy Wed Aug 4 07:28:25 2010
@@ -41,7 +41,7 @@ if (match) {
return;
}
- context.matches = PartyWorker.findMatchingPartyAndPostalAddress(delegator, address1, address2, city,
+ context.matches = PartyWorker.findMatchingPersonPostalAddresses(delegator, address1, address2, city,
state, postalCode, null, null, firstName, null, lastName);
context.addressString = PartyWorker.makeMatchingString(delegator, address1);
Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java?rev=982144&r1=982143&r2=982144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/EbayOrderServices.java Wed Aug 4 07:28:25 2010
@@ -1115,7 +1115,7 @@ public class EbayOrderServices {
String city = (String) shippingAddressCtx.get("shippingAddressCityName");
EbayHelper.correctCityStateCountry(dispatcher, shippingAddressCtx, city, state, country);
- List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shippingAddressCtx.get("shippingAddressStreet1").toString(),
+ List<GenericValue> shipInfo = PartyWorker.findMatchingPersonPostalAddresses(delegator, shippingAddressCtx.get("shippingAddressStreet1").toString(),
(UtilValidate.isEmpty(shippingAddressCtx.get("shippingAddressStreet2")) ? null : shippingAddressCtx.get("shippingAddressStreet2").toString()), shippingAddressCtx.get("city").toString(), shippingAddressCtx.get("stateProvinceGeoId").toString(),
shippingAddressCtx.get("shippingAddressPostalCode").toString(), null, shippingAddressCtx.get("countryGeoId").toString(), firstName, null, lastName);
if (UtilValidate.isNotEmpty(shipInfo)) {
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=982144&r1=982143&r2=982144&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java (original)
+++ ofbiz/trunk/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleCheckoutHelper.java Wed Aug 4 07:28:25 2010
@@ -433,7 +433,7 @@ public class GoogleCheckoutHelper {
String partyId = null;
// look for an existing shipping address
- List<GenericValue> shipInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, shipAddr.getAddress1(),
+ List<GenericValue> shipInfo = PartyWorker.findMatchingPersonPostalAddresses(delegator, shipAddr.getAddress1(),
(UtilValidate.isEmpty(shipAddr.getAddress2()) ? null : shipAddr.getAddress2()), shipAddr.getCity(), shipAddr.getRegion(),
shipAddr.getPostalCode(), null, getCountryGeoId(shipAddr.getCountryCode()), shipAddr.getStructuredName().getFirstName(),
null, shipAddr.getStructuredName().getLastName());
@@ -446,7 +446,7 @@ public class GoogleCheckoutHelper {
}
// look for an existing billing address
- List<GenericValue> billInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, billAddr.getAddress1(),
+ List<GenericValue> billInfo = PartyWorker.findMatchingPersonPostalAddresses(delegator, billAddr.getAddress1(),
(UtilValidate.isEmpty(billAddr.getAddress2()) ? null : billAddr.getAddress2()), billAddr.getCity(), billAddr.getRegion(),
billAddr.getPostalCode(), null, getCountryGeoId(billAddr.getCountryCode()), billAddr.getStructuredName().getFirstName(),
null, billAddr.getStructuredName().getLastName());
@@ -480,7 +480,7 @@ public class GoogleCheckoutHelper {
// create the billing address if necessary
if (billCmId == null) {
// check the billing address again (in case it was just created)
- billInfo = PartyWorker.findMatchingPartyAndPostalAddress(delegator, billAddr.getAddress1(),
+ billInfo = PartyWorker.findMatchingPersonPostalAddresses(delegator, billAddr.getAddress1(),
billAddr.getAddress2(), billAddr.getCity(), billAddr.getRegion(),
billAddr.getPostalCode(), null, getCountryGeoId(billAddr.getCountryCode()), billAddr.getStructuredName().getFirstName(),
null, billAddr.getStructuredName().getLastName());