Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2657)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 2658)
@@ -33,5 +33,5 @@
 import net.fckeditor.connector.exception.InvalidNewFolderNameException;
 import net.fckeditor.connector.exception.WriteException;
-import net.fckeditor.handlers.CommandHandler;
+import net.fckeditor.handlers.Command;
 import net.fckeditor.handlers.ConnectorHandler;
 import net.fckeditor.handlers.ExtensionsHandler;
@@ -108,5 +108,5 @@
 		// check parameters
 		// TODO should we move the parameter check to Context -> throws an exception?
-		if (!CommandHandler.isValidForGet(context.getCommandStr()))
+		if (!Command.isValidForGet(context.getCommandStr()))
 			getResponse = GetResponse.getErrorInvalidCommand();
 		else if (!ResourceType.isValid(context.getTypeStr()))
@@ -118,12 +118,12 @@
 			// in contrast to doPost the referrer has to send an explicit type
 			ResourceType type = context.getResourceType();
-			CommandHandler command = context.getCommand();
+			Command command = context.getCommand();
 			
 			// check permissions for user action
-			if ((command.equals(CommandHandler.GET_FOLDERS) || command
-					.equals(CommandHandler.GET_FOLDERS_AND_FILES))
+			if ((command.equals(Command.GET_FOLDERS) || command
+					.equals(Command.GET_FOLDERS_AND_FILES))
 					&& !RequestCycleHandler.isEnabledForFileBrowsing(request))
 				getResponse = GetResponse.getErrorFileBrowsingDisabled();
-			else if (command.equals(CommandHandler.CREATE_FOLDER)
+			else if (command.equals(Command.CREATE_FOLDER)
 					&& !RequestCycleHandler.isEnabledForFolderCreation(request))
 				getResponse = GetResponse.getErrorFolderCreationDisabled();
@@ -132,5 +132,5 @@
 				// the proper response object
 				try {
-					if (command.equals(CommandHandler.CREATE_FOLDER)) {
+					if (command.equals(Command.CREATE_FOLDER)) {
 						String newFolderNameStr = request
 								.getParameter("NewFolderName");
@@ -151,7 +151,7 @@
 							getResponse = GetResponse.getOK();
 						}
-					} else if (command.equals(CommandHandler.GET_FOLDERS)
+					} else if (command.equals(Command.GET_FOLDERS)
 							|| command
-									.equals(CommandHandler.GET_FOLDERS_AND_FILES)) {
+									.equals(Command.GET_FOLDERS_AND_FILES)) {
 						// TODO I don't like this code, it has to be more
 						// generic
@@ -186,6 +186,6 @@
 	 * 
 	 * @param command
-	 *            should be only {@link CommandHandler#GET_FOLDERS} or
-	 *            {@link CommandHandler#GET_FOLDERS_AND_FILES}!!
+	 *            should be only {@link Command#GET_FOLDERS} or
+	 *            {@link Command#GET_FOLDERS_AND_FILES}!!
 	 * @param type
 	 * @param currentFolderStr
@@ -195,5 +195,5 @@
 	 * @throws SecurityIssueException
 	 */
-	private GetResponse getFoldersAndOrFiles(final CommandHandler command,
+	private GetResponse getFoldersAndOrFiles(final Command command,
 			final ResourceType type, final String currentFolderStr,
 			final String responseUrl) throws InvalidCurrentFolderException,
@@ -202,5 +202,5 @@
 				currentFolderStr, responseUrl);
 		getResponse.setFolders(connector.getFolders(type, currentFolderStr));
-		if (command.equals(CommandHandler.GET_FOLDERS_AND_FILES))
+		if (command.equals(Command.GET_FOLDERS_AND_FILES))
 			getResponse.setFiles(connector.getFiles(type, currentFolderStr));
 		return getResponse;
@@ -239,5 +239,5 @@
 		// check parameters  
 		// TODO should we move the parameter check to Context -> throws an exception?
-		else if (!CommandHandler.isValidForPost(context.getCommandStr()))
+		else if (!Command.isValidForPost(context.getCommandStr()))
 			uploadResponse = UploadResponse.getErrorInvalidCommand();
 		else if (!ResourceType.isValid(context.getTypeStr()))
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/Command.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/Command.java	(revision 2658)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/Command.java	(revision 2658)
@@ -0,0 +1,177 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * 
+ * == BEGIN LICENSE ==
+ * 
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * 
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ * 
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ * 
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ * 
+ * == END LICENSE ==
+ */
+package net.fckeditor.handlers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.fckeditor.tool.Utils;
+
+/**
+ * Handler for <code>GET</code> and <code>POST</code> commands.
+ * 
+ * @version $Id$
+ */
+public class Command {
+
+	private String name;
+	private static Map<String, Command> getCommands = new HashMap<String, Command>(
+			3);
+	private static Map<String, Command> postCommands = new HashMap<String, Command>(
+			2);
+	public static final Command GET_FOLDERS = new Command(
+			"GetFolders");
+	public static final Command GET_FOLDERS_AND_FILES = new Command(
+			"GetFoldersAndFiles");
+	public static final Command CREATE_FOLDER = new Command(
+			"CreateFolder");
+	public static final Command FILE_UPLOAD = new Command(
+			"FileUpload");
+	public static final Command QUICK_UPLOAD = new Command(
+			"QuickUpload");
+
+	static {
+		// 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);
+	}
+
+	private Command(final String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Getter for the name.
+	 * 
+	 * @return The command name
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Getter for an {@link Command} of a specified string.
+	 * 
+	 * @param name
+	 *            A command to retrieve
+	 * @return A {@link Command} object holding the value represented by
+	 *         the string argument.
+	 * @throws IllegalArgumentException
+	 *             If 'name' is <code>null</code>, empty, or does not exist.
+	 */
+	public static Command valueOf(final String name)
+			throws IllegalArgumentException {
+		if (Utils.isEmpty(name))
+			throw new IllegalArgumentException();
+
+		if (!isValidForGet(name) && !isValidForPost(name))
+			throw new IllegalArgumentException();
+		return (getCommands.get(name) != null) ? getCommands.get(name)
+				: postCommands.get(name);
+	}
+	
+
+	/**
+	 * Checks if a specified string represents a valid <code>GET</code>
+	 * command.
+	 * 
+	 * @param name
+	 *            A command string to check
+	 * @return <code>true</code> if the string representation is valid else
+	 *         <code>false</code>.
+	 */
+	public static boolean isValidForGet(final String name) {
+		return getCommands.containsKey(name);
+	}
+
+	/**
+	 * Checks if a specified string represents a valid <code>POST</code>
+	 * command.
+	 * 
+	 * @param name
+	 *            A command string to check
+	 * @return <code>true</code> if the string representation is valid else
+	 *         <code>false</code>.
+	 */
+	public static boolean isValidForPost(final String name) {
+		return postCommands.containsKey(name);
+	}
+	
+	
+	/**
+	 * A wrapper for {@link #valueOf(String)}. It returns null instead of
+	 * throwing an exception.
+	 * 
+	 * @param name A command string to check
+	 * @return A {@link Command} object holding the value represented by
+	 *         the string argument, or <code>null</code>.
+	 */
+	public static Command getCommand(final String name) {
+		try {
+			return Command.valueOf(name);
+		} catch (Exception e) {
+			return null;
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		// TODO check for identity first
+		if (obj == null)
+			return false;
+		try {
+			Command rt = (Command) obj;
+			return name.equals(rt.getName());
+		} catch (ClassCastException e) {
+			return false;
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public int hashCode() {
+		return name.hashCode();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.lang.Object#toString()
+	 */
+	@Override
+	public String toString() {
+		return name;
+	}
+}
Index: Keditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/CommandHandler.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/CommandHandler.java	(revision 2657)
+++ 	(revision )
@@ -1,176 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- * 
- * == BEGIN LICENSE ==
- * 
- * Licensed under the terms of any of the following licenses at your
- * choice:
- * 
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- * 
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- * 
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
- * == END LICENSE ==
- */
-package net.fckeditor.handlers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import net.fckeditor.tool.Utils;
-
-/**
- * Handler for <code>GET</code> and <code>POST</code> commands.
- * 
- * @version $Id$
- */
-public class CommandHandler {
-
-	private String name;
-	private static Map<String, CommandHandler> getCommands = new HashMap<String, CommandHandler>(
-			3);
-	private static Map<String, CommandHandler> postCommands = new HashMap<String, CommandHandler>(
-			2);
-	public static final CommandHandler GET_FOLDERS = new CommandHandler(
-			"GetFolders");
-	public static final CommandHandler GET_FOLDERS_AND_FILES = new CommandHandler(
-			"GetFoldersAndFiles");
-	public static final CommandHandler CREATE_FOLDER = new CommandHandler(
-			"CreateFolder");
-	public static final CommandHandler FILE_UPLOAD = new CommandHandler(
-			"FileUpload");
-	public static final CommandHandler QUICK_UPLOAD = new CommandHandler(
-			"QuickUpload");
-
-	static {
-		// 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);
-	}
-
-	private CommandHandler(final String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Getter for the name.
-	 * 
-	 * @return The command name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Getter for an {@link CommandHandler} of a specified string.
-	 * 
-	 * @param name
-	 *            A command to retrieve
-	 * @return A {@link CommandHandler} object holding the value represented by
-	 *         the string argument.
-	 * @throws IllegalArgumentException
-	 *             If 'name' is <code>null</code>, empty, or does not exist.
-	 */
-	public static CommandHandler valueOf(final String name)
-			throws IllegalArgumentException {
-		if (Utils.isEmpty(name))
-			throw new IllegalArgumentException();
-
-		if (!isValidForGet(name) && !isValidForPost(name))
-			throw new IllegalArgumentException();
-		return (getCommands.get(name) != null) ? getCommands.get(name)
-				: postCommands.get(name);
-	}
-	
-
-	/**
-	 * Checks if a specified string represents a valid <code>GET</code>
-	 * command.
-	 * 
-	 * @param name
-	 *            A command string to check
-	 * @return <code>true</code> if the string representation is valid else
-	 *         <code>false</code>.
-	 */
-	public static boolean isValidForGet(final String name) {
-		return getCommands.containsKey(name);
-	}
-
-	/**
-	 * Checks if a specified string represents a valid <code>POST</code>
-	 * command.
-	 * 
-	 * @param name
-	 *            A command string to check
-	 * @return <code>true</code> if the string representation is valid else
-	 *         <code>false</code>.
-	 */
-	public static boolean isValidForPost(final String name) {
-		return postCommands.containsKey(name);
-	}
-	
-	
-	/**
-	 * A wrapper for {@link #valueOf(String)}. It returns null instead of
-	 * throwing an exception.
-	 * 
-	 * @param name A command string to check
-	 * @return A {@link CommandHandler} object holding the value represented by
-	 *         the string argument, or <code>null</code>.
-	 */
-	public static CommandHandler getCommand(final String name) {
-		try {
-			return CommandHandler.valueOf(name);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == null)
-			return false;
-		try {
-			CommandHandler rt = (CommandHandler) obj;
-			return name.equals(rt.getName());
-		} catch (ClassCastException e) {
-			return false;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public int hashCode() {
-		return name.hashCode();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return name;
-	}
-}
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 2657)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ResourceType.java	(revision 2658)
@@ -132,4 +132,5 @@
 	@Override
 	public boolean equals(Object obj) {
+		// FIXME improve this
 		if (obj == null || !(obj instanceof ResourceType))
 			return false;
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/Context.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/Context.java	(revision 2657)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/Context.java	(revision 2658)
@@ -24,5 +24,5 @@
 
 import net.fckeditor.connector.Dispatcher;
-import net.fckeditor.handlers.CommandHandler;
+import net.fckeditor.handlers.Command;
 import net.fckeditor.handlers.ResourceType;
 import net.fckeditor.tool.Utils;
@@ -84,6 +84,6 @@
 	}
 	
-	public CommandHandler getCommand() {
-		return CommandHandler.valueOf(commandStr);
+	public Command getCommand() {
+		return Command.valueOf(commandStr);
 	}
 	
Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/GetResponse.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/GetResponse.java	(revision 2657)
+++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/GetResponse.java	(revision 2658)
@@ -35,5 +35,5 @@
 
 import net.fckeditor.connector.Connector;
-import net.fckeditor.handlers.CommandHandler;
+import net.fckeditor.handlers.Command;
 import net.fckeditor.handlers.LocalizedPropertiesLoader;
 import net.fckeditor.handlers.ResourceType;
@@ -108,5 +108,5 @@
 	 * @param constructedUrl
 	 */
-	public GetResponse(CommandHandler command, ResourceType resourceType, 
+	public GetResponse(Command command, ResourceType resourceType, 
 			String currentFolder, String constructedUrl) {
 	
Index: Keditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/CommandHandlerTest.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/CommandHandlerTest.java	(revision 2657)
+++ 	(revision )
@@ -1,119 +1,0 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- * 
- * == BEGIN LICENSE ==
- * 
- * Licensed under the terms of any of the following licenses at your
- * choice:
- * 
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- * 
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- * 
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
- * == END LICENSE ==
- */
-package net.fckeditor.handlers;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-/**
- * Tests for {@link CommandHandler}.
- * 
- * @version $Id$
- */
-public class CommandHandlerTest {
-
-	@Test
-	public void valueOf01() {
-		assertEquals(CommandHandler.FILE_UPLOAD, CommandHandler
-				.valueOf("FileUpload"));
-	}
-
-	@Test
-	public void valueOf02() {
-		assertEquals(CommandHandler.QUICK_UPLOAD, CommandHandler
-				.valueOf("QuickUpload"));
-	}
-
-	@Test
-	public void valueOf03() {
-		assertEquals(CommandHandler.CREATE_FOLDER, CommandHandler
-				.valueOf("CreateFolder"));
-	}
-
-	@Test
-	public void valueOf04() {
-		assertEquals(CommandHandler.GET_FOLDERS, CommandHandler
-				.valueOf("GetFolders"));
-	}
-
-	@Test
-	public void valueOf05() {
-		assertEquals(CommandHandler.GET_FOLDERS_AND_FILES, CommandHandler
-				.valueOf("GetFoldersAndFiles"));
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void valueOfStringNull() {
-		CommandHandler.valueOf(null);
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void valueOfInvalidCommand() {
-		CommandHandler.valueOf("GetAll");
-	}
-
-	@Test
-	public void getCommandNull() {
-		CommandHandler command = CommandHandler.getCommand(null);
-		assertNull(command);
-	}
-
-	@Test
-	public void getCommandInvalid() {
-		CommandHandler command = CommandHandler.getCommand("DeleteFolders");
-		assertNull(command);
-	}
-
-	@Test
-	public void getCommandValid() {
-		CommandHandler actual = CommandHandler.getCommand("FileUpload");
-		assertEquals(CommandHandler.FILE_UPLOAD, actual);
-	}
-
-	@Test
-	public void equalsNot01() {
-		assertFalse(CommandHandler.GET_FOLDERS
-				.equals(CommandHandler.FILE_UPLOAD));
-	}
-
-	@Test
-	public void equalsNot02() {
-		assertFalse(CommandHandler.GET_FOLDERS.equals(new Object()));
-	}
-
-	@Test
-	public void hashCode01() {
-		assertEquals("GetFoldersAndFiles".hashCode(),
-				CommandHandler.GET_FOLDERS_AND_FILES.hashCode());
-	}
-
-	@Test
-	public void hashCode02() {
-		assertNotSame(-1, CommandHandler.FILE_UPLOAD.hashCode());
-	}
-
-	@Test
-	public void toString01() {
-		assertEquals("GetFoldersAndFiles", CommandHandler.GET_FOLDERS_AND_FILES
-				.toString());
-	}
-
-}
Index: /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/CommandTest.java
===================================================================
--- /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/CommandTest.java	(revision 2658)
+++ /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/CommandTest.java	(revision 2658)
@@ -0,0 +1,119 @@
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ * 
+ * == BEGIN LICENSE ==
+ * 
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ * 
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ * 
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ * 
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ * 
+ * == END LICENSE ==
+ */
+package net.fckeditor.handlers;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+/**
+ * Tests for {@link Command}.
+ * 
+ * @version $Id$
+ */
+public class CommandTest {
+
+	@Test
+	public void valueOf01() {
+		assertEquals(Command.FILE_UPLOAD, Command
+				.valueOf("FileUpload"));
+	}
+
+	@Test
+	public void valueOf02() {
+		assertEquals(Command.QUICK_UPLOAD, Command
+				.valueOf("QuickUpload"));
+	}
+
+	@Test
+	public void valueOf03() {
+		assertEquals(Command.CREATE_FOLDER, Command
+				.valueOf("CreateFolder"));
+	}
+
+	@Test
+	public void valueOf04() {
+		assertEquals(Command.GET_FOLDERS, Command
+				.valueOf("GetFolders"));
+	}
+
+	@Test
+	public void valueOf05() {
+		assertEquals(Command.GET_FOLDERS_AND_FILES, Command
+				.valueOf("GetFoldersAndFiles"));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void valueOfStringNull() {
+		Command.valueOf(null);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void valueOfInvalidCommand() {
+		Command.valueOf("GetAll");
+	}
+
+	@Test
+	public void getCommandNull() {
+		Command command = Command.getCommand(null);
+		assertNull(command);
+	}
+
+	@Test
+	public void getCommandInvalid() {
+		Command command = Command.getCommand("DeleteFolders");
+		assertNull(command);
+	}
+
+	@Test
+	public void getCommandValid() {
+		Command actual = Command.getCommand("FileUpload");
+		assertEquals(Command.FILE_UPLOAD, actual);
+	}
+
+	@Test
+	public void equalsNot01() {
+		assertFalse(Command.GET_FOLDERS
+				.equals(Command.FILE_UPLOAD));
+	}
+
+	@Test
+	public void equalsNot02() {
+		assertFalse(Command.GET_FOLDERS.equals(new Object()));
+	}
+
+	@Test
+	public void hashCode01() {
+		assertEquals("GetFoldersAndFiles".hashCode(),
+				Command.GET_FOLDERS_AND_FILES.hashCode());
+	}
+
+	@Test
+	public void hashCode02() {
+		assertNotSame(-1, Command.FILE_UPLOAD.hashCode());
+	}
+
+	@Test
+	public void toString01() {
+		assertEquals("GetFoldersAndFiles", Command.GET_FOLDERS_AND_FILES
+				.toString());
+	}
+
+}