Author: michiel
Date: 2009-06-08 13:50:36 +0200 (Mon, 08 Jun 2009)
New Revision: 35825
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListContainerTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListNodesContainerTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListRelationsContainerTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedContainerTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedNodesContainerTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/tree/TreeContainerTag.java
Log:
MMB-1830
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListContainerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListContainerTag.java
2009-06-08 11:25:16 UTC (rev 35824)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListContainerTag.java
2009-06-08 11:50:36 UTC (rev 35825)
@@ -90,7 +90,7 @@
public int doStartTag() throws JspTagException {
prevQuery= pageContext.getAttribute(QueryContainer.KEY,
QueryContainer.SCOPE);
if (getReferid() != null) {
- query = new QueryWrapper<Query>((Query)
getContextProvider().getContextContainer().getObject(getReferid()));
+ query = (QueryWrapper<Query>)
getContextProvider().getContextContainer().getObject(getReferid());
} else {
if (path == Attribute.NULL) {
throw new JspTagException("Path attribute is mandatory");
@@ -103,7 +103,7 @@
getContextProvider().getContextContainer().register(getId(),
query);
}
if (jspVar != null) {
- pageContext.setAttribute(jspVar, query);
+ pageContext.setAttribute(jspVar, query.query);
}
if (cachePolicy != Attribute.NULL) {
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListNodesContainerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListNodesContainerTag.java
2009-06-08 11:25:16 UTC (rev 35824)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListNodesContainerTag.java
2009-06-08 11:50:36 UTC (rev 35825)
@@ -147,7 +147,7 @@
prevQuery= pageContext.getAttribute(QueryContainer.KEY,
QueryContainer.SCOPE);
String cloneId = clone.getString(this);
if (! "".equals(cloneId)) {
- query = new
QueryWrapper<NodeQuery>(toNodeQuery(getContextProvider().getContextContainer().getObject(cloneId)));
+ query = new QueryWrapper<NodeQuery>(toNodeQuery( ((QueryWrapper)
getContextProvider().getContextContainer().getObject(cloneId)).query));
if (query == null) {
throw new JspTagException("No query found with id '" + cloneId
+ "' in " + getContextProvider().getContextContainer());
}
@@ -198,7 +198,7 @@
getContextProvider().getContextContainer().register(getId(),
query);
}
if (jspVar != null) {
- pageContext.setAttribute(jspVar, query);
+ pageContext.setAttribute(jspVar, query.query);
}
pageContext.setAttribute(QueryContainer.KEY, query,
QueryContainer.SCOPE);
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListRelationsContainerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListRelationsContainerTag.java
2009-06-08 11:25:16 UTC (rev 35824)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/ListRelationsContainerTag.java
2009-06-08 11:50:36 UTC (rev 35825)
@@ -75,7 +75,7 @@
initTag();
prevQuery= pageContext.getAttribute(QueryContainer.KEY,
QueryContainer.SCOPE);
if (getReferid() != null) {
- query = new QueryWrapper<NodeQuery>((NodeQuery)
getContextProvider().getContextContainer().getObject(getReferid()));
+ query = (QueryWrapper<NodeQuery>)
getContextProvider().getContextContainer().getObject(getReferid());
} else {
Node relatedFromNode = getNode();
Cloud cloud = relatedFromNode.getCloud();
@@ -93,7 +93,7 @@
getContextProvider().getContextContainer().register(getId(),
query);
}
if (jspVar != null) {
- pageContext.setAttribute(jspVar, query);
+ pageContext.setAttribute(jspVar, query.query);
}
pageContext.setAttribute(QueryContainer.KEY, query,
QueryContainer.SCOPE);
return EVAL_BODY;
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedContainerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedContainerTag.java
2009-06-08 11:25:16 UTC (rev 35824)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedContainerTag.java
2009-06-08 11:50:36 UTC (rev 35825)
@@ -30,7 +30,7 @@
// private static final Logger log =
Logging.getLoggerInstance(RelatedContainerTag.class);
- private Query query = null;
+ private QueryWrapper<Query> query = null;
private Object prevQuery = null;
private Attribute cachePolicy = Attribute.NULL;
private Attribute path = Attribute.NULL;
@@ -63,8 +63,10 @@
}
public Query getQuery() {
- if (query.isUsed()) query = (Query) query.clone();
- return query;
+ if (query.query.isUsed()) {
+ query.cloneQuery();
+ }
+ return query.query;
}
@@ -73,18 +75,18 @@
initTag();
prevQuery= pageContext.getAttribute(QueryContainer.KEY,
QueryContainer.SCOPE);
if (getReferid() != null) {
- query = (Query)
getContextProvider().getContextContainer().getObject(getReferid());
+ query = (QueryWrapper<Query>)
getContextProvider().getContextContainer().getObject(getReferid());
} else {
if (path == Attribute.NULL) {
throw new JspTagException("Path attribute is mandatory");
}
Node node = getNode();
Cloud cloud = node.getCloud();
- query = cloud.createQuery();
+ query = new QueryWrapper<Query>(cloud.createQuery());
- Step step = query.addStep(node.getNodeManager());
- query.setAlias(step, node.getNodeManager().getName() + "0");
- query.addNode(step, node);
+ Step step = query.query.addStep(node.getNodeManager());
+ query.query.setAlias(step, node.getNodeManager().getName() + "0");
+ query.query.addNode(step, node);
}
@@ -92,17 +94,17 @@
getContextProvider().getContextContainer().register(getId(),
query);
}
if (jspVar != null) {
- pageContext.setAttribute(jspVar, query);
+ pageContext.setAttribute(jspVar, query.query);
}
if (cachePolicy != Attribute.NULL) {
-
query.setCachePolicy(CachePolicy.getPolicy(cachePolicy.getValue(this)));
+
query.query.setCachePolicy(CachePolicy.getPolicy(cachePolicy.getValue(this)));
}
- Queries.addPath(query, (String) path.getValue(this), (String)
searchDirs.getValue(this));
+ Queries.addPath(query.query, (String) path.getValue(this), (String)
searchDirs.getValue(this));
- Queries.addFields(query, (String) fields.getValue(this));
+ Queries.addFields(query.query, (String) fields.getValue(this));
pageContext.setAttribute(QueryContainer.KEY, query,
QueryContainer.SCOPE);
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedNodesContainerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedNodesContainerTag.java
2009-06-08 11:25:16 UTC (rev 35824)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/containers/RelatedNodesContainerTag.java
2009-06-08 11:50:36 UTC (rev 35825)
@@ -115,7 +115,7 @@
getContextProvider().getContextContainer().register(getId(),
query);
}
if (jspVar != null) {
- pageContext.setAttribute(jspVar, query);
+ pageContext.setAttribute(jspVar, query.query);
}
pageContext.setAttribute(QueryContainer.KEY, query,
QueryContainer.SCOPE);
return EVAL_BODY;
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/tree/TreeContainerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/tree/TreeContainerTag.java
2009-06-08 11:25:16 UTC (rev 35824)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/tree/TreeContainerTag.java
2009-06-08 11:50:36 UTC (rev 35825)
@@ -136,7 +136,7 @@
if (jspVar != null) {
pageContext.setAttribute(jspVar, tree);
}
- pageContext.setAttribute(QueryContainer.KEY, getNodeQuery(),
QueryContainer.SCOPE);
+ pageContext.setAttribute(QueryContainer.KEY, new
QueryWrapper<NodeQuery>(getNodeQuery()), QueryContainer.SCOPE);
return EVAL_BODY;
}
@Override
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
