Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler
In directory james.mmbase.org:/tmp/cvs-serv3053
Modified Files:
Tag: MMBase-1_8
AbstractTypeHandler.java StringHandler.java XmlHandler.java
Log Message:
MMB-1608
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler
See also: http://www.mmbase.org/jira/browse/MMB-1608
Index: AbstractTypeHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/AbstractTypeHandler.java,v
retrieving revision 1.48.2.6
retrieving revision 1.48.2.7
diff -u -b -r1.48.2.6 -r1.48.2.7
--- AbstractTypeHandler.java 25 Feb 2008 16:05:03 -0000 1.48.2.6
+++ AbstractTypeHandler.java 25 Feb 2008 18:11:48 -0000 1.48.2.7
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: AbstractTypeHandler.java,v 1.48.2.6 2008/02/25 16:05:03
michiel Exp $
+ * @version $Id: AbstractTypeHandler.java,v 1.48.2.7 2008/02/25 18:11:48
michiel Exp $
*/
public abstract class AbstractTypeHandler implements TypeHandler {
@@ -182,7 +182,7 @@
if (value == null) {
String fieldName = field.getName();
if (node != null) {
- value = node.isNull(fieldName) ? null :
node.getValue(fieldName);
+ value = node.isNull(fieldName) ? null : getValue(node,
fieldName);
} else if (useDefault) {
value = field.getDataType().getDefaultValue();
}
@@ -271,6 +271,13 @@
}
/**
+ * @since MMBase-1.8.6
+ */
+ protected Object getValue(Node node, String fieldName) {
+ return node.getValue(fieldName);
+ }
+
+ /**
* @see TypeHandler#useHtmlInput(Node, Field)
*/
public boolean useHtmlInput(Node node, Field field) throws JspTagException
{
Index: StringHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/StringHandler.java,v
retrieving revision 1.58.2.4
retrieving revision 1.58.2.5
diff -u -b -r1.58.2.4 -r1.58.2.5
--- StringHandler.java 25 Feb 2008 16:05:03 -0000 1.58.2.4
+++ StringHandler.java 25 Feb 2008 18:11:48 -0000 1.58.2.5
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: StringHandler.java,v 1.58.2.4 2008/02/25 16:05:03 michiel Exp
$
+ * @version $Id: StringHandler.java,v 1.58.2.5 2008/02/25 18:11:48 michiel Exp
$
*/
public class StringHandler extends AbstractTypeHandler {
@@ -122,6 +122,9 @@
node.setStringValue(fieldName,
org.mmbase.util.Casting.toString(value));
}
+ protected Object getValue(Node node, String fieldName) {
+ return node.getStringValue(fieldName);
+ }
/**
* @see TypeHandler#useHtmlInput(Node, Field)
*/
Index: XmlHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/XmlHandler.java,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -b -r1.16.2.1 -r1.16.2.2
--- XmlHandler.java 22 Oct 2007 14:10:01 -0000 1.16.2.1
+++ XmlHandler.java 25 Feb 2008 18:11:48 -0000 1.16.2.2
@@ -28,7 +28,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: XmlHandler.java,v 1.16.2.1 2007/10/22 14:10:01 michiel Exp $
+ * @version $Id: XmlHandler.java,v 1.16.2.2 2008/02/25 18:11:48 michiel Exp $
*/
public class XmlHandler extends StringHandler {
@@ -67,7 +67,7 @@
buffer.append(">");
String value;
if (node != null) {
- value = org.mmbase.util.Encode.encode("ESCAPE_XML",
tag.decode(node.getStringValue(field.getName()), node));
+ value = org.mmbase.util.Encode.encode("ESCAPE_XML",
tag.decode(org.mmbase.util.Casting.toString(getFieldValue(node, field, false)),
node));
} else {
value = "";
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
