Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedProperties.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedProperties.java (revision 2659) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedProperties.java (revision 2659) @@ -0,0 +1,203 @@ +/* + * 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.Enumeration; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.ResourceBundle; + +import javax.servlet.http.HttpServletRequest; + +import net.fckeditor.localization.LocaleResolver; +import net.fckeditor.tool.Utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * This class wraps to a {@link LocaleResolver} implementation and retrieves + * localized strings for a given request. This class safely returns default + * strings if anything fails. Loaded strings will be cached on load. + * + * @version $Id$ + * + */ +public class LocalizedProperties implements Cloneable { + + private static Map prototypes = new HashMap(); + private Properties properties; + private static LocaleResolver localeResolver; + private static final Locale NEUTRAL = new Locale(""); + private static final Logger logger = LoggerFactory + .getLogger(LocalizedProperties.class); + + /** + * This method return an instance of this class for the given locale. + * + * @param request + * The current request instance + * @return The LP instance with localized strings. + */ + public static LocalizedProperties getInstance( + HttpServletRequest request) { + + Locale locale; + + if (request == null) + locale = NEUTRAL; + else + locale = getLocaleResolverInstance().resolveLocale(request); + + if (locale == null) + locale = NEUTRAL; + + LocalizedProperties lp = prototypes.get(locale); + if (lp == null) { + lp = new LocalizedProperties(locale); + prototypes.put(locale, lp); + } + + // for now we don't need any cloning since the values are accessed + // read-only + return lp; + + } + + private static LocaleResolver getLocaleResolverInstance() { + + if (localeResolver == null) { + String className = PropertiesLoader + .getProperty("localization.localeResolverImpl"); + + if (Utils.isEmpty(className)) + logger + .error("Empty LocaleResolver implementation class name provided"); + else + try { + Class clazz = Class.forName(className); + localeResolver = (LocaleResolver) clazz.newInstance(); + logger.info("LocaleResolver initialized to {}", className); + } catch (Exception e) { + logger + .error( + "LocaleResolver implementation {} could not be instantiated", + className); + } + } + + return localeResolver; + } + + @Override + protected Object clone() { + LocalizedProperties cloned; + try { + cloned = (LocalizedProperties) super.clone(); + } catch (CloneNotSupportedException e) { + throw new RuntimeException(e); + } + cloned.properties = (Properties) this.properties.clone(); + return cloned; + } + + /** + * Loads the default strings and the string for the given locale and only + * for this locale. + * + * @param locale + * Given locale + */ + private LocalizedProperties(Locale locale) { + + ResourceBundle rb = null; + try { + rb = ResourceBundle.getBundle("fckeditor", locale, Thread + .currentThread().getContextClassLoader()); + } catch (Exception e) { + logger.debug("No resource bundle found for locale {}", locale); + } + + this.properties = new Properties(PropertiesLoader.getProperties()); + + if (rb != null + && rb.getLocale().getLanguage().equals(locale.getLanguage())) { + Enumeration keys = rb.getKeys(); + + while (keys.hasMoreElements()) { + String key = keys.nextElement(); + properties.setProperty(key, rb.getString(key)); + } + } + + } + + private String getString(String key) { + return properties.getProperty(key); + } + + public String getCompatibleBrowser() { + return getString("message.compatible_browser.yes"); + } + + public String getNotCompatibleBrowser() { + return getString("message.compatible_browser.no"); + } + + public String getFileUploadEnabled() { + return getString("message.connector.fileUpload.enabled"); + } + + public String getFileUploadDisabled() { + return getString("message.connector.fileUpload.disabled"); + } + + public String getFileBrowsingEnabled() { + return getString("message.connector.fileBrowsing.enabled"); + } + + public String getFileBrowsingDisabled() { + return getString("message.connector.fileBrowsing.disabled"); + } + + public String getFolderCreationEnabled() { + return getString("message.connector.folderCreation.enabled"); + } + + public String getFolderCreationDisabled() { + return getString("message.connector.folderCreation.disabled"); + } + + public String getInvalidCommand() { + return getString("message.connector.invalid_command_specified"); + } + + public String getInvalidType() { + return getString("message.connector.invalid_type_specified"); + } + + public String getInvalidCurrentFolder() { + return getString("message.connector.invalid_current_folder_speficied"); + } + +} Index: Keditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedPropertiesLoader.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/handlers/LocalizedPropertiesLoader.java (revision 2658) +++ (revision ) @@ -1,203 +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.Enumeration; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.ResourceBundle; - -import javax.servlet.http.HttpServletRequest; - -import net.fckeditor.localization.LocaleResolver; -import net.fckeditor.tool.Utils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This class wraps to a {@link LocaleResolver} implementation and retrieves - * localized strings for a given request. This class safely returns default - * strings if anything fails. Loaded strings will be cached on load. - * - * @version $Id$ - * - */ -public class LocalizedPropertiesLoader implements Cloneable { - - private static Map prototypes = new HashMap(); - private Properties properties; - private static LocaleResolver localeResolver; - private static final Locale NEUTRAL = new Locale(""); - private static final Logger logger = LoggerFactory - .getLogger(LocalizedPropertiesLoader.class); - - /** - * This method return an instance of this class for the given locale. - * - * @param request - * The current request instance - * @return The LPL instance with localized strings. - */ - public static LocalizedPropertiesLoader getInstance( - HttpServletRequest request) { - - Locale locale; - - if (request == null) - locale = NEUTRAL; - else - locale = getLocaleResolverInstance().resolveLocale(request); - - if (locale == null) - locale = NEUTRAL; - - LocalizedPropertiesLoader lpl = prototypes.get(locale); - if (lpl == null) { - lpl = new LocalizedPropertiesLoader(locale); - prototypes.put(locale, lpl); - } - - // for now we don't need any cloning since the values are accessed - // read-only - return lpl; - - } - - private static LocaleResolver getLocaleResolverInstance() { - - if (localeResolver == null) { - String className = PropertiesLoader - .getProperty("localization.localeResolverImpl"); - - if (Utils.isEmpty(className)) - logger - .error("Empty LocaleResolver implementation class name provided"); - else - try { - Class clazz = Class.forName(className); - localeResolver = (LocaleResolver) clazz.newInstance(); - logger.info("LocaleResolver initialized to {}", className); - } catch (Exception e) { - logger - .error( - "LocaleResolver implementation {} could not be instantiated", - className); - } - } - - return localeResolver; - } - - @Override - protected Object clone() { - LocalizedPropertiesLoader cloned; - try { - cloned = (LocalizedPropertiesLoader) super.clone(); - } catch (CloneNotSupportedException e) { - throw new RuntimeException(e); - } - cloned.properties = (Properties) this.properties.clone(); - return cloned; - } - - /** - * Loads the default strings and the string for the given locale and only - * for this locale. - * - * @param locale - * Given locale - */ - private LocalizedPropertiesLoader(Locale locale) { - - ResourceBundle rb = null; - try { - rb = ResourceBundle.getBundle("fckeditor", locale, Thread - .currentThread().getContextClassLoader()); - } catch (Exception e) { - logger.debug("No resource bundle found for locale '{}'", locale); - } - - this.properties = new Properties(PropertiesLoader.getProperties()); - - if (rb != null - && rb.getLocale().getLanguage().equals(locale.getLanguage())) { - Enumeration keys = rb.getKeys(); - - while (keys.hasMoreElements()) { - String key = keys.nextElement(); - properties.setProperty(key, rb.getString(key)); - } - } - - } - - private String getString(String key) { - return properties.getProperty(key); - } - - public String getCompatibleBrowser() { - return getString("message.compatible_browser.yes"); - } - - public String getNotCompatibleBrowser() { - return getString("message.compatible_browser.no"); - } - - public String getFileUploadEnabled() { - return getString("message.connector.fileUpload.enabled"); - } - - public String getFileUploadDisabled() { - return getString("message.connector.fileUpload.disabled"); - } - - public String getFileBrowsingEnabled() { - return getString("message.connector.fileBrowsing.enabled"); - } - - public String getFileBrowsingDisabled() { - return getString("message.connector.fileBrowsing.disabled"); - } - - public String getFolderCreationEnabled() { - return getString("message.connector.folderCreation.enabled"); - } - - public String getFolderCreationDisabled() { - return getString("message.connector.folderCreation.disabled"); - } - - public String getInvalidCommand() { - return getString("message.connector.invalid_command_specified"); - } - - public String getInvalidType() { - return getString("message.connector.invalid_type_specified"); - } - - public String getInvalidCurrentFolder() { - return getString("message.connector.invalid_current_folder_speficied"); - } - -} Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/GetResponse.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/GetResponse.java (revision 2658) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/GetResponse.java (revision 2659) @@ -36,5 +36,5 @@ import net.fckeditor.connector.Connector; import net.fckeditor.handlers.Command; -import net.fckeditor.handlers.LocalizedPropertiesLoader; +import net.fckeditor.handlers.LocalizedProperties; import net.fckeditor.handlers.ResourceType; import net.fckeditor.requestcycle.ThreadLocalData; @@ -248,16 +248,16 @@ public static GetResponse getErrorInvalidCommand() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new GetResponse(EN_ERROR, lpl.getInvalidCommand()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new GetResponse(EN_ERROR, lp.getInvalidCommand()); } public static GetResponse getErrorInvalidType() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new GetResponse(EN_ERROR, lpl.getInvalidType()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new GetResponse(EN_ERROR, lp.getInvalidType()); } public static GetResponse getErrorInvalidCurrentFolder() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new GetResponse(EN_ERROR, lpl.getInvalidCurrentFolder()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new GetResponse(EN_ERROR, lp.getInvalidCurrentFolder()); } @@ -271,11 +271,11 @@ public static GetResponse getErrorFileBrowsingDisabled() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new GetResponse(EN_ERROR, lpl.getFileBrowsingDisabled()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new GetResponse(EN_ERROR, lp.getFileBrowsingDisabled()); } public static GetResponse getErrorFolderCreationDisabled() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new GetResponse(EN_ERROR, lpl.getFolderCreationDisabled()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new GetResponse(EN_ERROR, lp.getFolderCreationDisabled()); } Index: /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/UploadResponse.java =================================================================== --- /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/UploadResponse.java (revision 2658) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/response/UploadResponse.java (revision 2659) @@ -21,5 +21,5 @@ package net.fckeditor.response; -import net.fckeditor.handlers.LocalizedPropertiesLoader; +import net.fckeditor.handlers.LocalizedProperties; import net.fckeditor.requestcycle.ThreadLocalData; import net.fckeditor.tool.Utils; @@ -142,21 +142,21 @@ public static UploadResponse getErrorInvalidCommand() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new UploadResponse(SC_ERROR, null, null, lpl.getInvalidCommand()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new UploadResponse(SC_ERROR, null, null, lp.getInvalidCommand()); } public static UploadResponse getErrorInvalidType() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new UploadResponse(SC_ERROR, null, null, lpl.getInvalidType()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new UploadResponse(SC_ERROR, null, null, lp.getInvalidType()); } public static UploadResponse getErrorInvalidCurrentFolder() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new UploadResponse(SC_ERROR, null, null, lpl.getInvalidCurrentFolder()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new UploadResponse(SC_ERROR, null, null, lp.getInvalidCurrentFolder()); } public static UploadResponse getErrorFileUploadDisabled() { - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader.getInstance(ThreadLocalData.getRequest()); - return new UploadResponse(SC_ERROR, null, null, lpl.getFileUploadDisabled()); + LocalizedProperties lp = LocalizedProperties.getInstance(ThreadLocalData.getRequest()); + return new UploadResponse(SC_ERROR, null, null, lp.getFileUploadDisabled()); } 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 2658) +++ /FCKeditor.Java/trunk/java-core/src/main/java/net/fckeditor/tags/CheckTag.java (revision 2659) @@ -31,5 +31,5 @@ import javax.servlet.jsp.tagext.TagSupport; -import net.fckeditor.handlers.LocalizedPropertiesLoader; +import net.fckeditor.handlers.LocalizedProperties; import net.fckeditor.handlers.RequestCycleHandler; import net.fckeditor.tool.Compatibility; @@ -82,5 +82,5 @@ HttpServletRequest request = (HttpServletRequest) pageContext .getRequest(); - LocalizedPropertiesLoader lpl = LocalizedPropertiesLoader + LocalizedProperties lp = LocalizedProperties .getInstance(request); String response = null; @@ -88,28 +88,28 @@ if (command.equals(FILE_UPLOAD)) { if (RequestCycleHandler.isEnabledForFileUpload(request)) - response = lpl.getFileUploadEnabled(); + response = lp.getFileUploadEnabled(); else - response = lpl.getFileUploadDisabled(); + response = lp.getFileUploadDisabled(); } if (command.equals(FILE_BROWSING)) { if (RequestCycleHandler.isEnabledForFileBrowsing(request)) - response = lpl.getFileBrowsingEnabled(); + response = lp.getFileBrowsingEnabled(); else - response = lpl.getFileBrowsingDisabled(); + response = lp.getFileBrowsingDisabled(); } if (command.equals(FOLDER_CREATION)) { if (RequestCycleHandler.isEnabledForFolderCreation(request)) - response = lpl.getFolderCreationEnabled(); + response = lp.getFolderCreationEnabled(); else - response = lpl.getFolderCreationDisabled(); + response = lp.getFolderCreationDisabled(); } if (command.equals(COMPATIBLE_BROWSER)) { if (Compatibility.isCompatibleBrowser(request)) - response = lpl.getCompatibleBrowser(); + response = lp.getCompatibleBrowser(); else - response = lpl.getNotCompatibleBrowser(); + response = lp.getNotCompatibleBrowser(); }