Index: Keditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java =================================================================== --- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/handlers/ResourceTypeHandler.java (revision 2424) +++ (revision ) @@ -1,180 +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 different resource types. - * - * @version $Id$ - * @deprecated - */ -public class ResourceTypeHandler { - - private String name; - private static Map types = new HashMap( - 4); - private static Map paths = new HashMap( - 4); - public static final ResourceTypeHandler FILE = new ResourceTypeHandler("File"); - public static final ResourceTypeHandler FLASH = new ResourceTypeHandler("Flash"); - public static final ResourceTypeHandler IMAGE = new ResourceTypeHandler("Image"); - public static final ResourceTypeHandler MEDIA = new ResourceTypeHandler("Media"); - - static { - // initialize the resource types - types.put(FILE.getName(), FILE); - types.put(FLASH.getName(), FLASH); - types.put(IMAGE.getName(), IMAGE); - types.put(MEDIA.getName(), MEDIA); - - // initialize the sub folders for each resource type - paths.put(FILE, PropertiesLoader.getProperty("connector.resourceType.file.path")); - paths.put(IMAGE, PropertiesLoader.getProperty("connector.resourceType.image.path")); - paths.put(FLASH, PropertiesLoader.getProperty("connector.resourceType.flash.path")); - paths.put(MEDIA, PropertiesLoader.getProperty("connector.resourceType.media.path")); - } - - private ResourceTypeHandler(final String name) { - this.name = name; - } - - /** - * Getter for the name. - * - * @return name - */ - public String getName() { - return name; - } - - /** - * Getter for the resource type path (sub folder). - * - * @return The path (sub folder). - */ - public String getPath() { - return paths.get(this); - } - - /** - * Getter for a {@link ResourceTypeHandler} for a specified string. - * - * @param name - * A resource type to retrieve. - * @return A {@link ResourceTypeHandler} object holding the value - * represented by the string argument. - * @throws IllegalArgumentException - * If 'name' is null, empty, or does not exist. - */ - public static ResourceTypeHandler valueOf(final String name) throws IllegalArgumentException { - if (Utils.isEmpty(name)) - throw new IllegalArgumentException(); - - ResourceTypeHandler rt = types.get(name); - if (rt == null) - throw new IllegalArgumentException(); - return rt; - } - - /** - * - * Checks if a specified string represents a valid resource type. - * - * @param name - * A resource type string to check. - * @return true if the string representation is valid else - * false. - */ - public static boolean isValid(final String name) { - return types.containsKey(name); - } - - /** - * Tries to determine ResourceType from string and return {@link #FILE} if - * provided string is invalid. - * - * @param name - * @return resource type - */ - public static ResourceTypeHandler getDefaultResourceType(final String name) { - ResourceTypeHandler rt = getResourceType(name); - return rt == null ? FILE : rt; - } - - /** - * A wrapper for {@link #valueOf(String)}. It returns null - * instead of throwing an exception. - * - * @param name - * A resource type string to check. - * @return A {@link ResourceTypeHandler} object holding the value - * represented by the string argument, or null. - */ - public static ResourceTypeHandler getResourceType(final String name) { - try { - return ResourceTypeHandler.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 { - ResourceTypeHandler rt = (ResourceTypeHandler) 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/branches/2.5-test/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeHandlerTest.java =================================================================== --- /FCKeditor.Java/branches/2.5-test/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeHandlerTest.java (revision 2424) +++ (revision ) @@ -1,89 +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 net.fckeditor.handlers.PropertiesLoader; -import net.fckeditor.handlers.ResourceTypeHandler; - -import org.junit.Test; - -/** - * Tests for {@link ResourceTypeHandler}. - * - * @version $Id: ResourceTypeHandlerTest.java 1585 2008-02-21 18:13:09Z th-schwarz $ - */ -public class ResourceTypeHandlerTest { - - @Test - public void getType01() throws Exception { - assertNull(ResourceTypeHandler.getResourceType("xyz")); - } - - @Test - public void getType02() throws Exception { - assertEquals(ResourceTypeHandler.FILE, ResourceTypeHandler.getResourceType("File")); - } - - @Test - public void getType03() throws Exception { - assertEquals(ResourceTypeHandler.IMAGE, ResourceTypeHandler.getResourceType("Image")); - } - - @Test - public void isValid01() throws Exception { - assertFalse(ResourceTypeHandler.isValid("1234")); - } - - @Test - public void isValid02() throws Exception { - assertFalse(ResourceTypeHandler.isValid("fLash")); - } - - @Test - public void isValid03() throws Exception { - assertFalse(ResourceTypeHandler.isValid("MeDiA")); - } - - @Test - public void getTypeDefault01() throws Exception { - assertEquals(ResourceTypeHandler.FILE, ResourceTypeHandler - .getDefaultResourceType("wrong-type")); - } - - @Test - public void getTypeDefault02() throws Exception { - assertNotSame(ResourceTypeHandler.FLASH, ResourceTypeHandler - .getDefaultResourceType("flAsh")); - } - - @Test - public void getSubDirForType01() throws Exception { - assertEquals(PropertiesLoader.getProperty("connector.resourceType.file.path"), - ResourceTypeHandler.getDefaultResourceType(null).getPath()); - } - - @Test - public void getSubDirForType02() throws Exception { - assertEquals(PropertiesLoader.getProperty("connector.resourceType.image.path"), - ResourceTypeHandler.getResourceType("Image").getPath()); - } -} Index: /FCKeditor.Java/branches/2.5-test/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeTest.java =================================================================== --- /FCKeditor.Java/branches/2.5-test/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeTest.java (revision 2425) +++ /FCKeditor.Java/branches/2.5-test/java-core/src/test/java/net/fckeditor/handlers/ResourceTypeTest.java (revision 2425) @@ -0,0 +1,77 @@ +/* + * 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.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Tests for {@link ResourceTypeHandler}. + * + * @version $Id: ResourceTypeTest.java 1585 2008-02-21 18:13:09Z th-schwarz $ + */ +public class ResourceTypeTest { + + @Test + public void getType01() throws Exception { + assertNull(ResourceType.getResourceType("xyz")); + } + + @Test + public void getType02() throws Exception { + assertEquals(ResourceType.FILE, ResourceType.getResourceType("File")); + } + + @Test + public void getType03() throws Exception { + assertEquals(ResourceType.IMAGE, ResourceType.getResourceType("ImaGe")); + } + @Test + public void isValid01() throws Exception { + assertFalse(ResourceType.isValid("1234")); + } + + @Test + public void isValid02() throws Exception { + assertTrue(ResourceType.isValid("fLash")); + } + + @Test + public void isValid03() throws Exception { + assertTrue(ResourceType.isValid("MeDiA")); + } + + @Test + public void getTypeDefault01() throws Exception { + assertEquals(ResourceType.FILE, ResourceType + .getDefaultResourceType("wrong-type")); + } + + @Test + public void getTypeDefault02() throws Exception { + assertEquals(ResourceType.FLASH, ResourceType + .getDefaultResourceType("flAsh")); + } +}