Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/CommandHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/CommandHandler.java	(revision 1652)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/CommandHandler.java	(revision 1653)
@@ -25,5 +25,5 @@
 
 /**
- * Handler for the different resource getCommands.
+ * Handler for the get and post commands.
  * 
  * @version $Id: ResourceTypeHandler.java 1606 2008-02-24 17:07:52Z th-schwarz $
@@ -43,8 +43,10 @@
 
 	static {
-		// initialize the getCommands
+		// initialize the get commands
 		getCommands.put(GET_FOLDERS.getName(), GET_FOLDERS);
 		getCommands.put(GET_FOLDERS_AND_FILES.getName(), GET_FOLDERS_AND_FILES);
 		getCommands.put(CREATE_FOLDER.getName(), CREATE_FOLDER);
+		
+		// initialize the post commands
 		postCommands.put(FILE_UPLOAD.getName(), FILE_UPLOAD);
 		postCommands.put(QUICK_UPLOAD.getName(), QUICK_UPLOAD);
@@ -71,5 +73,5 @@
 	 *         argument.
 	 * @throws IllegalArgumentException
-	 *             If 'name' is null can't be parsed.
+	 *             If 'name' is null or can't be parsed.
 	 */
 	public static CommandHandler valueOf(final String name) throws IllegalArgumentException {
@@ -77,24 +79,25 @@
 			throw new IllegalArgumentException();
 
-		// FIXME take commands from both maps!
-		CommandHandler getRt = getCommands.get(name);
-		CommandHandler postRt = postCommands.get(name);
-		if (getRt == null && postRt == null)
+		if (!isValidForGet(name) && !isValidForPost(name))
 			throw new IllegalArgumentException();
-		return getRt==null?postRt:getRt;
+		return (getCommands.get(name) != null) ? getCommands.get(name) : postCommands.get(name);
 	}
+	
 
 	/**
-	 * Checks, if a specfied string is valid representation of a {@link CommandHandler}.
+	 * Checks, if a specfied string is a valid representation of a get command.
 	 * 
 	 * @param name
-	 * @return True, if the string represrntation is valid, or false.
+	 * @return True, if the string representation is valid, or false.
 	 */
 	public static boolean isValidForGet(final String name) {
 		return getCommands.containsKey(name);
 	}
-	
+
 	/**
-	 * TODO document me!
+	 * Checks, if a specfied string is a valid representation of a post command.
+	 * 
+	 * @param name
+	 * @return True, if the string representation is valid, or false.
 	 */
 	public static boolean isValidForPost(final String name) {