Mir goes GPL

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

diff --git a/source/mircoders/entity/EntityMedia.java b/source/mircoders/entity/EntityMedia.java
index d43fdec..e632046 100755 (executable)
--- a/source/mircoders/entity/EntityMedia.java
+++ b/source/mircoders/entity/EntityMedia.java
@@ -1,3 +1,34 @@
+/*
+ * Copyright (C) 2001, 2002  The Mir-coders group
+ *
+ * This file is part of Mir.
+ *
+ * Mir is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Mir is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Mir; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * In addition, as a special exception, The Mir-coders gives permission to link
+ * the code of this program with the com.oreilly.servlet library, any library
+ * licensed under the Apache Software License, The Sun (tm) Java Advanced
+ * Imaging library (JAI), The Sun JIMI library (or with modified versions of
+ * the above that use the same license as the above), and distribute linked
+ * combinations including the two.  You must obey the GNU General Public
+ * License in all respects for all of the code used other than the above
+ * mentioned libraries.  If you modify this file, you may extend this exception
+ * to your version of the file, but you are not obligated to do so.  If you do
+ * not wish to do so, delete this exception statement from your version.
+ */
+
 package mircoders.entity;
 
 import java.lang.*;
@@ -18,13 +49,11 @@ import mircoders.storage.*;
  */
 
 
-public class EntityMedia extends AbstractEntity implements Entity
+public class EntityMedia extends Entity
 {
-  private static int instances;
 
   public EntityMedia(){
     super();
-    instances++;
   }
 
   public EntityMedia(StorageObject theStorage)
@@ -38,12 +67,12 @@ public class EntityMedia extends AbstractEntity implements 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();
-  }
+       }
 }