Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions
In directory james.mmbase.org:/tmp/cvs-serv7912
Modified Files:
BooleanFunctionTag.java FunctionTag.java HasFunctionTag.java
ListFunctionTag.java NodeFunctionTag.java
NodeListFunctionTag.java VoidFunctionTag.java
Log Message:
MMB-1705
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions
See also: http://www.mmbase.org/jira/browse/MMB-1705
Index: BooleanFunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/BooleanFunctionTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- BooleanFunctionTag.java 30 Jan 2005 16:46:38 -0000 1.4
+++ BooleanFunctionTag.java 14 Aug 2008 13:58:49 -0000 1.5
@@ -22,7 +22,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: BooleanFunctionTag.java,v 1.4 2005/01/30 16:46:38 nico Exp $
+ * @version $Id: BooleanFunctionTag.java,v 1.5 2008/08/14 13:58:49 michiel Exp
$
*/
public class BooleanFunctionTag extends AbstractFunctionTag implements
Condition, FunctionContainerReferrer {
@@ -37,6 +37,7 @@
}
public int doStartTag() throws JspTagException {
+ initTag();
Object value = getFunctionValue();
boolean booleanValue = Casting.toBoolean(value);
return (booleanValue != getInverse()) ? EVAL_BODY_BUFFERED : SKIP_BODY;
Index: FunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/FunctionTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- FunctionTag.java 14 Mar 2005 19:02:35 -0000 1.5
+++ FunctionTag.java 14 Aug 2008 13:58:49 -0000 1.6
@@ -20,11 +20,12 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: FunctionTag.java,v 1.5 2005/03/14 19:02:35 michiel Exp $
+ * @version $Id: FunctionTag.java,v 1.6 2008/08/14 13:58:49 michiel Exp $
*/
public class FunctionTag extends AbstractFunctionTag implements Writer,
FunctionContainerReferrer {
public int doStartTag() throws JspTagException {
+ initTag();
Object value = getFunctionValue();
helper.setValue(value);
return EVAL_BODY_BUFFERED;
Index: HasFunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/HasFunctionTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- HasFunctionTag.java 8 May 2006 21:51:38 -0000 1.3
+++ HasFunctionTag.java 14 Aug 2008 13:58:49 -0000 1.4
@@ -19,7 +19,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: HasFunctionTag.java,v 1.3 2006/05/08 21:51:38 michiel Exp $
+ * @version $Id: HasFunctionTag.java,v 1.4 2008/08/14 13:58:49 michiel Exp $
* @since MMBase-1.8
*/
@@ -36,6 +36,7 @@
}
public int doStartTag() throws JspTagException {
+ initTag();
boolean found;
try {
found = getFunction() != null;
Index: ListFunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/ListFunctionTag.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ListFunctionTag.java 22 Jul 2008 09:39:15 -0000 1.15
+++ ListFunctionTag.java 14 Aug 2008 13:58:49 -0000 1.16
@@ -27,7 +27,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: ListFunctionTag.java,v 1.15 2008/07/22 09:39:15 michiel Exp $
+ * @version $Id: ListFunctionTag.java,v 1.16 2008/08/14 13:58:49 michiel Exp $
*/
public class ListFunctionTag extends AbstractFunctionTag implements
ListProvider, FunctionContainerReferrer, Writer {
@@ -86,6 +86,7 @@
}
public int doStartTag() throws JspTagException {
+ initTag();
Object value = getFunctionValue(false); // registration is done in
doInitBody
if (value instanceof Collection && comparator.equals(Attribute.NULL)) {
returnCollection = (Collection) value;
Index: NodeFunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/NodeFunctionTag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NodeFunctionTag.java 1 Nov 2007 09:32:13 -0000 1.14
+++ NodeFunctionTag.java 14 Aug 2008 13:58:49 -0000 1.15
@@ -27,7 +27,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: NodeFunctionTag.java,v 1.14 2007/11/01 09:32:13 michiel Exp $
+ * @version $Id: NodeFunctionTag.java,v 1.15 2008/08/14 13:58:49 michiel Exp $
*/
public class NodeFunctionTag extends AbstractFunctionTag implements
NodeProvider, FunctionContainerReferrer {
@@ -76,6 +76,7 @@
}
public int doStartTag() throws JspTagException {
+ initTag();
Object value = getFunctionValue(false); // don't register, 'fillVars'
will do.
if (value == null || "".equals(value)) {
switch(Notfound.get(notfound, this)) {
Index: NodeListFunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/NodeListFunctionTag.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NodeListFunctionTag.java 23 Feb 2008 15:54:27 -0000 1.17
+++ NodeListFunctionTag.java 14 Aug 2008 13:58:49 -0000 1.18
@@ -26,7 +26,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: NodeListFunctionTag.java,v 1.17 2008/02/23 15:54:27 michiel
Exp $
+ * @version $Id: NodeListFunctionTag.java,v 1.18 2008/08/14 13:58:49 michiel
Exp $
*/
public class NodeListFunctionTag extends AbstractFunctionTag implements
ListProvider, FunctionContainerReferrer, NodeProvider {
@@ -113,6 +113,7 @@
}
public int doStartTag() throws JspTagException {
+ initTag();
NodeList list;
Object value = getFunctionValue(false);
Index: VoidFunctionTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/VoidFunctionTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- VoidFunctionTag.java 6 Dec 2004 15:25:19 -0000 1.3
+++ VoidFunctionTag.java 14 Aug 2008 13:58:49 -0000 1.4
@@ -19,10 +19,11 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.7
- * @version $Id: VoidFunctionTag.java,v 1.3 2004/12/06 15:25:19 pierre Exp $
+ * @version $Id: VoidFunctionTag.java,v 1.4 2008/08/14 13:58:49 michiel Exp $
*/
public class VoidFunctionTag extends AbstractFunctionTag implements
FunctionContainerReferrer {
public int doStartTag() throws JspTagException {
+ initTag();
getFunctionValue();
return SKIP_BODY;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
