Index: /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java
===================================================================
--- /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 4152)
+++ /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/connector/Dispatcher.java	(revision 4153)
@@ -130,10 +130,8 @@
 			
 			// check permissions for user action
-			if ((command.equals(Command.GET_FOLDERS) || command
-					.equals(Command.GET_FOLDERS_AND_FILES))
-					&& !RequestCycleHandler.isEnabledForFileBrowsing(request))
+			if ((command.equals(Command.GET_FOLDERS) || command.equals(Command.GET_FOLDERS_AND_FILES))
+					&& !RequestCycleHandler.isGetResourcesEnabled(request))
 				getResponse = GetResponse.getGetResourcesDisabledError();
-			else if (command.equals(Command.CREATE_FOLDER)
-					&& !RequestCycleHandler.isCreateFolderEnabled(request))
+			else if (command.equals(Command.CREATE_FOLDER) && !RequestCycleHandler.isCreateFolderEnabled(request))
 				getResponse = GetResponse.getCreateFolderDisabledError();
 			else {
@@ -237,5 +235,5 @@
 		UploadResponse uploadResponse = null;
 		// check permissions for user actions
-		if (!RequestCycleHandler.isEnabledForFileUpload(request))
+		if (!RequestCycleHandler.isFileUploadEnabled(request))
 			uploadResponse = UploadResponse.getFileUploadDisabledError();
 		// check parameters  
Index: /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java	(revision 4152)
+++ /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java	(revision 4153)
@@ -80,21 +80,4 @@
 
 	/**
-	 * Just a wrapper to
-	 * {@link UserAction#isEnabledForFileBrowsing(HttpServletRequest)}.
-	 * 
-	 * @return {@link UserAction#isEnabledForFileBrowsing(HttpServletRequest)}
-	 *         or false if {@link UserAction} isn't set.
-	 * @see #isGetResourcesEnabled(HttpServletRequest)
-	 * @deprecated Method will be removed in FCKeditor.Java 2.6, user
-	 *             {@link #isGetResourcesEnabled(HttpServletRequest)}.
-	 */
-	@Deprecated
-	public static boolean isEnabledForFileBrowsing(
-			final HttpServletRequest request) {
-		return (userAction != null && userAction
-				.isEnabledForFileBrowsing(request));
-	}
-	
-	/**
 	 * Returns <code>true</code> if user is allowed to list resources. The
 	 * behavior is specified by the current UserAction instance.
@@ -107,20 +90,4 @@
 	public static boolean isGetResourcesEnabled(final HttpServletRequest request) {
 		return userAction.isEnabledForFileBrowsing(request);
-	}
-
-	/**
-	 * Just a wrapper to
-	 * {@link UserAction#isEnabledForFileUpload(HttpServletRequest)}.
-	 * 
-	 * @return {@link UserAction#isEnabledForFileUpload(HttpServletRequest)} or
-	 *         false if {@link UserAction} isn't set.
-	 * @see #isFileUploadEnabled(HttpServletRequest)
-	 * @deprecated Method will be removed in FCKeditor.Java 2.6,
-	 *             {@link #isFileUploadEnabled(HttpServletRequest)}.
-	 */
-	public static boolean isEnabledForFileUpload(
-			final HttpServletRequest request) {
-		return (userAction != null && userAction
-				.isEnabledForFileUpload(request));
 	}
 	
@@ -135,5 +102,5 @@
 	 */
 	public static boolean isFileUploadEnabled(HttpServletRequest request) {
-		return userAction.isEnabledForFileUpload(request);
+		return userAction.isEnabledForFileUpload(request); 
 	}
 
Index: /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/tags/CheckTag.java
===================================================================
--- /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/tags/CheckTag.java	(revision 4152)
+++ /FCKeditor.Java/branches/2.6.x/java-core/src/main/java/net/fckeditor/tags/CheckTag.java	(revision 4153)
@@ -106,5 +106,5 @@
 
 		if (command.equals(FILE_UPLOAD)) {
-			if (RequestCycleHandler.isEnabledForFileUpload(request))
+			if (RequestCycleHandler.isFileUploadEnabled(request))
 				response = lm.getFileUploadEnabled();
 			else
@@ -113,5 +113,5 @@
 
 		if (command.equals(FILE_BROWSING) || command.equals(GET_RESOURCES)) {
-			if (RequestCycleHandler.isEnabledForFileBrowsing(request))
+			if (RequestCycleHandler.isGetResourcesEnabled(request))
 				response = lm.getGetResourcesEnabled();
 			else