Author: doogie
Date: Tue May 29 04:18:41 2012
New Revision: 1343516
URL: http://svn.apache.org/viewvc?rev=1343516&view=rev
Log:
DEPRECATION: applications/party: GenericValue.getRelated/getRelatedCache
variants replaced with a getRelated that takes a boolean useCache parameter.
Modified:
ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactHelper.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy
ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
Modified:
ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=1343516&r1=1343515&r2=1343516&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
(original)
+++
ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
Tue May 29 04:18:41 2012
@@ -126,7 +126,7 @@ public class CommunicationEventServices
// check for attachments
boolean isMultiPart = false;
- List <GenericValue> comEventContents =
communicationEvent.getRelated("CommEventContentAssoc");
+ List <GenericValue> comEventContents =
communicationEvent.getRelated("CommEventContentAssoc", null, null, false);
if (UtilValidate.isNotEmpty(comEventContents)) {
isMultiPart = true;
List<Map<String, ? extends Object>> bodyParts =
FastList.newInstance();
@@ -163,7 +163,7 @@ public class CommunicationEventServices
// add other parties from roles
String sendCc = null;
String sendBcc = null;
- List <GenericValue> commRoles =
communicationEvent.getRelated("CommunicationEventRole");
+ List <GenericValue> commRoles =
communicationEvent.getRelated("CommunicationEventRole", null, null, false);
if (UtilValidate.isNotEmpty(commRoles)) {
for (GenericValue commRole : commRoles) { // 'from' and
'to' already defined on communication event
if
(commRole.getString("partyId").equals(communicationEvent.getString("partyIdFrom"))
||
commRole.getString("partyId").equals(communicationEvent.getString("partyIdTo")))
{
Modified:
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactHelper.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactHelper.java?rev=1343516&r1=1343515&r2=1343516&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactHelper.java
(original)
+++
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactHelper.java
Tue May 29 04:18:41 2012
@@ -56,7 +56,7 @@ public class ContactHelper {
List<GenericValue> partyContactMechList;
if (contactMechPurposeTypeId == null) {
- partyContactMechList = party.getRelated("PartyContactMech");
+ partyContactMechList = party.getRelated("PartyContactMech",
null, null, false);
} else {
List<GenericValue> list;
Modified:
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=1343516&r1=1343515&r2=1343516&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
(original)
+++
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java
Tue May 29 04:18:41 2012
@@ -219,7 +219,7 @@ public class ContactMechServices {
newPartyContactMech.set("thruDate", null);
try {
- Iterator<GenericValue> partyContactMechPurposes =
UtilMisc.toIterator(partyContactMech.getRelated("PartyContactMechPurpose"));
+ Iterator<GenericValue> partyContactMechPurposes =
UtilMisc.toIterator(partyContactMech.getRelated("PartyContactMechPurpose",
null, null, false));
while (partyContactMechPurposes != null &&
partyContactMechPurposes.hasNext()) {
GenericValue tempVal =
GenericValue.create(partyContactMechPurposes.next());
@@ -507,7 +507,7 @@ public class ContactMechServices {
newPartyContactMech.set("thruDate", null);
try {
- Iterator<GenericValue> partyContactMechPurposes =
UtilMisc.toIterator(partyContactMech.getRelated("PartyContactMechPurpose"));
+ Iterator<GenericValue> partyContactMechPurposes =
UtilMisc.toIterator(partyContactMech.getRelated("PartyContactMechPurpose",
null, null, false));
while (partyContactMechPurposes != null &&
partyContactMechPurposes.hasNext()) {
GenericValue tempVal =
GenericValue.create(partyContactMechPurposes.next());
@@ -706,7 +706,7 @@ public class ContactMechServices {
newPartyContactMech.set("thruDate", null);
try {
- Iterator<GenericValue> partyContactMechPurposes =
UtilMisc.toIterator(partyContactMech.getRelated("PartyContactMechPurpose"));
+ Iterator<GenericValue> partyContactMechPurposes =
UtilMisc.toIterator(partyContactMech.getRelated("PartyContactMechPurpose",
null, null, false));
while (partyContactMechPurposes != null &&
partyContactMechPurposes.hasNext()) {
GenericValue tempVal =
GenericValue.create(partyContactMechPurposes.next());
Modified:
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=1343516&r1=1343515&r2=1343516&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java
(original)
+++
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java
Tue May 29 04:18:41 2012
@@ -104,7 +104,7 @@ public class ContactMechWorker {
}
try {
- List<GenericValue> partyContactMechPurposes =
partyContactMech.getRelated("PartyContactMechPurpose");
+ List<GenericValue> partyContactMechPurposes =
partyContactMech.getRelated("PartyContactMechPurpose", null, null, false);
if (!showOld) partyContactMechPurposes =
EntityUtil.filterByDate(partyContactMechPurposes, true);
partyContactMechValueMap.put("partyContactMechPurposes",
partyContactMechPurposes);
@@ -175,7 +175,7 @@ public class ContactMechWorker {
}
try {
- List<GenericValue> facilityContactMechPurposes =
facilityContactMech.getRelated("FacilityContactMechPurpose");
+ List<GenericValue> facilityContactMechPurposes =
facilityContactMech.getRelated("FacilityContactMechPurpose", null, null, false);
if (!showOld) facilityContactMechPurposes =
EntityUtil.filterByDate(facilityContactMechPurposes, true);
facilityContactMechValueMap.put("facilityContactMechPurposes",
facilityContactMechPurposes);
@@ -351,7 +351,7 @@ public class ContactMechWorker {
Collection<GenericValue> partyContactMechPurposes = null;
try {
- partyContactMechPurposes =
EntityUtil.filterByDate(partyContactMech.getRelated("PartyContactMechPurpose"),
true);
+ partyContactMechPurposes =
EntityUtil.filterByDate(partyContactMech.getRelated("PartyContactMechPurpose",
null, null, false), true);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
}
@@ -563,7 +563,7 @@ public class ContactMechWorker {
Collection<GenericValue> facilityContactMechPurposes = null;
try {
- facilityContactMechPurposes =
EntityUtil.filterByDate(facilityContactMech.getRelated("FacilityContactMechPurpose"),
true);
+ facilityContactMechPurposes =
EntityUtil.filterByDate(facilityContactMech.getRelated("FacilityContactMechPurpose",
null, null, false), true);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
}
@@ -722,7 +722,7 @@ public class ContactMechWorker {
}
try {
- List<GenericValue> partyContactMechPurposes =
EntityUtil.filterByDate(partyContactMech.getRelated("PartyContactMechPurpose"),
true);
+ List<GenericValue> partyContactMechPurposes =
EntityUtil.filterByDate(partyContactMech.getRelated("PartyContactMechPurpose",
null, null, false), true);
postalAddressInfo.put("partyContactMechPurposes",
partyContactMechPurposes);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
@@ -758,7 +758,7 @@ public class ContactMechWorker {
Collection<GenericValue> curPartyContactMechPurposes = null;
try {
- curPartyContactMechPurposes =
EntityUtil.filterByDate(curPartyContactMech.getRelated("PartyContactMechPurpose"),
true);
+ curPartyContactMechPurposes =
EntityUtil.filterByDate(curPartyContactMech.getRelated("PartyContactMechPurpose",
null, null, false), true);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
}
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy?rev=1343516&r1=1343515&r2=1343516&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/EditShoppingList.groovy
Tue May 29 04:18:41 2012
@@ -72,7 +72,7 @@ if (shoppingListId) {
shoppingListItemTotal = 0.0;
shoppingListChildTotal = 0.0;
- shoppingListItems = shoppingList.getRelatedCache("ShoppingListItem");
+ shoppingListItems = shoppingList.getRelated("ShoppingListItem", null,
null, true);
if (shoppingListItems) {
shoppingListItemDatas = new ArrayList(shoppingListItems.size());
shoppingListItems.each { shoppingListItem ->
@@ -88,7 +88,7 @@ if (shoppingListId) {
productVariantAssocs = null;
if ("Y".equals(product.isVirtual)) {
- productVariantAssocs =
product.getRelatedCache("MainProductAssoc", [productAssocTypeId :
"PRODUCT_VARIANT"], ["sequenceNum"]);
+ productVariantAssocs =
product.getRelated("MainProductAssoc", [productAssocTypeId :
"PRODUCT_VARIANT"], ["sequenceNum"], true);
productVariantAssocs =
EntityUtil.filterByDate(productVariantAssocs);
}
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy?rev=1343516&r1=1343515&r2=1343516&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy
Tue May 29 04:18:41 2012
@@ -26,5 +26,5 @@ savedCart = EntityUtil.getFirst(delegato
if (savedCart) {
context.savedCartListId = savedCart.shoppingListId;
- context.savedCartItems = savedCart.getRelated("ShoppingListItem");
+ context.savedCartItems = savedCart.getRelated("ShoppingListItem", null,
null, false);
}
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=1343516&r1=1343515&r2=1343516&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Tue May
29 04:18:41 2012
@@ -265,7 +265,7 @@ under the License.
<#if partyRow.containsKey("userLoginId")>
${partyRow.userLoginId?default("N/A")}
<#else>
- <#assign userLogins = partyRow.getRelated("UserLogin")>
+ <#assign userLogins = partyRow.getRelated("UserLogin", null, null,
false)>
<#if (userLogins.size() > 0)>
<#if (userLogins.size() > 1)>
(${uiLabelMap.CommonMany})
