Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java (revision 4327) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java (revision 4328) @@ -184,21 +184,4 @@ /** - * Gets the advanced configuration map. Each configuration element has to be - * set individually in this map.
- * The editor provides already a system-wide configuration through the - * config.js file. By adding elements to this map you can - * override the configuration for each editor instance. - * - * @deprecated Method will be removed in FCKeditor.Java 2.6, use - * {@link FCKeditor#getConfig(String)}. - * @see #getConfig(String) - * @return configuration configuration map for this editor instance - */ - @Deprecated - public FCKeditorConfig getConfig() { - return fckConfig; - } - - /** * Returns a configuration option. See {@link FCKeditorConfig} for more * details. @@ -224,18 +207,4 @@ if (value != null) fckConfig.put(name, value); - } - - /** - * Sets the advanced configuration maps. Note: previously - * - * @deprecated Method will be removed in FCKeditor.Java 2.6, use - * {@link #setConfig(String, String)}. - * @see #setConfig(String, String) - * @param config - * configuration collection - */ - @Deprecated - public void setConfig(FCKeditorConfig config) { - this.fckConfig = config; } Index: Keditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java (revision 4327) +++ (revision ) @@ -1,152 +1,0 @@ -/* - * FCKeditor - The text editor for Internet - http://www.fckeditor.net - * Copyright (C) 2004-2009 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 java.util.Set; - -import net.fckeditor.tool.Utils; - -/** - * This handler manages the allowed and denied extensions for each resource - * type. The extensions are preset by the properties managed by - * {@link PropertiesLoader}. - *

- * Hint: It's recommend to use either allowed or denied extensions for - * one file type. Never use both at the same time! That's why - * denied extensions of a file type will be deleted if you set the allowed one - * and vice versa. - *

- * - * @version $Id$ - * @deprecated Class will be removed in FCKeditor.Java 2.6, functionality merged - * into {@link ResourceType}. - * @see ResourceType - */ -@Deprecated -public class ExtensionsHandler { - - private static Map> extensionsAllowed = new HashMap>(); - private static Map> extensionsDenied = new HashMap>(); - - static { - // load defaults - extensionsAllowed.put(ResourceType.FILE, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.file.extensions.allowed"))); - extensionsDenied.put(ResourceType.FILE, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.file.extensions.denied"))); - extensionsAllowed.put(ResourceType.MEDIA, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.media.extensions.allowed"))); - extensionsDenied.put(ResourceType.MEDIA, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.media.extensions.denied"))); - extensionsAllowed.put(ResourceType.IMAGE, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.image.extensions.allowed"))); - extensionsDenied.put(ResourceType.IMAGE, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.image.extensions.denied"))); - extensionsAllowed.put(ResourceType.FLASH, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.flash.extensions.allowed"))); - extensionsDenied.put(ResourceType.FLASH, Utils.getSet(PropertiesLoader - .getProperty("connector.resourceType.flash.extensions.denied"))); - } - - /** - * Getter for the allowed extensions of a file type. - * - * @param type - * The file type. - * @return Set of allowed extensions or an empty set. - */ - public static Set getExtensionsAllowed(final ResourceType type) { - return extensionsAllowed.get(type); - } - - /** - * Setter for the allowed extensions of a file type. The denied extensions - * will be cleared.
- * If extensionsList is null, allowed - * extensions are kept untouched. - * - * @param type - * The file type. - * @param extensionsList - * Required format: ext1|ext2|ext3 - */ - public static void setExtensionsAllowed(final ResourceType type, final String extensionsList) { - if (extensionsList != null) { - extensionsAllowed.put(type, Utils.getSet(extensionsList)); - extensionsDenied.get(type).clear(); - } - } - - /** - * Getter for the denied extensions of a file type. - * - * @param type - * The file type. - * @return Set of denied extensions or an empty set. - */ - public static Set getExtensionsDenied(final ResourceType type) { - return extensionsDenied.get(type); - } - - /** - * Setter for the denied extensions of a file type. The allowed extensions - * will be cleared.
- * If extensionsList is null, denied - * extensions are kept untouched. - * - * @param type - * The file type. - * @param extensionsList - * Required format: ext1|ext2|ext3 - */ - public static void setExtensionsDenied(final ResourceType type, final String extensionsList) { - if (extensionsList != null) { - extensionsDenied.put(type, Utils.getSet(extensionsList)); - extensionsAllowed.get(type).clear(); - } - } - - /** - * Checks if an extension is allowed for a file type. - * - * @param type - * The resource type you want to check. - * @param extension - * The extension you want to check. - * @return true is extension is allowed else - * false. Attention: false - * is always returned if 'type' or 'extensions' is null. - */ - public static boolean isAllowed(final ResourceType type, final String extension) { - if (type == null || extension == null) - return false; - String ext = extension.toLowerCase(); - Set allowed = extensionsAllowed.get(type); - Set denied = extensionsDenied.get(type); - if (allowed.isEmpty()) - return !denied.contains(ext); - if (denied.isEmpty()) - return allowed.contains(ext); - return false; - } -} Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tags/CheckTag.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tags/CheckTag.java (revision 4327) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tags/CheckTag.java (revision 4328) @@ -59,9 +59,5 @@ private static final String FILE_UPLOAD = "FileUpload"; - @Deprecated - private static final String FILE_BROWSING = "FileBrowsing"; private static final String GET_RESOURCES = "GetResources"; - @Deprecated - private static final String FOLDER_CREATION = "FolderCreation"; private static final String CREATE_FOLDER = "CreateFolder"; private static final String COMPATIBLE_BROWSER = "CompatibleBrowser"; @@ -71,6 +67,4 @@ static { commands.add(FILE_UPLOAD); - commands.add(FILE_BROWSING); - commands.add(FOLDER_CREATION); commands.add(COMPATIBLE_BROWSER); commands.add(GET_RESOURCES); @@ -112,5 +106,5 @@ } - if (command.equals(FILE_BROWSING) || command.equals(GET_RESOURCES)) { + if (command.equals(GET_RESOURCES)) { if (RequestCycleHandler.isGetResourcesEnabled(request)) response = lm.getGetResourcesEnabled(); @@ -119,5 +113,5 @@ } - if (command.equals(FOLDER_CREATION) || command.equals(CREATE_FOLDER)) { + if (command.equals(CREATE_FOLDER)) { if (RequestCycleHandler.isCreateFolderEnabled(request)) response = lm.getCreateFolderEnabled(); Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tags/EditorTag.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tags/EditorTag.java (revision 4327) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tags/EditorTag.java (revision 4328) @@ -96,14 +96,4 @@ /** * @see FCKeditor#setConfig(String, String) - * @deprecated method will be removed in FCKeditor.Java 2.6, use - * {@link #setConfig(String, String)} - */ - @Deprecated - void setConfigParamAll(Map map) { - fckEditor.getConfig().putAll(map); - } - - /** - * @see FCKeditor#setConfig(String, String) */ void setConfig(String name, String value) { Index: Keditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/ExtensionsHandlerTest.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/test/java/net/fckeditor/handlers/ExtensionsHandlerTest.java (revision 4327) +++ (revision ) @@ -1,60 +1,0 @@ -/* - * FCKeditor - The text editor for Internet - http://www.fckeditor.net - * Copyright (C) 2003-2007 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.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Tests for {@link ExtensionsHandler}. - * - * @version $Id$ - * @see {@link ResourceTypeTest} - * @deprecated same reason as in {@link ExtensionsHandler} - */ -@Deprecated -public class ExtensionsHandlerTest { - - @Test - public void testIsAllowed01() { - ResourceType type = ResourceType.FILE; - ExtensionsHandler.setExtensionsAllowed(type, "a"); - ExtensionsHandler.setExtensionsDenied(type, "b"); - assertTrue(ExtensionsHandler.getExtensionsAllowed(type).isEmpty()); - assertTrue(ExtensionsHandler.getExtensionsDenied(type).contains("b")); - assertFalse(ExtensionsHandler.isAllowed(type, "b")); - assertTrue(ExtensionsHandler.isAllowed(type, "a")); - assertTrue(ExtensionsHandler.isAllowed(type, "c")); - } - - @Test - public void testIsAllowed02() { - ResourceType type = ResourceType.FILE; - ExtensionsHandler.setExtensionsAllowed(type, "a|b|c"); - assertTrue(ExtensionsHandler.isAllowed(type, "a")); - assertTrue(ExtensionsHandler.isAllowed(type, "b")); - assertTrue(ExtensionsHandler.isAllowed(type, "c")); - assertFalse(ExtensionsHandler.isAllowed(type, "d")); - } - -}