merged 1.1 branch into head

[mir.git] / source / mircoders / media / MediaHelper.java

diff --git a/source/mircoders/media/MediaHelper.java b/source/mircoders/media/MediaHelper.java
index bad3d16..4222dc7 100755 (executable)
--- a/source/mircoders/media/MediaHelper.java
+++ b/source/mircoders/media/MediaHelper.java
@@ -30,13 +30,15 @@
 package mircoders.media;
 
 import mir.entity.Entity;
+import mir.media.MediaExc;
+import mir.media.MediaFailure;
+import mir.media.MediaHandler;
 import mir.storage.Database;
-import java.util.Map;
-import java.util.HashMap;
-import mircoders.global.*;
-import mircoders.storage.*;
-import mir.media.*;
-import mircoders.localizer.MirLocalizerExc;
+import mircoders.global.MirGlobal;
+import mircoders.storage.DatabaseAudio;
+import mircoders.storage.DatabaseImages;
+import mircoders.storage.DatabaseOther;
+import mircoders.storage.DatabaseVideo;
 
 /**
  * helper class to resolve media handlers using reflection
@@ -47,24 +49,10 @@ import mircoders.localizer.MirLocalizerExc;
  */
 
 public final class MediaHelper {
-  private static Map nameToMediaHandler = new HashMap();
-  private static String defaultMediaHandler = null;
-
-  public static void addHandler(String aName, MediaHandler aHandler) {
-    synchronized (nameToMediaHandler) {
-      nameToMediaHandler.put(aName, aHandler);
-    }
-  }
-
   public static MediaHandler getHandler(Entity aMediaType) throws MediaExc, MediaFailure {
     String handlerName = aMediaType.getFieldValue("classname");
 
-    try {
-      return MirGlobal.localizer().media().getHandler(handlerName);
-    }
-    catch (MirLocalizerExc e) {
-      throw new MediaFailure(e);
-    }
+    return MirGlobal.localizer().media().getHandler(handlerName);
   }
 
   public static Database getStorage(Entity mediaType, String aTable) throws MediaExc, MediaFailure {
@@ -77,7 +65,7 @@ public final class MediaHelper {
     if (aTable.equals("Other"))
       return DatabaseOther.getInstance();
 
-    throw new MediaExc("Unknown storage specification: " + aTable);
+    throw new MediaExc("Unknown database specification: " + aTable);
   }
 }