cmailleux 2005/09/16 11:55:23 CEST
Modified files:
core/src/java/org/jahia/data/fields ExpressionContext.java
Log:
Avoid creation of resource consuming object if not usable (for field without
expression)
Revision Changes Path
1.4 +15 -6
jahia/core/src/java/org/jahia/data/fields/ExpressionContext.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/fields/ExpressionContext.java.diff?r1=1.3&r2=1.4&f=h
Index: ExpressionContext.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/fields/ExpressionContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExpressionContext.java 5 Jul 2005 15:46:01 -0000 1.3
+++ ExpressionContext.java 16 Sep 2005 09:55:23 -0000 1.4
@@ -1,10 +1,10 @@
package org.jahia.data.fields;
-import org.jahia.params.ProcessingContext;
+import org.jahia.data.beans.JahiaBean;
import org.jahia.data.beans.PageBean;
import org.jahia.data.beans.SiteBean;
-import org.jahia.data.beans.JahiaBean;
import org.jahia.data.beans.RequestBean;
+import org.jahia.params.ProcessingContext;
import org.jahia.gui.GuiBean;
/**
@@ -27,33 +27,42 @@
public ExpressionContext(ProcessingContext processingContext) {
if (processingContext != null) {
- pageBean = new PageBean(processingContext.getPage(),
processingContext);
- siteBean = new SiteBean(processingContext.getSite(),
processingContext);
- jahiaBean = new JahiaBean(processingContext);
+ this.processingContext = processingContext;
user = processingContext.getUser();
- requestBean = new RequestBean(new GuiBean(processingContext),
processingContext);
}
}
public org.jahia.data.beans.PageBean getPageBean() {
+ if (processingContext != null && pageBean==null) {
+ pageBean = new PageBean(processingContext.getPage(),
processingContext);
+ }
return pageBean;
}
public void setPageBean(org.jahia.data.beans.PageBean pageBean) {
this.pageBean = pageBean;
}
public org.jahia.data.beans.SiteBean getSiteBean() {
+ if (processingContext != null && siteBean==null) {
+ siteBean = new SiteBean(processingContext.getSite(),
processingContext);
+ }
return siteBean;
}
public void setSiteBean(org.jahia.data.beans.SiteBean siteBean) {
this.siteBean = siteBean;
}
public org.jahia.data.beans.RequestBean getRequestBean() {
+ if (processingContext != null && requestBean==null) {
+ requestBean = new RequestBean(new GuiBean(processingContext),
processingContext);
+ }
return requestBean;
}
public void setRequestBean(org.jahia.data.beans.RequestBean requestBean)
{
this.requestBean = requestBean;
}
public org.jahia.data.beans.JahiaBean getJahiaBean() {
+ if (processingContext != null && jahiaBean==null) {
+ jahiaBean = new JahiaBean(processingContext);
+ }
return jahiaBean;
}
public void setJahiaBean(org.jahia.data.beans.JahiaBean jahiaBean) {
