Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler
In directory james.mmbase.org:/tmp/cvs-serv3146
Modified Files:
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.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- AbstractTypeHandler.java 25 Feb 2008 16:07:46 -0000 1.60
+++ AbstractTypeHandler.java 25 Feb 2008 18:14:41 -0000 1.61
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: AbstractTypeHandler.java,v 1.60 2008/02/25 16:07:46 michiel
Exp $
+ * @version $Id: AbstractTypeHandler.java,v 1.61 2008/02/25 18:14:41 michiel
Exp $
*/
public abstract class AbstractTypeHandler implements TypeHandler {
@@ -191,7 +191,7 @@
if (value == null) {
String fieldName = field.getName();
if (node != null) {
- value = node.isNull(fieldName) ? null :
node.getStringValue(fieldName);
+ value = node.isNull(fieldName) ? null : getValue(node,
fieldName);
} else if (useDefault) {
value = field.getDataType().getDefaultValue();
}
@@ -278,6 +278,12 @@
node.setValue(fieldName, value);
}
/**
+ * @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.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- StringHandler.java 25 Feb 2008 16:07:46 -0000 1.66
+++ StringHandler.java 25 Feb 2008 18:14:41 -0000 1.67
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: StringHandler.java,v 1.66 2008/02/25 16:07:46 michiel Exp $
+ * @version $Id: StringHandler.java,v 1.67 2008/02/25 18:14:41 michiel Exp $
*/
public class StringHandler extends AbstractTypeHandler {
@@ -123,6 +123,10 @@
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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- XmlHandler.java 21 Sep 2007 12:53:43 -0000 1.20
+++ XmlHandler.java 25 Feb 2008 18:14:41 -0000 1.21
@@ -21,7 +21,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: XmlHandler.java,v 1.20 2007/09/21 12:53:43 michiel Exp $
+ * @version $Id: XmlHandler.java,v 1.21 2008/02/25 18:14:41 michiel Exp $
*/
public class XmlHandler extends StringHandler {
@@ -60,7 +60,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
