minor changes according to JLint

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

diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java
index f69cec8..e17cfb1 100755 (executable)
--- a/source/mircoders/media/MediaHandlerMp3.java
+++ b/source/mircoders/media/MediaHandlerMp3.java
@@ -18,18 +18,22 @@
  * 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  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.  
+ * the code of this program with  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.media;
 
 import java.io.StringReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
 
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
@@ -38,8 +42,6 @@ import mir.media.MediaFailure;
 import mir.media.MirMedia;
 import mir.misc.FileUtil;
 import mir.misc.StringUtil;
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleList;
 
 /**
  * Please note: this media handler produces
@@ -65,13 +67,12 @@ import freemarker.template.SimpleList;
  *
  * @see mir.media.MirMedia
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerMp3.java,v 1.15 2003/04/21 12:42:48 idfx Exp $
+ * @version $Id: MediaHandlerMp3.java,v 1.15.2.2 2003/12/03 18:10:45 rk Exp $
  */
 
 public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
 {
-  protected LoggerWrapper logger;
-
+  
   public MediaHandlerMp3() {
     logger = new LoggerWrapper("Media.Audio.Mp3");
   }
@@ -104,8 +105,8 @@ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
     }
   }
 
-  public SimpleList getURL(Entity ent, Entity mediaTypeEnt) {
-    SimpleList theList = new SimpleList();
+  public List getURL(Entity ent, Entity mediaTypeEnt) {
+    List theList = new Vector();
 
     //String stringSize = ent.getValue("size");
     //int size = Integer.parseInt(stringSize, 10)/1024;
@@ -116,13 +117,13 @@ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia
 
     // @todo the texts ("title") below urgently need to be sanely localizaeble
     // somehow
-    SimpleHash m3uHash = new SimpleHash();
+    Map m3uHash = new HashMap();
     m3uHash.put("publish_path", basePath + ".m3u");
     m3uHash.put("publish_server", ent.getValue("publish_server"));
     m3uHash.put("title", "stream URL");
     theList.add(m3uHash);
 
-    SimpleHash plsHash = new SimpleHash();
+    Map plsHash = new HashMap();
     plsHash.put("publish_path", basePath + ".pls");
     plsHash.put("publish_server", ent.getValue("publish_server"));
     plsHash.put("title", "playlist URL");