Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/ExtensionsHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/ExtensionsHandler.java	(revision 1345)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/ExtensionsHandler.java	(revision 1346)
@@ -35,13 +35,13 @@
 public class ExtensionsHandler {
 
-    private static Map extensionsAllowed = new HashMap();
-    private static Map extensionsDenied = new HashMap();
+    private static Map<String, Set<String>> extensionsAllowed = new HashMap<String, Set<String>>();
+    private static Map<String, Set<String>> extensionsDenied = new HashMap<String, Set<String>>();
 
     static {
-	// load defaults
-	extensionsAllowed.put(Constants.FILE_TYPE_FILE, 
-		Utils.getSet(ConfigurationHandler.getDefaultProperty("fckeditor.file.extensions.allowed")));
-	extensionsDenied.put(Constants.FILE_TYPE_FILE, 
-		Utils.getSet(ConfigurationHandler.getDefaultProperty("fckeditor.file.extensions.denied")));
+	// load defaults (Type 'file' shouldn't be set here, because it's only the default fallback!)
+	extensionsAllowed.put(Constants.FILE_TYPE_MEDIA, 
+		Utils.getSet(ConfigurationHandler.getDefaultProperty("fckeditor.media.extensions.allowed")));
+	extensionsDenied.put(Constants.FILE_TYPE_MEDIA, 
+		Utils.getSet(ConfigurationHandler.getDefaultProperty("fckeditor.media.extensions.denied")));
 	extensionsAllowed.put(Constants.FILE_TYPE_IMAGE, 
 		Utils.getSet(ConfigurationHandler.getDefaultProperty("fckeditor.image.extensions.allowed")));
@@ -61,6 +61,6 @@
      * @return Set of allowed extensions or an empty set.
      */
-    public static Set getExtensionsAllowed(final String type) {
-	return (Set) ExtensionsHandler.extensionsAllowed.get(type);
+    public static Set<String> getExtensionsAllowed(final String type) {
+	return ExtensionsHandler.extensionsAllowed.get(type);
     }
 
@@ -86,6 +86,6 @@
      * @return Set of denied extensions or an empty set.
      */
-    public static Set getExtensionsDenied(final String type) {
-	return (Set) ExtensionsHandler.extensionsDenied.get(type);
+    public static Set<String> getExtensionsDenied(final String type) {
+	return ExtensionsHandler.extensionsDenied.get(type);
     }
 
@@ -113,6 +113,6 @@
     public static boolean isAllowed(final String type, final String extension) {
 	String ext = extension.toLowerCase();
-	Set allowed = (Set) extensionsAllowed.get(type);
-	Set denied = (Set) extensionsDenied.get(type);
+	Set<String> allowed = extensionsAllowed.get(type);
+	Set<String> denied = extensionsDenied.get(type);
 	if (allowed.isEmpty())
 	    return (denied.contains(ext)) ? false : true;