Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv6923
Modified Files:
Tag: MMBase-1_8
TreeIncludeTag.java
Log Message:
MMB-1624
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
See also: http://www.mmbase.org/jira/browse/MMB-1624
Index: TreeIncludeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/TreeIncludeTag.java,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -b -r1.15.2.1 -r1.15.2.2
--- TreeIncludeTag.java 7 Jun 2007 13:52:24 -0000 1.15.2.1
+++ TreeIncludeTag.java 13 Mar 2008 15:52:41 -0000 1.15.2.2
@@ -25,12 +25,12 @@
* A full description of this command can be found in the mmbase-taglib.xml
file.
*
* @author Johannes Verelst
- * @version $Id: TreeIncludeTag.java,v 1.15.2.1 2007/06/07 13:52:24 michiel
Exp $
+ * @version $Id: TreeIncludeTag.java,v 1.15.2.2 2008/03/13 15:52:41 michiel
Exp $
*/
public class TreeIncludeTag extends IncludeTag {
- private static final Logger log =
Logging.getLoggerInstance(TreeIncludeTag.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(TreeIncludeTag.class) ;
protected Attribute objectList = Attribute.NULL;
private TreeHelper th = new TreeHelper();
@@ -38,6 +38,8 @@
if (objectList == Attribute.NULL) {
throw new JspTagException("Attribute 'objectlist' was not
specified");
}
+ th.setCloud(getCloudVar());
+ th.setBackwardsCompatible(!
"false".equals(pageContext.getServletContext().getInitParameter("mmbase.taglib.smartpath_backwards_compatible")));
return super.doStartTag();
}
@@ -50,7 +52,8 @@
}
if (treePage == null || "".equals(treePage)) {
- throw new JspTagException("Could not find page " + orgPage);
+ //throw new JspTagException("Could not find page " + orgPage);
+ return orgPage;
}
return treePage;
@@ -60,10 +63,6 @@
}
public void doAfterBodySetValue() throws JspTagException {
- // sigh, we would of course prefer to extend, but no multiple
inheritance possible in Java..
- th.setCloud(getCloudVar());
- th.setBackwardsCompatible(!
"false".equals(pageContext.getServletContext().getInitParameter("mmbase.taglib.smartpath_backwards_compatible")));
-
// Let IncludeTag do the rest of the work
includePage();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
