Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler
In directory james.mmbase.org:/tmp/cvs-serv31475
Modified Files:
Tag: MMBase-1_8
AbstractTypeHandler.java StringHandler.java
Log Message:
MMB-1607
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-1607
Index: AbstractTypeHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/AbstractTypeHandler.java,v
retrieving revision 1.48.2.5
retrieving revision 1.48.2.6
diff -u -b -r1.48.2.5 -r1.48.2.6
--- AbstractTypeHandler.java 22 Oct 2007 14:10:01 -0000 1.48.2.5
+++ AbstractTypeHandler.java 25 Feb 2008 16:05:03 -0000 1.48.2.6
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: AbstractTypeHandler.java,v 1.48.2.5 2007/10/22 14:10:01
michiel Exp $
+ * @version $Id: AbstractTypeHandler.java,v 1.48.2.6 2008/02/25 16:05:03
michiel Exp $
*/
public abstract class AbstractTypeHandler implements TypeHandler {
@@ -220,9 +220,9 @@
log.debug("Setting " + fieldName + " to " +
fieldValue);
}
if ("".equals(fieldValue) &&
interpretEmptyAsNull(field)) {
- node.setValue(fieldName, null);
+ setValue(node, fieldName, null);
} else {
- node.setValue(fieldName, fieldValue);
+ setValue(node, fieldName, fieldValue);
}
} catch (Throwable t) {
// may throw exception like 'You cannot change the
field"
@@ -264,6 +264,13 @@
}
/**
+ * @since MMBase-1.8.6
+ */
+ protected void setValue(Node node, String fieldName, Object value) {
+ node.setValue(fieldName, value);
+ }
+
+ /**
* @see TypeHandler#useHtmlInput(Node, Field)
*/
public boolean useHtmlInput(Node node, Field field) throws JspTagException
{
@@ -274,9 +281,9 @@
return false;
} else {
if ("".equals(fieldValue) && interpretEmptyAsNull(field)) {
- node.setValue(fieldName, null);
+ setValue(node, fieldName, null);
} else {
- node.setValue(fieldName, fieldValue);
+ setValue(node, fieldName, fieldValue);
}
return true;
}
Index: StringHandler.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/typehandler/StringHandler.java,v
retrieving revision 1.58.2.3
retrieving revision 1.58.2.4
diff -u -b -r1.58.2.3 -r1.58.2.4
--- StringHandler.java 22 Oct 2007 14:10:01 -0000 1.58.2.3
+++ StringHandler.java 25 Feb 2008 16:05:03 -0000 1.58.2.4
@@ -29,7 +29,7 @@
* @author Gerard van de Looi
* @author Michiel Meeuwissen
* @since MMBase-1.6
- * @version $Id: StringHandler.java,v 1.58.2.3 2007/10/22 14:10:01 michiel Exp
$
+ * @version $Id: StringHandler.java,v 1.58.2.4 2008/02/25 16:05:03 michiel Exp
$
*/
public class StringHandler extends AbstractTypeHandler {
@@ -118,6 +118,10 @@
}
}
+ protected void setValue(Node node, String fieldName, Object value) {
+ node.setStringValue(fieldName,
org.mmbase.util.Casting.toString(value));
+ }
+
/**
* @see TypeHandler#useHtmlInput(Node, Field)
*/
@@ -136,7 +140,7 @@
String fieldName = field.getName();
if (! fieldValue.equals(node.getValue(fieldName))) {
if (fieldValue.equals("") && node.getValue(fieldName) == null)
return false;
- node.setStringValue(fieldName, fieldValue);
+ setValue(node, fieldName, fieldValue);
return true;
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
