Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv19252
Modified Files:
FieldInfoTag.java
Log Message:
MMB-1560
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1560
Index: FieldInfoTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FieldInfoTag.java,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- FieldInfoTag.java 19 Nov 2008 18:33:54 -0000 1.119
+++ FieldInfoTag.java 17 Apr 2009 15:44:35 -0000 1.120
@@ -20,6 +20,7 @@
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.*;
import org.mmbase.datatypes.*;
+import org.mmbase.datatypes.handlers.Handler;
import org.mmbase.util.Casting;
import org.mmbase.util.logging.Logger;
@@ -31,6 +32,7 @@
import org.mmbase.bridge.jsp.taglib.typehandler.TypeHandler;
+import org.mmbase.bridge.jsp.taglib.typehandler.DataTypeHandler;
import org.mmbase.bridge.jsp.taglib.typehandler.DefaultTypeHandler;
import org.xml.sax.InputSource;
import org.w3c.dom.Element;
@@ -43,7 +45,7 @@
* @author Michiel Meeuwissen
* @author Jaco de Groot
* @author Gerard van de Looi
- * @version $Id: FieldInfoTag.java,v 1.119 2008/11/19 18:33:54 michiel Exp $
+ * @version $Id: FieldInfoTag.java,v 1.120 2009/04/17 15:44:35 michiel Exp $
*/
public class FieldInfoTag extends FieldReferrerTag implements Writer {
private static Logger log;
@@ -210,6 +212,12 @@
*/
protected TypeHandler getTypeHandler(Field field) {
DataType<?> dataType = field.getDataType();
+
+ String ct = pageContext.getResponse().getContentType().split(";")[0];
+ Handler<String> h = dataType.getHandler(ct);
+ if (h != null) {
+ return new DataTypeHandler(h, this);
+ } else {
Class<? extends DataType> dataTypeClass = dataType.getClass();
Class<? extends TypeHandler> handler = handlers.get(dataTypeClass);
log.debug("Looking for typehandler for " + dataTypeClass);
@@ -244,6 +252,7 @@
return new DefaultTypeHandler(this);
}
}
+ }
/**
* Initialize the type handlers default supported by the system.
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
