Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/DisabledUserAction.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/DisabledUserAction.java	(revision 2509)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/DisabledUserAction.java	(revision 2509)
@@ -0,0 +1,57 @@
+/*
+ * 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.requestcycle.impl;
+
+
+import net.fckeditor.requestcycle.UserAction;
+
+/**
+ * Standard implementation for {@link UserAction}. It always returns
+ * <code>false</code>.
+ * 
+ * @version $Id$
+ */
+public class DisabledUserAction implements UserAction {
+
+	/*
+	 * (non-Javadoc)
+	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileBrowsing()
+	 */
+	public boolean isEnabledForFileBrowsing() {
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileUpload()
+	 */
+	public boolean isEnabledForFileUpload() {
+		return false;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFolderCreation()
+	 */
+	public boolean isEnabledForFolderCreation() {
+		return false;
+	}
+}
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/EnabledUserAction.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/EnabledUserAction.java	(revision 2509)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/EnabledUserAction.java	(revision 2509)
@@ -0,0 +1,57 @@
+/*
+ * 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.requestcycle.impl;
+
+
+import net.fckeditor.requestcycle.UserAction;
+
+/**
+ * Standard implementation for {@link UserAction}. It always returns
+ * <code>true</code>.
+ * 
+ * @version $Id$
+ */
+public class EnabledUserAction implements UserAction {
+
+	/*
+	 * (non-Javadoc)
+	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileBrowsing()
+	 */
+	public boolean isEnabledForFileBrowsing() {
+		return true;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileUpload()
+	 */
+	public boolean isEnabledForFileUpload() {
+		return true;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFolderCreation()
+	 */
+	public boolean isEnabledForFolderCreation() {
+		return true;
+	}
+}
Index: Keditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/FalseUserAction.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/FalseUserAction.java	(revision 2508)
+++ 	(revision )
@@ -1,57 +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.requestcycle.impl;
-
-
-import net.fckeditor.requestcycle.UserAction;
-
-/**
- * Standard implementation for {@link UserAction}. It always returns
- * <code>false</code>.
- * 
- * @version $Id$
- */
-public class FalseUserAction implements UserAction {
-
-	/*
-	 * (non-Javadoc)
-	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileBrowsing()
-	 */
-	public boolean isEnabledForFileBrowsing() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileUpload()
-	 */
-	public boolean isEnabledForFileUpload() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFolderCreation()
-	 */
-	public boolean isEnabledForFolderCreation() {
-		return false;
-	}
-}
Index: Keditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/TrueUserAction.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/TrueUserAction.java	(revision 2508)
+++ 	(revision )
@@ -1,57 +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.requestcycle.impl;
-
-
-import net.fckeditor.requestcycle.UserAction;
-
-/**
- * Standard implementation for {@link UserAction}. It always returns
- * <code>true</code>.
- * 
- * @version $Id$
- */
-public class TrueUserAction implements UserAction {
-
-	/*
-	 * (non-Javadoc)
-	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileBrowsing()
-	 */
-	public boolean isEnabledForFileBrowsing() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFileUpload()
-	 */
-	public boolean isEnabledForFileUpload() {
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see net.fckeditor.requestcycle.UserAction#isEnabledForFolderCreation()
-	 */
-	public boolean isEnabledForFolderCreation() {
-		return true;
-	}
-}
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java	(revision 2508)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java	(revision 2509)
@@ -28,5 +28,5 @@
  * <code>true</code>.
  * 
- * @see TrueUserAction
+ * @see EnabledUserAction
  * @version $Id$
  */
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/resources/net/fckeditor/handlers/default.properties
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/resources/net/fckeditor/handlers/default.properties	(revision 2508)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/resources/net/fckeditor/handlers/default.properties	(revision 2509)
@@ -62,5 +62,5 @@
 
 # default implementations
-connector.userActionImpl = net.fckeditor.requestcycle.impl.FalseUserAction
+connector.userActionImpl = net.fckeditor.requestcycle.impl.DisabledUserAction
 connector.userPathBuilderImpl = net.fckeditor.requestcycle.impl.ContextPathBuilder
 localization.localeResolverImpl = net.fckeditor.localization.impl.AcceptLanguageHeaderResolver