You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/29 06:11:20 UTC
svn commit: r1343478 - in /ofbiz/trunk/framework:
common/src/org/ofbiz/common/geo/ common/webcommon/includes/
entity/src/org/ofbiz/entity/ entity/src/org/ofbiz/entity/test/
entity/src/org/ofbiz/entity/util/
entityext/src/org/ofbiz/entityext/permission/...
Author: doogie
Date: Tue May 29 04:11:19 2012
New Revision: 1343478
URL: http://svn.apache.org/viewvc?rev=1343478&view=rev
Log:
DEPRECATION: framework: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter.
Modified:
ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java
ofbiz/trunk/framework/common/webcommon/includes/states.ftl
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityTypeUtil.java
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/geo/GeoWorker.java Tue May 29 04:11:19 2012
@@ -70,7 +70,7 @@ public class GeoWorker {
for (GenericValue nextGeoAssoc: thisGeoAssoc) {
GenericValue nextGeo = null;
try {
- nextGeo = nextGeoAssoc.getRelatedOne("MainGeo");
+ nextGeo = nextGeoAssoc.getRelatedOne("MainGeo", false);
} catch (GenericEntityException e) {
Debug.logError(e, "Unable to get related Geo", module);
}
Modified: ofbiz/trunk/framework/common/webcommon/includes/states.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/states.ftl?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/states.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/states.ftl Tue May 29 04:11:19 2012
@@ -29,7 +29,7 @@ under the License.
</#if>
<#list stateAssocs as stateAssoc>
- <#assign state = stateAssoc.getRelatedOne("AssocGeo")>
+ <#assign state = stateAssoc.getRelatedOne("AssocGeo", false)>
<option value='${state.geoId}'>${state.geoName?default(state.geoId)}</option>
</#list>
-->
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java Tue May 29 04:11:19 2012
@@ -345,7 +345,7 @@ public class GenericValue extends Generi
GenericValue value = relatedOneCache.get(relationName);
if (value == null) {
- value = getRelatedOne(relationName);
+ value = getRelatedOne(relationName, false);
if (value != null) relatedOneCache.put(relationName, value);
}
return value;
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/test/EntityTestSuite.java Tue May 29 04:11:19 2012
@@ -310,7 +310,7 @@ public class EntityTestSuite extends Ent
ArrayList<GenericValue> testings = new ArrayList<GenericValue>();
for (GenericValue nodeMember: values) {
- testings.add(nodeMember.getRelatedOne("Testing"));
+ testings.add(nodeMember.getRelatedOne("Testing", false));
}
// and remove the nodeMember afterwards
delegator.removeAll(values);
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityTypeUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityTypeUtil.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityTypeUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityTypeUtil.java Tue May 29 04:11:19 2012
@@ -39,7 +39,7 @@ public class EntityTypeUtil {
public static boolean isType(Collection<GenericValue> thisCollection, String typeRelation, GenericValue targetType) {
for (GenericValue value: thisCollection) {
try {
- GenericValue related = value.getRelatedOne(typeRelation);
+ GenericValue related = value.getRelatedOne(typeRelation, false);
if (isType(related, targetType)) {
return true;
} // else keep looking
@@ -72,7 +72,7 @@ public class EntityTypeUtil {
private static GenericValue getParentType(GenericValue typeValue) {
// assumes Parent relation is "Parent<entityName>"
try {
- return typeValue.getRelatedOneCache("Parent" + typeValue.getEntityName());
+ return typeValue.getRelatedOne("Parent" + typeValue.getEntityName(), true);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
return null;
Modified: ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java (original)
+++ ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/permission/EntityPermissionChecker.java Tue May 29 04:11:19 2012
@@ -835,7 +835,7 @@ public class EntityPermissionChecker {
GenericValue party = null;
String partyTypeId = null;
try {
- party = contentRole.getRelatedOne("Party");
+ party = contentRole.getRelatedOne("Party", false);
partyTypeId = (String)party.get("partyTypeId");
if (partyTypeId != null && partyTypeId.equals("PARTY_GROUP")) {
Map<String, Object> map = FastMap.newInstance();
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/GetRelatedOne.java Tue May 29 04:11:19 2012
@@ -67,11 +67,7 @@ public class GetRelatedOne extends Metho
return true;
}
try {
- if (useCache) {
- toValueAcsr.put(methodContext, value.getRelatedOneCache(relationName));
- } else {
- toValueAcsr.put(methodContext, value.getRelatedOne(relationName));
- }
+ toValueAcsr.put(methodContext, value.getRelatedOne(relationName, useCache));
} catch (GenericEntityException e) {
String errMsg = "ERROR: Could not complete the " + simpleMethod.getShortDescription() + " process [problem getting related one from entity with name " + value.getEntityName() + " for the relation-name: " + relationName + ": " + e.getMessage() + "]";
Debug.logError(e, errMsg, module);
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/calendar/TemporalExpressionWorker.java Tue May 29 04:11:19 2012
@@ -146,7 +146,7 @@ public class TemporalExpressionWorker {
}
Set<TemporalExpression> exprList = new TreeSet<TemporalExpression>();
for (GenericValue value : valueList) {
- exprList.add(makeTemporalExpression(delegator, value.getRelatedOne("ToTemporalExpression")));
+ exprList.add(makeTemporalExpression(delegator, value.getRelatedOne("ToTemporalExpression", false)));
}
return exprList;
}
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/JobManager.java Tue May 29 04:11:19 2012
@@ -460,7 +460,7 @@ public class JobManager {
// cancel has been flagged, no more recurrence
return null;
}
- GenericValue ri = job.getRelatedOne("RecurrenceInfo");
+ GenericValue ri = job.getRelatedOne("RecurrenceInfo", false);
if (ri != null) {
return new RecurrenceInfo(ri);
Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java Tue May 29 04:11:19 2012
@@ -280,7 +280,7 @@ public class PersistedServiceJob extends
try {
GenericValue jobObj = getJob();
if (!UtilValidate.isEmpty(jobObj.getString("runtimeDataId"))) {
- GenericValue contextObj = jobObj.getRelatedOne("RuntimeData");
+ GenericValue contextObj = jobObj.getRelatedOne("RuntimeData", false);
if (contextObj != null) {
context = UtilGenerics.checkMap(XmlSerializer.deserialize(contextObj.getString("runtimeInfo"), delegator), String.class, Object.class);
}
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java Tue May 29 04:11:19 2012
@@ -91,7 +91,7 @@ public class ControlEventListener implem
GenericValue userLogin = (GenericValue) session.getAttribute("userLogin");
if (userLogin != null && userLoginSessionString != null) {
GenericValue userLoginSession = null;
- userLoginSession = userLogin.getRelatedOne("UserLoginSession");
+ userLoginSession = userLogin.getRelatedOne("UserLoginSession", false);
if (userLoginSession == null) {
userLoginSession = userLogin.getDelegator().makeValue("UserLoginSession",
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Tue May 29 04:11:19 2012
@@ -568,8 +568,8 @@ public class LoginWorker {
if (modelUserLogin.isField("partyId")) {
// if partyId is a field, then we should have these relations defined
try {
- GenericValue person = userLogin.getRelatedOne("Person");
- GenericValue partyGroup = userLogin.getRelatedOne("PartyGroup");
+ GenericValue person = userLogin.getRelatedOne("Person", false);
+ GenericValue partyGroup = userLogin.getRelatedOne("PartyGroup", false);
if (person != null) session.setAttribute("person", person);
if (partyGroup != null) session.setAttribute("partyGroup", partyGroup);
} catch (GenericEntityException e) {
@@ -1055,7 +1055,7 @@ public class LoginWorker {
GenericValue userLoginSession;
Map<String, Object> userLoginSessionMap = null;
try {
- userLoginSession = userLogin.getRelatedOne("UserLoginSession");
+ userLoginSession = userLogin.getRelatedOne("UserLoginSession", false);
if (userLoginSession != null) {
Object deserObj = XmlSerializer.deserialize(userLoginSession.getString("sessionData"), delegator);
//don't check, just cast, if it fails it will get caught and reported below; if (deserObj instanceof Map)
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java Tue May 29 04:11:19 2012
@@ -601,11 +601,7 @@ public abstract class ModelWidgetAction
}
GenericValue value = (GenericValue) valueObject;
try {
- if (useCache) {
- toValueNameAcsr.put(context, value.getRelatedOneCache(relationName));
- } else {
- toValueNameAcsr.put(context, value.getRelatedOne(relationName));
- }
+ toValueNameAcsr.put(context, value.getRelatedOne(relationName, useCache));
} catch (GenericEntityException e) {
String errMsg = "Problem getting related one from entity with name " + value.getEntityName() + " for the relation-name: " + relationName + ": " + e.getMessage();
Debug.logError(e, errMsg, module);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=1343478&r1=1343477&r2=1343478&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Tue May 29 04:11:19 2012
@@ -602,11 +602,7 @@ public abstract class ModelScreenAction
}
GenericValue value = (GenericValue) valueObject;
try {
- if (useCache) {
- toValueNameAcsr.put(context, value.getRelatedOneCache(relationName));
- } else {
- toValueNameAcsr.put(context, value.getRelatedOne(relationName));
- }
+ toValueNameAcsr.put(context, value.getRelatedOne(relationName, useCache));
} catch (GenericEntityException e) {
String errMsg = "Problem getting related one from entity with name " + value.getEntityName() + " for the relation-name: " + relationName + ": " + e.getMessage();
Debug.logError(e, errMsg, module);