[MMBASE CVS] applications/taglib/src/org/mmbase/bridge/jsp/taglib FieldInfoTag.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv31197

Modified Files:
      Tag: MMBase-1_8
        FieldInfoTag.java 
Log Message:
  MMB-1589. Made it possible to also set the datatype using a variable which 
already has type DataType


See also: 
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1589


Index: FieldInfoTag.java
===================================================================
RCS file: 
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FieldInfoTag.java,v
retrieving revision 1.97.2.9
retrieving revision 1.97.2.10
diff -u -b -r1.97.2.9 -r1.97.2.10
--- FieldInfoTag.java   22 Aug 2008 13:08:29 -0000      1.97.2.9
+++ FieldInfoTag.java   2 Sep 2008 11:32:48 -0000       1.97.2.10
@@ -43,7 +43,7 @@
  * @author Michiel Meeuwissen
  * @author Jaco de Groot
  * @author Gerard van de Looi
- * @version $Id: FieldInfoTag.java,v 1.97.2.9 2008/08/22 13:08:29 michiel Exp $
+ * @version $Id: FieldInfoTag.java,v 1.97.2.10 2008/09/02 11:32:48 michiel Exp 
$
  */
 public class FieldInfoTag extends FieldReferrerTag implements Writer {
     private static Logger log;
@@ -154,17 +154,28 @@
     }
 
     private Attribute dataType = Attribute.NULL;
+    private DataType  specifiedDataType = null;
     /**
      * @since MMBase-1.8
      */
     public void setDatatype(String d) throws JspTagException {
-        dataType = getAttribute(d);
+        dataType = getAttribute((String) d);
+        specifiedDataType = null;
     }
     /**
+     * @since MMBase-1.8.7
+     */
+    public void setDatatype(DataType d) throws JspTagException {
+        specifiedDataType = d;
+        dataType = Attribute.NULL;
+    }
+
+    /**
      * @since MMBase-1.8
      */
     public DataType getDataType() throws JspTagException {
         if (dataType != Attribute.NULL) {
+            if (specifiedDataType != null) throw new RuntimeException();
             String name = dataType.getString(this);
             DataType dt = null;
             DataTypeCollector collector = (DataTypeCollector) 
pageContext.getAttribute(DataTypeTag.KEY, DataTypeTag.SCOPE);
@@ -179,7 +190,7 @@
             }
             return dt;
         } else {
-            return null;
+            return specifiedDataType;
         }
     }
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs