Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv7515
Modified Files:
FieldListTag.java FieldTag.java ImageTag.java
NodeReferrerTag.java
Log Message:
MMB-1705
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1705
Index: FieldListTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FieldListTag.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- FieldListTag.java 25 Apr 2008 14:23:28 -0000 1.63
+++ FieldListTag.java 14 Aug 2008 13:42:17 -0000 1.64
@@ -14,7 +14,7 @@
import java.io.IOException;
-import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.*;
import javax.servlet.jsp.jstl.core.LoopTagStatus;
import java.util.*;
@@ -23,7 +23,7 @@
* This class makes a tag which can list the fields of a NodeManager.
*
* @author Michiel Meeuwissen
- * @version $Id: FieldListTag.java,v 1.63 2008/04/25 14:23:28 michiel Exp $
+ * @version $Id: FieldListTag.java,v 1.64 2008/08/14 13:42:17 michiel Exp $
*/
public class FieldListTag extends FieldReferrerTag implements ListProvider,
FieldProvider, QueryContainerReferrer {
@@ -188,7 +188,8 @@
/**
*
**/
- public int doStartTag() throws JspTagException{
+ public int doStartTag() throws JspException{
+ initTag();
collector = new ContextCollector(getContextProvider());
if (varStatus != Attribute.NULL) {
Index: FieldTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FieldTag.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- FieldTag.java 31 Mar 2008 13:10:47 -0000 1.73
+++ FieldTag.java 14 Aug 2008 13:42:18 -0000 1.74
@@ -26,7 +26,7 @@
* The FieldTag can be used as a child of a 'NodeProvider' tag.
*
* @author Michiel Meeuwissen
- * @version $Id: FieldTag.java,v 1.73 2008/03/31 13:10:47 michiel Exp $
+ * @version $Id: FieldTag.java,v 1.74 2008/08/14 13:42:18 michiel Exp $
*/
public class FieldTag extends FieldReferrerTag implements FieldProvider,
Writer {
@@ -182,7 +182,8 @@
}
}
- public int doStartTag() throws JspTagException {
+ public int doStartTag() throws JspException {
+ initTag();
Node node = getNode();
fieldName = (String) name.getValue(this);
boolean findValue = true;
Index: ImageTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ImageTag.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- ImageTag.java 26 Jul 2007 20:54:10 -0000 1.78
+++ ImageTag.java 14 Aug 2008 13:42:18 -0000 1.79
@@ -14,6 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspException;
import org.mmbase.bridge.*;
import org.mmbase.util.functions.*;
@@ -30,7 +31,7 @@
* sensitive for future changes in how the image servlet works.
*
* @author Michiel Meeuwissen
- * @version $Id: ImageTag.java,v 1.78 2007/07/26 20:54:10 michiel Exp $
+ * @version $Id: ImageTag.java,v 1.79 2008/08/14 13:42:18 michiel Exp $
*/
public class ImageTag extends FieldTag {
@@ -197,7 +198,8 @@
return urlConvert.booleanValue();
}
- public int doStartTag() throws JspTagException {
+ public int doStartTag() throws JspException {
+ initTag();
Node originalNode = getNode();
if (!originalNode.getNodeManager().hasField("handle")) {
throw new JspTagException(
Index: NodeReferrerTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeReferrerTag.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- NodeReferrerTag.java 14 Aug 2008 11:24:15 -0000 1.37
+++ NodeReferrerTag.java 14 Aug 2008 13:42:18 -0000 1.38
@@ -28,7 +28,7 @@
* NodeProviderTag and therefore would be a NodeReferrerTag.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeReferrerTag.java,v 1.37 2008/08/14 11:24:15 michiel Exp $
+ * @version $Id: NodeReferrerTag.java,v 1.38 2008/08/14 13:42:18 michiel Exp $
*/
public abstract class NodeReferrerTag extends CloudReferrerTag {
@@ -167,8 +167,12 @@
return getCloudContext().getDefaultLocale();
}
- public int doStartTag() throws JspException {
+ protected void initTag() {
node = null;
+ }
+
+ public int doStartTag() throws JspException {
+ initTag();
return super.doStartTag();
}
public int doEndTag() throws JspTagException {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
