media handling fixes, gotten rid of StorageObject, set the default method for blots...

[mir.git] / source / mircoders / entity / EntityImages.java

diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java
index 8abaf44..7221e9b 100755 (executable)
--- a/source/mircoders/entity/EntityImages.java
+++ b/source/mircoders/entity/EntityImages.java
@@ -42,7 +42,7 @@ import java.sql.SQLException;
 /**
  *
  * @author RK, mh, mir-coders
- * @version $Id: EntityImages.java,v 1.21.2.6 2005/01/09 20:37:10 zapata Exp $
+ * @version $Id: EntityImages.java,v 1.21.2.7 2005/01/23 15:36:04 zapata Exp $
  */
 
 
@@ -66,7 +66,7 @@ public class EntityImages extends EntityUploadedMedia
    */
   public InputStream getImage() throws StorageObjectFailure {
     try {
-      return storageObject.getBinaryField("select image_data from images where id="+getId());
+      return database.getBinaryField("select image_data from images where id="+getId());
     }
     catch (SQLException e) {
       throw new StorageObjectFailure(e);
@@ -77,8 +77,6 @@ public class EntityImages extends EntityUploadedMedia
    * Processes and saves image data
    */
   public void setImage(InputStream anInputStream, String type) throws StorageObjectFailure {
-    // todo: failures should be treated anInputStream a better way: exception -> rollback instead
-    //  of commit
     if (anInputStream != null) {
       try {
         ByteArrayOutputStream inputData = new ByteArrayOutputStream();
@@ -89,7 +87,7 @@ public class EntityImages extends EntityUploadedMedia
 
         ByteArrayOutputStream imageData = new ByteArrayOutputStream();
         processor.writeScaledData(imageData, type);
-        storageObject.setBinaryField("update images set image_data = ? where id = "+getId(), imageData.toByteArray());
+        database.setBinaryField("image_data", getId(), imageData.toByteArray());
 
         setFieldValue("img_height", new Integer(processor.getScaledHeight()).toString());
         setFieldValue("img_width", new Integer(processor.getScaledWidth()).toString());
@@ -97,7 +95,7 @@ public class EntityImages extends EntityUploadedMedia
         imageData.reset();
         processor.descaleImage(maxIconSize, minDescaleRatio, minDescaleReduction);
         processor.writeScaledData(imageData, type);
-        storageObject.setBinaryField("update images set icon_data = ? where id = "+getId(), imageData.toByteArray());
+        database.setBinaryField("icon_data", getId(), imageData.toByteArray());
 
         setFieldValue("icon_height", new Integer(processor.getScaledHeight()).toString());
         setFieldValue("icon_width", new Integer(processor.getScaledWidth()).toString());
@@ -118,7 +116,7 @@ public class EntityImages extends EntityUploadedMedia
    */
   public InputStream getIcon() throws StorageObjectFailure {
     try {
-      return storageObject.getBinaryField("select icon_data from images where id="+getId());
+      return database.getBinaryField("select icon_data from images where id="+getId());
     }
     catch (SQLException e) {
       throw new StorageObjectFailure(e);