first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

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

diff --git a/source/mircoders/entity/EntityVideo.java b/source/mircoders/entity/EntityVideo.java
index 8f651e4..b250b76 100755 (executable)
--- a/source/mircoders/entity/EntityVideo.java
+++ b/source/mircoders/entity/EntityVideo.java
@@ -17,14 +17,12 @@ import mir.storage.*;
  */
 
 
-public class EntityVideo extends Entity
+public class EntityVideo extends EntityUploadedMedia
 {
-       private static int instances;
 
        public EntityVideo()
        {
                super();
-               instances++;
        }
 
        public EntityVideo(StorageObject theStorage) {
@@ -35,7 +33,7 @@ public class EntityVideo extends Entity
        //
        // methods
 
-       public byte[] getVideoData()
+       public byte[] getVideoData() throws StorageObjectException
        {
 
                Connection con=null;Statement stmt=null;
@@ -61,7 +59,7 @@ public class EntityVideo extends Entity
                return video_data;
        }
 
-       public void setVideoData(byte[] uploadData)
+       public void setVideoData(byte[] uploadData) throws StorageObjectException
        {
                if (uploadData!=null) {
                        Connection con=null;PreparedStatement pstmt=null;
@@ -106,10 +104,4 @@ public class EntityVideo extends Entity
                super.setValues(theStringValues);
        }
 
-
-       public void finalize() {
-               instances--;
-               super.finalize();
-       }
-
 }