Index: /FCKeditor.Java/trunk/java-core/pom.xml
===================================================================
--- /FCKeditor.Java/trunk/java-core/pom.xml	(revision 2863)
+++ /FCKeditor.Java/trunk/java-core/pom.xml	(revision 2864)
@@ -138,4 +138,5 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.3</version>
 				<configuration>
 					<tags>
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ResourceType.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ResourceType.java	(revision 2863)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ResourceType.java	(revision 2864)
@@ -51,5 +51,5 @@
 
 	/** Resource type <code>File</code> */
-	public static final ResourceType FILE = new ResourceType("file",
+	public static final ResourceType FILE = new ResourceType("File",
 			PropertiesLoader.getFileResourceTypePath(), Utils
 					.getSet(PropertiesLoader
@@ -58,5 +58,5 @@
 							.getFileResourceTypeDeniedExtensions()));
 	/** Resource type <code>Flash</code> */
-	public static final ResourceType FLASH = new ResourceType("flash",
+	public static final ResourceType FLASH = new ResourceType("Flash",
 			PropertiesLoader.getFlashResourceTypePath(), Utils
 					.getSet(PropertiesLoader
@@ -65,5 +65,5 @@
 							.getFlashResourceTypeDeniedExtensions()));
 	/** Resource type <code>Image</code> */
-	public static final ResourceType IMAGE = new ResourceType("image",
+	public static final ResourceType IMAGE = new ResourceType("Image",
 			PropertiesLoader.getImageResourceTypePath(), Utils
 					.getSet(PropertiesLoader
@@ -72,5 +72,5 @@
 							.getImageResourceTypeDeniedExtensions()));
 	/** Resource type <code>Media</code> */
-	public static final ResourceType MEDIA = new ResourceType("media",
+	public static final ResourceType MEDIA = new ResourceType("Media",
 			PropertiesLoader.getMediaResourceTypePath(), Utils
 					.getSet(PropertiesLoader
@@ -158,5 +158,4 @@
 	/**
 	 * Returns the {@link ResourceType} for a specified string. <br />
-	 * <em>The retrieval is case-insensitive!</em>
 	 * 
 	 * @param name
@@ -169,7 +168,7 @@
 	public static ResourceType valueOf(final String name) {
 		if (Utils.isEmpty(name))
-			throw new IllegalArgumentException("Parameter name is empty");
-
-		ResourceType rt = types.get(name.toLowerCase());
+			throw new NullPointerException("Parameter name is null or empty");
+
+		ResourceType rt = types.get(name);
 		if (rt == null)
 			throw new IllegalArgumentException(
@@ -180,5 +179,4 @@
 	/**
 	 * Determines if a specified string represents a valid resource type.<br />
-	 * <em>The retrieval is case-insensitive!</em>
 	 * 
 	 * @param name
@@ -188,6 +186,5 @@
 	 */
 	public static boolean isValidType(final String name) {
-		return (Utils.isEmpty(name)) ? false : types.containsKey(name
-				.toLowerCase());
+		return (Utils.isEmpty(name)) ? false : types.containsKey(name);
 	}
 
@@ -195,5 +192,4 @@
 	 * This method wraps {@link #valueOf(String)}. It returns <code>null</code>
 	 * instead of throwing an IllegalArgumentException.<br />
-	 * <em>The retrieval is case-insensitive!</em>
 	 * 
 	 * @param name
@@ -204,5 +200,5 @@
 	public static ResourceType getResourceType(final String name) {
 		try {
-			return ResourceType.valueOf(name.toLowerCase());
+			return ResourceType.valueOf(name);
 		} catch (Exception e) {
 			return null;
@@ -213,5 +209,4 @@
 	 * This method wraps {@link #getResourceType(String)}. It returns
 	 * {@link #FILE} instead of returning <code>null</code>.<br />
-	 * <em>The retrieval is case-insensitive!</em>
 	 * 
 	 * @param name
@@ -221,6 +216,4 @@
 	 */
 	public static ResourceType getDefaultResourceType(final String name) {
-		if (Utils.isEmpty(name))
-			return null;
 		ResourceType rt = getResourceType(name);
 		return rt == null ? FILE : rt;
Index: /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeTest.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeTest.java	(revision 2863)
+++ /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeTest.java	(revision 2864)
@@ -23,6 +23,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
@@ -47,6 +47,17 @@
 	@Test
 	public void getType03() throws Exception {
-		assertEquals(ResourceType.IMAGE, ResourceType.getResourceType("ImaGe"));
+		assertNotSame(ResourceType.IMAGE, ResourceType.getResourceType("ImaGe"));
 	}
+	
+	@Test
+	public void getType04() throws Exception {
+		assertNull(ResourceType.getResourceType(null));
+	}
+	
+	@Test
+	public void getType05() throws Exception {
+		assertNull(ResourceType.getResourceType(""));
+	}
+	
 	@Test
 	public void isValid01() throws Exception {
@@ -56,14 +67,14 @@
 	@Test
 	public void isValid02() throws Exception {
-		assertTrue(ResourceType.isValidType("fLash"));
+		assertFalse(ResourceType.isValidType("fLash"));
 	}
 
 	@Test
 	public void isValid03() throws Exception {
-		assertTrue(ResourceType.isValidType("MeDiA"));
+		assertFalse(ResourceType.isValidType("MeDiA"));
 	}
 
 	@Test
-	public void getTypeDefault01() throws Exception {
+	public void getDefaultType01() throws Exception {
 		assertEquals(ResourceType.FILE, ResourceType
 				.getDefaultResourceType("wrong-type"));
@@ -71,7 +82,25 @@
 
 	@Test
-	public void getTypeDefault02() throws Exception {
-		assertEquals(ResourceType.FLASH, ResourceType
+	public void getDefaultType02() throws Exception {
+		assertNotSame(ResourceType.FLASH, ResourceType
 				.getDefaultResourceType("flAsh"));
 	}
+	
+	@Test
+	public void getDefaultType03() throws Exception {
+		assertEquals(ResourceType.FILE, ResourceType
+				.getDefaultResourceType(null));
+	}
+	
+	@Test
+	public void getDefaultType04() throws Exception {
+		assertEquals(ResourceType.FILE, ResourceType
+				.getDefaultResourceType(""));
+	}
+	
+	@Test
+	public void getDefaultType05() throws Exception {
+		assertNotSame(ResourceType.FILE, ResourceType
+				.getDefaultResourceType("Image"));
+	}
 }