And Asserts right below method definitions rule! -Adrian
--- On Wed, 8/4/10, Scott Gray <[email protected]> wrote: > From: Scott Gray <[email protected]> > Subject: Re: svn commit: r982141 - > /ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java > To: [email protected] > Date: Wednesday, August 4, 2010, 12:51 AM > Long conditionals are certainly no > fun :-) > > Regards > Scott > > On 4/08/2010, at 7:31 PM, Adrian Crum wrote: > > > Guard blocks are bliss. > > > > -Adrian > > > > --- On Wed, 8/4/10, [email protected] > <[email protected]> > wrote: > > > >> From: [email protected] > <[email protected]> > >> Subject: svn commit: r982141 - > /ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyWorker.java > >> To: [email protected] > >> Date: Wednesday, August 4, 2010, 12:27 AM > >> Author: lektran > >> Date: Wed Aug 4 07:27:49 2010 > >> New Revision: 982141 > >> > >> URL: http://svn.apache.org/viewvc?rev=982141&view=rev > >> Log: > >> Replace a long "if not empty" block with an "if > empty" > >> early return, no functional changes > >> > >> 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=982141&r1=982140&r2=982141&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:27:49 2010 > >> @@ -293,60 +293,63 @@ public class PartyWorker { > >> > >> List<GenericValue> addresses = > >> > EntityUtil.filterByDate(delegator.findList("PartyAndPostalAddress", > >> addrCond, null, sort, null, false)); > >> > >> //Debug.log("Checking for matching > >> address: " + addrCond.toString() + "[" + > addresses.size() + > >> "]", module); > >> > >> + if > >> (UtilValidate.isEmpty(addresses)) { > >> + // No > address > >> matches, return an empty list > >> + return > >> returnList; > >> + } > >> + > >> > >> List<GenericValue> validFound > = > >> FastList.newInstance(); > >> - if > >> (UtilValidate.isNotEmpty(addresses)) { > >> - // > check the > >> address line > >> - for > >> (GenericValue address: addresses) { > >> - > // > >> address 1 field > >> - > > >> String addr1Source = > >> PartyWorker.makeMatchingString(delegator, > address1); > >> - > > >> String addr1Target = > >> PartyWorker.makeMatchingString(delegator, > >> address.getString("address1")); > >> - > >> - > if > >> (addr1Target != null) { > >> - > > >> Debug.log("Comparing > address1 : " + > >> addr1Source + " / " + addr1Target, module); > >> - > > >> if > (addr1Target.equals(addr1Source)) { > >> - > >> - > > >> // address 2 > field > >> - > > >> if (address2 > != null) { > >> - > > >> > String addr2Source > >> = PartyWorker.makeMatchingString(delegator, > address2); > >> - > > >> > String addr2Target > >> = PartyWorker.makeMatchingString(delegator, > >> address.getString("address2")); > >> - > > >> > if (addr2Target != > >> null) { > >> - > > >> > > >> Debug.log("Comparing address2 : " + addr2Source + > " / " + > >> addr2Target, module); > >> - > >> - > > >> > if > >> (addr2Source.equals(addr2Target)) { > >> - > > >> > > >> Debug.log("Matching > address2; adding valid > >> address", module); > >> - > > >> > > >> validFound.add(address); > >> - > > >> > > >> > //validParty.put(address.getString("partyId"), > >> address.getString("contactMechId")); > >> - > > >> > } > >> - > > >> > } > >> - > > >> } else { > >> - > > >> > if > >> (address.get("address2") == null) { > >> - > > >> > > >> Debug.log("No address2; adding valid address", > module); > >> + // check the address > line > >> + for (GenericValue > address: > >> addresses) { > >> + // > address 1 > >> field > >> + String > >> addr1Source = > PartyWorker.makeMatchingString(delegator, > >> address1); > >> + String > >> addr1Target = > PartyWorker.makeMatchingString(delegator, > >> address.getString("address1")); > >> + > >> + if > (addr1Target > >> != null) { > >> + > > >> Debug.log("Comparing address1 : " + addr1Source + > " / " + > >> addr1Target, module); > >> + > if > >> (addr1Target.equals(addr1Source)) { > >> + > >> + > > >> // address 2 field > >> + > > >> if (address2 != null) { > >> + > > >> String > addr2Source = > >> PartyWorker.makeMatchingString(delegator, > address2); > >> + > > >> String > addr2Target = > >> PartyWorker.makeMatchingString(delegator, > >> address.getString("address2")); > >> + > > >> if > (addr2Target != null) { > >> + > > >> > >> Debug.log("Comparing address2 : " + addr2Source + > " / " + > >> addr2Target, module); > >> + > >> + > > >> > if > >> (addr2Source.equals(addr2Target)) { > >> + > > >> > > >> Debug.log("Matching address2; adding valid > address", > >> module); > >> > > >> > >> validFound.add(address); > >> > > >> > >> > //validParty.put(address.getString("partyId"), > >> address.getString("contactMechId")); > >> > > >> } > >> > > >> } > >> + > > >> } else { > >> + > > >> if > (address.get("address2") == > >> null) { > >> + > > >> > Debug.log("No > >> address2; adding valid address", module); > >> + > > >> > >> validFound.add(address); > >> + > > >> > >> //validParty.put(address.getString("partyId"), > >> address.getString("contactMechId")); > >> + > > >> } > >> > > >> } > >> > >> } > >> } > >> + } > >> > >> - if > >> (UtilValidate.isNotEmpty(validFound)) { > >> - > > >> for (GenericValue partyAndAddr: validFound) { > >> - > > >> String partyId = > >> partyAndAddr.getString("partyId"); > >> - > > >> if > (UtilValidate.isNotEmpty(partyId)) { > >> - > > >> GenericValue > p = > >> delegator.findByPrimaryKey("Person", > >> UtilMisc.toMap("partyId", partyId)); > >> - > > >> if (p != > null) { > >> - > > >> > String fName = > >> p.getString("firstName"); > >> - > > >> > String lName = > >> p.getString("lastName"); > >> - > > >> > String mName = > >> p.getString("middleName"); > >> - > > >> > if > >> > (lName.toUpperCase().equals(lastName.toUpperCase())) { > >> - > > >> > if > >> > (fName.toUpperCase().equals(firstName.toUpperCase())) { > >> - > > >> > > >> if (mName != null > && middleName != > >> null) { > >> - > > >> > > >> if > >> > (mName.toUpperCase().equals(middleName.toUpperCase())) { > >> - > > >> > > >> > >> returnList.add(partyAndAddr); > >> - > > >> > > >> } > >> - > > >> > > >> } else if (middleName == > null) { > >> + if > >> (UtilValidate.isNotEmpty(validFound)) { > >> + for > >> (GenericValue partyAndAddr: validFound) { > >> + > > >> String partyId = > partyAndAddr.getString("partyId"); > >> + > if > >> (UtilValidate.isNotEmpty(partyId)) { > >> + > > >> GenericValue p = > >> delegator.findByPrimaryKey("Person", > >> UtilMisc.toMap("partyId", partyId)); > >> + > > >> if (p != null) { > >> + > > >> String fName > = > >> p.getString("firstName"); > >> + > > >> String lName > = > >> p.getString("lastName"); > >> + > > >> String mName > = > >> p.getString("middleName"); > >> + > > >> if > >> > (lName.toUpperCase().equals(lastName.toUpperCase())) { > >> + > > >> > if > >> > (fName.toUpperCase().equals(firstName.toUpperCase())) { > >> + > > >> > if > >> (mName != null && middleName != null) { > >> + > > >> > > >> if > >> > (mName.toUpperCase().equals(middleName.toUpperCase())) { > >> > > >> > > >> > >> returnList.add(partyAndAddr); > >> > > >> > > >> } > >> + > > >> > } > >> else if (middleName == null) { > >> + > > >> > > >> > returnList.add(partyAndAddr); > >> > > >> > >> } > >> > > >> } > >> > > >> } > >> @@ -355,6 +358,7 @@ public class PartyWorker { > >> } > >> } > >> > >> + > >> return > returnList; > >> } > >> > >> > >> > >> > > > > > > > >
