Author: tdraier
Date: Mon Aug 13 14:52:40 2007
New Revision: 18165
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18165&repname=
=3Djahia
Log:
simplified tag api , introduced constant
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/cont=
ainer/ContainerCacheTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerCacheTag.java&re=
v=3D18165&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerCacheTag.java Mon Aug 13 14:52:40 2007
@@ -33,7 +33,6 @@
org.apache.log4j.Logger.getLogger(ContainerTag.class);
=
private JahiaContainer container =3D null;
- private JahiaContainer firstContainer =3D null;
private JahiaContainerList containerList =3D null;
private String containerContent =3D null;
private int counter =3D 1;
@@ -82,8 +81,8 @@
}
=
public int doStartTag() throws JspException {
- oldCacheTag =3D (ContainerCache) pageContext.getAttribute("cacheta=
g");
- pageContext.setAttribute("cachetag", this);
+ oldCacheTag =3D (ContainerCache) pageContext.getAttribute(Containe=
rTag.CACHETAG);
+ pageContext.setAttribute(ContainerTag.CACHETAG, this);
=
ContainerListTag cListTag =3D (ContainerListTag) findAncestorWithC=
lass(this, ContainerListTag.class);
ContainerTag containerTag =3D (ContainerTag) findAncestorWithClass=
(this, ContainerTag.class);
@@ -143,7 +142,6 @@
}
container =3D null;
containerList =3D null;
- firstContainer =3D null;
containerContent =3D null;
counter =3D 1;
cacheKey =3D null;
@@ -151,7 +149,7 @@
dependencies =3D null;
display =3D true;
=
- pageContext.setAttribute("cachetag", oldCacheTag);
+ pageContext.setAttribute(ContainerTag.CACHETAG, oldCacheTag);
oldCacheTag =3D null;
=
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/cont=
ainer/ContainerTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/container/ContainerTag.java&rev=3D1=
8165&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/container/=
ContainerTag.java Mon Aug 13 14:52:40 2007
@@ -34,6 +34,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyTagSupport;
import java.io.IOException;
import java.util.Enumeration;
@@ -79,6 +80,7 @@
=
private boolean initLoop =3D true;
private boolean display =3D true;
+ public static final String CACHETAG =3D "cachetag";
=
/**
* @jsp:attribute name=3D"id" required=3D"false" rtexprvalue=3D"tr=
ue"
@@ -135,8 +137,8 @@
}
=
public int doStartTag() throws JspException {
- oldCacheTag =3D (ContainerCache) pageContext.getAttribute("cacheta=
g");
- pageContext.setAttribute("cachetag", this);
+ oldCacheTag =3D (ContainerCache) pageContext.getAttribute(CACHETAG=
);
+ pageContext.setAttribute(CACHETAG, this);
initLoop =3D true;
dependencies =3D new HashSet();
ContainerListTag cListTag =3D (ContainerListTag) findAncestorWithC=
lass(this, ContainerListTag.class);
@@ -257,7 +259,7 @@
initLoop =3D true;
jData =3D null;
=
- pageContext.setAttribute("cachetag", oldCacheTag);
+ pageContext.setAttribute(CACHETAG, oldCacheTag);
oldCacheTag =3D null;
=
display =3D true;
@@ -267,6 +269,13 @@
return EVAL_PAGE;
}
=
+ public static void addContainerListDependency(PageContext pageContext,=
int listId) {
+ ContainerCache oldCacheTag =3D (ContainerCache) pageContext.getAtt=
ribute(CACHETAG);
+ if (oldCacheTag !=3D null) {
+ oldCacheTag.addContainerListDependency(listId);
+ }
+ }
+
public void addContainerListDependency(int listId) {
dependencies.add(new ContentContainerListKey(listId));
=
@@ -275,6 +284,13 @@
ancestor.addContainerListDependency(listId);
}
=
+ public static void addContainerDependency(PageContext pageContext, int=
containerId) {
+ ContainerCache oldCacheTag =3D (ContainerCache) pageContext.getAtt=
ribute(CACHETAG);
+ if (oldCacheTag !=3D null) {
+ oldCacheTag.addContainerListDependency(containerId);
+ }
+ }
+
public void addContainerDependency(int containerId) {
dependencies.add(new ContentContainerKey(containerId));
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
