svn commit: r982143 - /ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java

[lektran]

Author: lektran
Date: Wed Aug  4 07:28:06 2010
New Revision: 982143

URL: http://svn.apache.org/viewvc?rev=982143&view=rev
Log:
Deprecated (renamed) org.ofbiz.party.party.PartyWorker.findMatchingPartyAndPostalAddress(...), use findMatchingPersonPostalAddresses(...) instead.  Includes minor javadoc change.

Modified:
    ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.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=982143&r1=982142&r2=982143&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:06 2010
@@ -222,7 +222,7 @@ public class PartyWorker {
         return null;
     }
 
-    /** Finds all matching parties based on the values provided.  Excludes party records with a statusId of PARTY_DISABLED.  Results are ordered by descending PartyContactMech.fromDate.
+    /** Finds all matching PartyAndPostalAddress records based on the values provided.  Excludes party records with a statusId of PARTY_DISABLED.  Results are ordered by descending PartyContactMech.fromDate.
      * The matching process is as follows:
      * 1. Calls {@link #findMatchingPartyPostalAddress(Delegator, String, String, String, String, String, String, String, String)} to retrieve a list of address matched PartyAndPostalAddress records.  Results are limited to Parties of type PERSON.
      * 2. For each matching PartyAndPostalAddress record, the Person record for the Party is then retrieved and an upper case comparison is performed against the supplied firstName, lastName and if provided, middleName.
@@ -241,10 +241,9 @@ public class PartyWorker {
      * @return List of PartyAndPostalAddress GenericValue objects that match the supplied criteria.
      * @throws GeneralException
      */
-    public static List<GenericValue> findMatchingPartyAndPostalAddress(Delegator delegator, String address1, String address2, String city,
-                            String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId,
-                            String firstName, String middleName, String lastName) throws GeneralException {
-
+    public static List<GenericValue> findMatchingPersonPostalAddresses(Delegator delegator, String address1, String address2, String city,
+            String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId,
+            String firstName, String middleName, String lastName) throws GeneralException {
         // return list
         List<GenericValue> returnList = FastList.newInstance();
 
@@ -284,6 +283,16 @@ public class PartyWorker {
     }
 
     /**
+     * @deprecated Renamed to {@link #findMatchingPersonPartyAndPostalAddress(Delegator, String, String, String, String, String, String, String, String, String, String)}
+     */
+    @Deprecated
+    public static List<GenericValue> findMatchingPartyAndPostalAddress(Delegator delegator, String address1, String address2, String city,
+                            String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId,
+                            String firstName, String middleName, String lastName) throws GeneralException {
+        return PartyWorker.findMatchingPersonPostalAddresses(delegator, address1, address2, city, stateProvinceGeoId, postalCode, postalCodeExt, countryGeoId, firstName, middleName, lastName);
+    }
+
+    /**
      * Finds all matching parties based on the values provided.  Excludes party records with a statusId of PARTY_DISABLED.  Results are ordered by descending PartyContactMech.fromDate.
      * 1. Candidate addresses are found by querying PartyAndPostalAddress using the supplied city and if provided, stateProvinceGeoId, postalCode, postalCodeExt and countryGeoId
      * 2. In-memory address line comparisons are then performed against the supplied address1 and if provided, address2.  Address lines are compared after the strings have been converted using {@link #makeMatchingString(Delegator, String)}.