Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv1129
Modified Files:
Tag: MMBase-1_8
NodeReferrerTag.java FieldInfoTag.java
Log Message:
ported from head, (datatype test pages were broken)
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
Index: NodeReferrerTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeReferrerTag.java,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -u -b -r1.26.2.7 -r1.26.2.8
--- NodeReferrerTag.java 24 Jan 2008 14:18:50 -0000 1.26.2.7
+++ NodeReferrerTag.java 22 Aug 2008 13:08:29 -0000 1.26.2.8
@@ -28,7 +28,7 @@
* NodeProviderTag and therefore would be a NodeReferrerTag.
*
* @author Michiel Meeuwissen
- * @version $Id: NodeReferrerTag.java,v 1.26.2.7 2008/01/24 14:18:50 michiel
Exp $
+ * @version $Id: NodeReferrerTag.java,v 1.26.2.8 2008/08/22 13:08:29 michiel
Exp $
*/
public abstract class NodeReferrerTag extends CloudReferrerTag {
@@ -85,16 +85,21 @@
return org.mmbase.util.Casting.toNode(o, getCloudVar());
}
}
+
+ protected Node getNode() throws JspTagException {
+ return getNode(true);
+ }
/**
* Gets the Node variable from the parent NodeProvider.
* @return a org.mmbase.bridge.Node
*/
- protected Node getNode() throws JspTagException {
+ protected Node getNode(boolean exception) throws JspTagException {
Node node = parentNodeId == Attribute.NULL ? getNodeFromPageContext()
: null;
// get the node from a parent element.
if (node == null) {
- node = findNodeProvider().getNodeVar();
+ NodeProvider p = findNodeProvider(exception);
+ node = p == null ? null : p.getNodeVar();
} else {
node = (Node) org.mmbase.util.Casting.unWrap(node);
}
Index: FieldInfoTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FieldInfoTag.java,v
retrieving revision 1.97.2.8
retrieving revision 1.97.2.9
diff -u -b -r1.97.2.8 -r1.97.2.9
--- FieldInfoTag.java 19 Aug 2008 12:34:12 -0000 1.97.2.8
+++ FieldInfoTag.java 22 Aug 2008 13:08:29 -0000 1.97.2.9
@@ -43,7 +43,7 @@
* @author Michiel Meeuwissen
* @author Jaco de Groot
* @author Gerard van de Looi
- * @version $Id: FieldInfoTag.java,v 1.97.2.8 2008/08/19 12:34:12 michiel Exp $
+ * @version $Id: FieldInfoTag.java,v 1.97.2.9 2008/08/22 13:08:29 michiel Exp $
*/
public class FieldInfoTag extends FieldReferrerTag implements Writer {
private static Logger log;
@@ -281,7 +281,7 @@
private final Field f = new DataTypeField(getCloudVar(),
dt);
public Field getFieldVar() { return f; }
public String getId() { return null; }
- public Node getNodeVar() throws JspTagException { return
FieldInfoTag.this.getNode(); }
+ public Node getNodeVar() throws JspTagException { return
FieldInfoTag.this.getNode(false); }
};
field = fieldProvider.getFieldVar();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
