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 3418) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/FCKeditor.java (revision 3419) @@ -194,7 +194,7 @@ * override the configuration for each editor instance. * - * @deprecated method will be removed in FCKeditor.Java 2.6, use - * {@link FCKeditor#getConfig(String)} - * + * @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 */ @@ -233,7 +233,7 @@ * Sets the advanced configuration maps. Note: previously * - * @deprecated method will be removed in FCKeditor.Java 2.6, use - * {@link #setConfig(String, String)} - * + * @deprecated Method will be removed in FCKeditor.Java 2.6, use + * {@link #setConfig(String, String)}. + * @see #setConfig(String, String) * @param config * configuration collection Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java (revision 3418) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ConnectorHandler.java (revision 3419) @@ -36,6 +36,5 @@ * * @version $Id$ - * @deprecated Functionality will be merged into {@link Dispatcher}. Class will - * be removed in FCKeditor.Java 2.6. + * @deprecated Class will be removed in FCKeditor.Java 2.6. */ public class ConnectorHandler { @@ -57,8 +56,5 @@ logger.info("Connector initialized to {}", className); } catch (Throwable e) { - logger - .error( - "Connector implementation {} could not be instantiated", - className); + logger.error("Connector implementation {} could not be instantiated", className); // TODO should be throw a RuntimeException here } @@ -71,5 +67,6 @@ * @return UserFilesPath * @see PropertiesLoader#getUserFilesPath() - * @deprecated method will be removed in FCKeditor.Java 2.6 + * @deprecated Method will be removed in FCKeditor.Java 2.6, use + * {@link PropertiesLoader#getUserFilesPath()}. */ @Deprecated @@ -83,5 +80,6 @@ * @return UserFilesAbsolutePath * @see PropertiesLoader#getUserFilesAbsolutePath() - * @deprecated method will be removed in FCKeditor.Java 2.6 + * @deprecated Method will be removed in FCKeditor.Java 2.6, use + * {@link PropertiesLoader#getUserFilesAbsolutePath()}. */ @Deprecated @@ -95,5 +93,6 @@ * @return ForceSingleExtension * @see PropertiesLoader#isForceSingleExtension() - * @deprecated method will be removed in FCKeditor.Java 2.6 + * @deprecated Method will be removed in FCKeditor.Java 2.6, use + * {@link PropertiesLoader#isForceSingleExtension()}. */ @Deprecated @@ -108,5 +107,6 @@ * @return SecureImageUploads * @see PropertiesLoader#isSecureImageUploads() - * @deprecated method will be removed in FCKeditor.Java 2.6 + * @deprecated Method will be removed in FCKeditor.Java 2.6, use + * {@link PropertiesLoader#isSecureImageUploads()}. */ @Deprecated @@ -120,4 +120,6 @@ * * @return Implementation of {@link Connector}. + * @deprecated Method will be removed in FCKeditor.Java 2.6, functionality + * will be merged into {@link Dispatcher}. */ public static Connector getConnector() { Index: /FCKeditor.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 3418) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/ExtensionsHandler.java (revision 3419) @@ -39,6 +39,7 @@ * * @version $Id$ - * @deprecated Functionality merged into {@link ResourceType}. Class will be - * removed in FCKeditor.Java 2.6. + * @deprecated Class will be removed in FCKeditor.Java 2.6, functionality merged + * into {@link ResourceType}. + * @see ResourceType */ @Deprecated Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/PropertiesLoader.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/PropertiesLoader.java (revision 3418) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/PropertiesLoader.java (revision 3419) @@ -29,17 +29,19 @@ /** - * This handler gives you access to properties stored in - * /net/fckeditor/handlers/default.properties and - * /fckeditor.properties.
- * This class loads the properties files as follows: + * Manages FCKeditor.Java properties files. + *

+ * It manages/loads the properties files in the following order: *

    - *
  1. Load default.properties
    2. - *
  2. Load fckeditor.properties if present.
    3. + *
  3. the default properties as defined here, + *
  4. the user-defined properties (fckeditor.properties) if + * present. *
- * Attention: Properties specified in fckeditor.properties - * will override properties loaded from default.properties. - * (intended behavior)
- * Hint: You may set properties programmatically with - * {@link #setProperty(String, String)} instead or additionally. + * This means that user-defined properties override default ones. In + * the backend it utilizes the regular {@link Properties} class. + *

+ *

+ * Moreover, you can set properties programmatically too but make sure to + * override them before the first call of that specific property. * * @version $Id$ @@ -71,6 +73,6 @@ } catch (Exception e) { logger.error("Error while processing {}", DEFAULT_FILENAME); - throw new RuntimeException( - "Error while processing " + DEFAULT_FILENAME, e); + throw new RuntimeException("Error while processing " + + DEFAULT_FILENAME, e); } } @@ -93,6 +95,6 @@ } catch (Exception e) { logger.error("Error while processing {}", LOCAL_PROPERTIES); - throw new RuntimeException( - "Error while processing " + LOCAL_PROPERTIES, e); + throw new RuntimeException("Error while processing " + + LOCAL_PROPERTIES, e); } @@ -101,9 +103,6 @@ /** - * Getter for a property. + * Searches for the property with the specified key in this property list. * - * @param key - * The property key. - * @return The value for the specified key. * @see Properties#getProperty(String) */ @@ -113,15 +112,6 @@ /** - * Setter for a property. If the property already exists, the value will be - * overridden.
- * Hint: This method is intended as an alternative way to set - * properties programmatically instead of using the - * fckeditor.properties. It should never used inside - * FCKeditor.Java!!! + * Sets the property with the specified key in this property list. * - * @param key - * The property key. - * @param value - * The property value. * @see Properties#setProperty(String, String) */ @@ -130,80 +120,134 @@ } + /** + * Returns fckeditor.toolbarSet property + */ public static String getEditorToolbarSet() { return properties.getProperty("fckeditor.toolbarSet"); } + /** + * Returns fckeditor.width property + */ public static String getEditorWidth() { return properties.getProperty("fckeditor.width"); } + /** + * Returns fckeditor.height property + */ public static String getEditorHeight() { return properties.getProperty("fckeditor.height"); } + /** + * Returns fckeditor.basePath property + */ public static String getEditorBasePath() { return properties.getProperty("fckeditor.basePath"); } + /** + * Returns connector.resourceType.file.path property + */ public static String getFileResourceTypePath() { return properties.getProperty("connector.resourceType.file.path"); } + /** + * Returns connector.resourceType.flash.path property + */ public static String getFlashResourceTypePath() { return properties.getProperty("connector.resourceType.flash.path"); } + /** + * Returns connector.resourceType.image.path property + */ public static String getImageResourceTypePath() { return properties.getProperty("connector.resourceType.image.path"); } + /** + * Returns connector.resourceType.media.path property + */ public static String getMediaResourceTypePath() { return properties.getProperty("connector.resourceType.media.path"); } + /** + * Returns connector.resourceType.file.extensions.allowed + * property + */ public static String getFileResourceTypeAllowedExtensions() { return properties .getProperty("connector.resourceType.file.extensions.allowed"); } - + + /** + * Returns connector.resourceType.file.extensions.denied + * property + */ public static String getFileResourceTypeDeniedExtensions() { return properties .getProperty("connector.resourceType.file.extensions.denied"); } - + + /** + * Returns connector.resourceType.flash.extensions.allowed + * property + */ public static String getFlashResourceTypeAllowedExtensions() { return properties .getProperty("connector.resourceType.flash.extensions.allowed"); } - + + /** + * Returns connector.resourceType.flash.extensions.denied + * property + */ public static String getFlashResourceTypeDeniedExtensions() { return properties .getProperty("connector.resourceType.flash.extensions.denied"); } - + + /** + * Returns connector.resourceType.image.extensions.allowed + * property + */ public static String getImageResourceTypeAllowedExtensions() { return properties .getProperty("connector.resourceType.image.extensions.allowed"); } - + + /** + * Returns connector.resourceType.image.extensions.denied + * property + */ public static String getImageResourceTypeDeniedExtensions() { return properties .getProperty("connector.resourceType.image.extensions.denied"); } - + + /** + * Returns connector.resourceType.media.extensions.allowed + * property + */ public static String getMediaResourceTypeAllowedExtensions() { return properties .getProperty("connector.resourceType.media.extensions.allowed"); } - + + /** + * Returns connector.resourceType.media.extensions.denied + * property + */ public static String getMediaResourceTypeDeniedExtensions() { return properties .getProperty("connector.resourceType.media.extensions.denied"); } - - /** - * Getter for connector.userFilesPath property - * - * @return UserFilesPath + + /** + * Returns connector.userFilesPath property */ public static String getUserFilesPath() { @@ -212,7 +256,5 @@ /** - * Getter for connector.userFilesAbsolutePath property - * - * @return UserFilesAbsolutePath + * Returns connector.userFilesAbsolutePath property */ public static String getUserFilesAbsolutePath() { @@ -221,7 +263,5 @@ /** - * Getter for connector.forceSingleExtension property - * - * @return ForceSingleExtension + * Returns connector.forceSingleExtension property */ public static boolean isForceSingleExtension() { @@ -231,7 +271,5 @@ /** - * Getter for connector.secureImageUploads property - * - * @return SecureImageUploads + * Returns connector.secureImageUploads property */ public static boolean isSecureImageUploads() { @@ -239,17 +277,29 @@ .getProperty("connector.secureImageUploads")); } - + + /** + * Returns connector.impl property + */ public static String getConnectorImpl() { return properties.getProperty("connector.impl"); } - + + /** + * Returns connector.userActionImpl property + */ public static String getUserActionImpl() { return properties.getProperty("connector.userActionImpl"); } - + + /** + * Returns connector.userPathBuilderImpl property + */ public static String getUserPathBuilderImpl() { return properties.getProperty("connector.userPathBuilderImpl"); } - + + /** + * Returns connector.localeResolverImpl property + */ public static String getLocaleResolverImpl() { return properties.getProperty("localization.localeResolverImpl"); Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java (revision 3418) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/RequestCycleHandler.java (revision 3419) @@ -83,5 +83,5 @@ * {@link UserAction} isn't set. * @see #isGetResourcesEnabled(HttpServletRequest) - * @deprecated method will be removed in FCKeditor.Java 2.6 + * @deprecated Method will be removed in FCKeditor.Java 2.6. */ @Deprecated @@ -107,5 +107,5 @@ * {@link UserAction} isn't set. * @see #isFileUploadEnabled(HttpServletRequest) - * @deprecated method will be removed in FCKeditor.Java 2.6 + * @deprecated Method will be removed in FCKeditor.Java 2.6. */ public static boolean isEnabledForFileUpload( Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java (revision 3418) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/requestcycle/impl/UserActionImpl.java (revision 3419) @@ -32,6 +32,6 @@ * @see EnabledUserAction * @version $Id$ - * @deprecated function now served by {@link EnabledUserAction}. Class will be - * removed in FCKeditor.Java 2.6. + * @deprecated Class will be removed in FCKeditor.Java 2.6, functionality now + * served by {@link EnabledUserAction}. */ @Deprecated