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

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

diff --git a/source/mircoders/entity/EntityMedia.java b/source/mircoders/entity/EntityMedia.java
index 2d2c503..62a9f7b 100755 (executable)
--- a/source/mircoders/entity/EntityMedia.java
+++ b/source/mircoders/entity/EntityMedia.java
@@ -20,11 +20,9 @@ import mircoders.storage.*;
 
 public class EntityMedia extends Entity
 {
-  private static int instances;
 
   public EntityMedia(){
     super();
-    instances++;
   }
 
   public EntityMedia(StorageObject theStorage)
@@ -38,12 +36,12 @@ public class EntityMedia extends Entity
         *
         * @return mir.entity.Entity
         */
-       public Entity getMediaType() {
-               return ((DatabaseMedia)theStorageObject).getMediaType(this);
-       }
+       public Entity getMediaType() throws StorageObjectException {
+        try {
+            return ((DatabaseMedia)theStorageObject).getMediaType(this);
+        } catch (StorageObjectException e) {
+            throw new StorageObjectException("getMediaType(): "+e.toString());
+        }
 
-  public void finalize() {
-    instances--;
-    super.finalize();
-  }
+       }
 }