[MMBASE CVS] src/org/mmbase/datatypes BinaryDataType.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/datatypes
In directory james.mmbase.org:/tmp/cvs-serv23332

Modified Files:
        BinaryDataType.java 
Log Message:
  MMB-1808


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/datatypes
See also: http://www.mmbase.org/jira/browse/MMB-1808


Index: BinaryDataType.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/datatypes/BinaryDataType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- BinaryDataType.java 1 Sep 2008 17:39:44 -0000       1.15
+++ BinaryDataType.java 18 Apr 2009 07:15:40 -0000      1.16
@@ -10,6 +10,9 @@
 package org.mmbase.datatypes;
 
 import org.mmbase.util.logging.*;
+import org.mmbase.util.SerializableInputStream;
+import org.mmbase.bridge.*;
+import java.io.InputStream;
 import java.util.regex.Pattern;
 import org.apache.commons.fileupload.FileItem;
 
@@ -17,10 +20,10 @@
  * The datatype associated with byte arrays ('blobs').
  *
  * @author Pierre van Rooden
- * @version $Id: BinaryDataType.java,v 1.15 2008/09/01 17:39:44 michiel Exp $
+ * @version $Id: BinaryDataType.java,v 1.16 2009/04/18 07:15:40 michiel Exp $
  * @since MMBase-1.8
  */
-public class BinaryDataType extends AbstractLengthDataType<byte[]> {
+public class BinaryDataType extends AbstractLengthDataType<InputStream> {
 
     private static final Logger log = 
Logging.getLoggerInstance(BinaryDataType.class);
 
@@ -33,9 +36,18 @@
      * @param name the name of the data type
      */
     public BinaryDataType(String name) {
-        super(name, byte[].class);
+        super(name, InputStream.class);
     }
 
+
+    @Override
+    protected InputStream cast(Object value, Cloud cloud, Node node, Field 
field) throws CastException {
+        Object preCast = preCast(value, cloud, node, field);
+        if (preCast == null) return null;
+        return org.mmbase.util.Casting.toSerializableInputStream(preCast);
+    }
+
+    @Override
     protected void inheritProperties(BasicDataType origin) {
         super.inheritProperties(origin);
         if (origin instanceof BinaryDataType) {
@@ -43,7 +55,7 @@
         }
     }
 
-    //
+    @Override
     public long getLength(Object value) {
         if (value == null) return 0;
         if (value instanceof byte[]) {
@@ -63,11 +75,16 @@
         } else if (value instanceof FileItem) {
             FileItem fi = (FileItem) value;
             return fi.getSize();
+        } else if (value instanceof SerializableInputStream) {
+            SerializableInputStream sis = (SerializableInputStream) value;
+            return sis.getSize();
         } else {
             throw new RuntimeException("Value " + value + " of " + getName() + 
" is not a byte array but" + (value == null ? "null" : 
value.getClass().getName()));
         }
     }
 
+
+
     /**
      * Returns a regular expression which describes wich mime-types are valid 
for blobs with this
      * DataType. This is not yet available as a Restriction, only as a 
property.
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs