[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow HasPageTag.java TreeHasPageTag.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv16512

Modified Files:
      Tag: MMBase-1_8
        HasPageTag.java TreeHasPageTag.java 
Log Message:
like mm:treeinclude made treehaspage fall beack to normal including


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow


Index: HasPageTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/HasPageTag.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- HasPageTag.java     18 Oct 2005 16:42:34 -0000      1.1
+++ HasPageTag.java     28 Jan 2008 13:50:20 -0000      1.1.2.1
@@ -14,6 +14,7 @@
 import java.net.*;
 import java.io.*;
 import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.http.*;
 import javax.servlet.*;
@@ -27,7 +28,7 @@
 /**
  *
  * @author Michiel Meeuwissen
- * @version $Id: HasPageTag.java,v 1.1 2005/10/18 16:42:34 michiel Exp $
+ * @version $Id: HasPageTag.java,v 1.1.2.1 2008/01/28 13:50:20 michiel Exp $
  * @since MMBase-1.8
  */
 
@@ -48,13 +49,8 @@
         return inverse.getBoolean(this, false);
     }
 
-
-
-    public int doStartTag() throws JspTagException {
-        if (page == Attribute.NULL) {
-            throw new JspTagException("Attribute 'page' was not specified");
-        }
-        String resource = page.getString(this);
+    protected static String getResource(PageContext pageContext, String page) {
+        String resource = page;
         if (! resource.startsWith("/")) {
             HttpServletRequest request = 
(HttpServletRequest)pageContext.getRequest();
             // Fetch the current servlet from request attribute.
@@ -75,6 +71,14 @@
             }
             
         }
+        return resource;
+    }
+
+    public int doStartTag() throws JspTagException {
+        if (page == Attribute.NULL) {
+            throw new JspTagException("Attribute 'page' was not specified");
+        }
+        String resource = getResource(pageContext, page.getString(this));
         try {
             if 
(ResourceLoader.getWebRoot().getResource(resource).openConnection().getDoInput()
 != getInverse()) {
                 return EVAL_BODY;


Index: TreeHasPageTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/TreeHasPageTag.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- TreeHasPageTag.java 24 Jan 2008 16:47:44 -0000      1.1.2.2
+++ TreeHasPageTag.java 28 Jan 2008 13:50:20 -0000      1.1.2.3
@@ -27,7 +27,7 @@
 /**
  *
  * @author Michiel Meeuwissen
- * @version $Id: TreeHasPageTag.java,v 1.1.2.2 2008/01/24 16:47:44 michiel Exp 
$
+ * @version $Id: TreeHasPageTag.java,v 1.1.2.3 2008/01/28 13:50:20 michiel Exp 
$
  * @since MMBase-1.8.6
  */
 
@@ -68,6 +68,10 @@
             String treePage = th.findTreeFile(page.getString(this), 
objectList.getString(this), pageContext.getSession());
             log.debug("Testing " + treePage);
             boolean has =  treePage != null && ! "".equals(treePage) && 
ResourceLoader.getWebRoot().getResource(treePage).openConnection().getDoInput();
+            if (! has) {
+                String resource = HasPageTag.getResource(pageContext, 
page.getString(this));
+                has = 
ResourceLoader.getWebRoot().getResource(resource).openConnection().getDoInput();
+            }
             if (has != getInverse()){
                 return EVAL_BODY;
             } else {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs