Menu
▾
▴
openutils-svn
|
From: <mol...@us...> - 2009-02-13 17:48:34
|
Revision: 992
http://openutils.svn.sourceforge.net/openutils/?rev=992&view=rev
Author: molaschi
Date: 2009-02-13 17:48:24 +0000 (Fri, 13 Feb 2009)
Log Message:
-----------
fixes
Modified Paths:
--------------
trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java
trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/OpenutilsMgnlMessagesManager.java
Added Paths:
-----------
trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java
Removed Paths:
-------------
trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesProvider.java
Added: trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java (rev 0)
+++ trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/DefaultMessagesManager.java 2009-02-13 17:48:24 UTC (rev 992)
@@ -0,0 +1,350 @@
+/**
+ * This file Copyright (c) 2003-2009 Magnolia International
+ * Ltd. (http://www.magnolia-cms.com). All rights reserved.
+ *
+ *
+ * This file is dual-licensed under both the Magnolia
+ * Network Agreement and the GNU General Public License.
+ * You may elect to use one or the other of these licenses.
+ *
+ * This file is distributed in the hope that it will be
+ * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
+ * Redistribution, except as permitted by whichever of the GPL
+ * or MNA you select, is prohibited.
+ *
+ * 1. For the GPL license (GPL), you can redistribute and/or
+ * modify this file under the terms of the GNU General
+ * Public License, Version 3, as published by the Free Software
+ * Foundation. You should have received a copy of the GNU
+ * General Public License, Version 3 along with this program;
+ * if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 2. For the Magnolia Network Agreement (MNA), this file
+ * and the accompanying materials are made available under the
+ * terms of the MNA which accompanies this distribution, and
+ * is available at http://www.magnolia-cms.com/mna.html
+ *
+ * Any modifications to this file must keep this entire header
+ * intact.
+ *
+ */
+package info.magnolia.cms.i18n;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.core.ItemType;
+import info.magnolia.cms.util.FactoryUtil;
+import info.magnolia.cms.util.NodeDataUtil;
+import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.content2bean.Content2BeanUtil;
+import info.magnolia.context.MgnlContext;
+import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections.map.LazyMap;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+
+
+/**
+ * From this class you get the i18n messages. You should pass a a request, but if you can't the getMessages method will
+ * handle it properly. The get() methods are easy to use.
+ * @author philipp
+ */
+public class DefaultMessagesManager extends MessagesManager
+{
+
+ private final static Logger log = LoggerFactory.getLogger(DefaultMessagesManager.class);
+
+ /**
+ * The current locale of the application.
+ */
+ private Locale applicationLocale;
+
+ /**
+ * List of the available locales.
+ */
+ private final Collection availableLocales = new ArrayList();
+
+ /**
+ * Map for the messages.
+ */
+ private Map messages;
+
+ private String defaultBasename = DEFAULT_BASENAME;
+
+ public DefaultMessagesManager()
+ {
+ // setting default language (en)
+ setDefaultLocale(FALLBACK_LOCALE);
+
+ initMap();
+ }
+
+ // for tests
+ @Override
+ void setDefaultBasename(String defaultBasename)
+ {
+ this.defaultBasename = defaultBasename;
+ }
+
+ /**
+ * Called through the initialization process. (startup of the container)
+ */
+ @Override
+ public void init()
+ {
+ load();
+ registerEventListener();
+ }
+
+ /**
+ * The lazy Map creates messages objects with a fall back to the default locale.
+ */
+ protected void initMap()
+ {
+ // FIXME use LRU: new LRUMap(20);
+ // LazyMap will instanciate bundles on demand.
+ final Map map = LazyMap.decorate(new HashMap(), new Transformer()
+ {
+
+ // this transformer will wrap the Messages in a MessagesChain which
+ // will fall back to a Messages instance for the same bundle with
+ // default locale.
+ public Object transform(Object input)
+ {
+ final MessagesID id = (MessagesID) input;
+ return newMessages(id);
+ }
+ });
+ messages = Collections.synchronizedMap(map);
+ }
+
+ /**
+ * Initializes a new Messages instances for the given MessagesID. By default, we chain to the same bundle with the
+ * default Locale. (so untranslated messages show up in the default language)
+ */
+ protected Messages newMessages(MessagesID messagesID)
+ {
+ Messages msgs = new DefaultMessagesImpl(messagesID.basename, messagesID.locale);
+ if (!getDefaultLocale().equals(messagesID.locale))
+ {
+ msgs = new MessagesChain(msgs).chain(getMessages(messagesID.basename, getDefaultLocale()));
+ }
+ return msgs;
+ }
+
+ /**
+ * Load i18n configuration.
+ */
+ protected void load()
+ {
+
+ // reading the configuration from the repository, no need for context
+ HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(ContentRepository.CONFIG);
+
+ try
+ {
+ log.info("Loading i18n configuration - " + I18N_CONFIG_PATH); //$NON-NLS-1$
+
+ // checks if node exists
+ if (!hm.isExist(I18N_CONFIG_PATH))
+ {
+ // configNode = ContentUtil.createPath(hm, I18N_CONFIG_PATH,
+ // ItemType.CONTENT, true);
+ log.warn(I18N_CONFIG_PATH + " does not exist yet; skipping.");
+ return;
+ }
+
+ final Content configNode = hm.getContent(I18N_CONFIG_PATH); //$NON-NLS-1$
+
+ setDefaultLocale(NodeDataUtil.getString(configNode, FALLBACK_NODEDATA, FALLBACK_LOCALE));
+
+ // get the available languages - creates it if it does not exist -
+ // necessary to update to 3.5
+ final Content languagesNode;
+ if (configNode.hasContent(LANGUAGES_NODE_NAME))
+ {
+ languagesNode = configNode.getContent(LANGUAGES_NODE_NAME);
+ }
+ else
+ {
+ languagesNode = configNode.createContent(LANGUAGES_NODE_NAME, ItemType.CONTENT);
+ }
+
+ Map languageDefinitions = Content2BeanUtil.toMap(languagesNode, true, LocaleDefinition.class);
+
+ // clear collection for reload
+ availableLocales.clear();
+
+ for (Iterator iter = languageDefinitions.values().iterator(); iter.hasNext();)
+ {
+ LocaleDefinition ld = (LocaleDefinition) iter.next();
+ if (ld.isEnabled())
+ {
+ availableLocales.add(ld.getLocale());
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to load i18n configuration - " + I18N_CONFIG_PATH, e); //$NON-NLS-1$
+ }
+ }
+
+ /**
+ * Register an event listener: reload configuration when something changes.
+ */
+ private void registerEventListener()
+ {
+ log.info("Registering event listener for i18n"); //$NON-NLS-1$
+ ObservationUtil.registerChangeListener(ContentRepository.CONFIG, I18N_CONFIG_PATH, new EventListener()
+ {
+
+ public void onEvent(EventIterator iterator)
+ {
+ // reload everything
+ reload();
+ }
+ });
+ }
+
+ /**
+ * Reload i18n configuration.
+ */
+ public void reload()
+ {
+ try
+ {
+ // reload all present
+ for (Iterator iter = messages.values().iterator(); iter.hasNext();)
+ {
+ Messages msgs = (Messages) iter.next();
+ msgs.reload();
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Can't reload i18n messages", e);
+ }
+ initMap();
+ load();
+ }
+
+ @Override
+ public Messages getMessagesInternal(String basename, Locale locale)
+ {
+ if (StringUtils.isEmpty(basename))
+ {
+ basename = defaultBasename;
+ }
+ return (Messages) messages.get(new MessagesID(basename, locale));
+ }
+
+ @Override
+ public Locale getDefaultLocale()
+ {
+ return applicationLocale;
+ }
+
+ /**
+ * @param defaultLocale The defaultLocale to set.
+ * @deprecated since 4.0 - not used and should not be. Use setLocale() on the SystemContext instead. --note: do not
+ * remove the method, make it private. applicationLocale field is still needed. --and/or remove duplication with
+ * SystemContext.locale
+ */
+ public void setDefaultLocale(String defaultLocale)
+ {
+ this.applicationLocale = new Locale(defaultLocale);
+ // MgnlContext.getSystemContext().setLocale(applicationLocale);
+ }
+
+ @Override
+ public Collection getAvailableLocales()
+ {
+ return availableLocales;
+ }
+
+ public void setMessages(Map messages)
+ {
+ this.messages = messages;
+ }
+
+ /**
+ * Used as the key in the Map.
+ * @author Philipp Bracher
+ * @version $Revision: 21431 $ ($Author: gjoseph $)
+ */
+ public static class MessagesID
+ {
+
+ private final String basename;
+
+ private final Locale locale;
+
+ public MessagesID(String basename, Locale locale)
+ {
+ this.basename = basename;
+ this.locale = locale;
+ }
+
+ // generated equals and hashcode methods
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o)
+ return true;
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ MessagesID that = (MessagesID) o;
+
+ if (basename != null ? !basename.equals(that.basename) : that.basename != null)
+ return false;
+ if (locale != null ? !locale.equals(that.locale) : that.locale != null)
+ return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = basename != null ? basename.hashCode() : 0;
+ result = 31 * result + (locale != null ? locale.hashCode() : 0);
+ return result;
+ }
+
+ /**
+ * Returns the basename.
+ * @return the basename
+ */
+ public String getBasename()
+ {
+ return basename;
+ }
+
+ /**
+ * Returns the locale.
+ * @return the locale
+ */
+ public Locale getLocale()
+ {
+ return locale;
+ }
+
+ }
+}
Modified: trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java 2009-02-13 16:33:21 UTC (rev 991)
+++ trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesManager.java 2009-02-13 17:48:24 UTC (rev 992)
@@ -1,360 +1,123 @@
-/**
- * This file Copyright (c) 2003-2009 Magnolia International
- * Ltd. (http://www.magnolia-cms.com). All rights reserved.
- *
- *
- * This file is dual-licensed under both the Magnolia
- * Network Agreement and the GNU General Public License.
- * You may elect to use one or the other of these licenses.
- *
- * This file is distributed in the hope that it will be
- * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
- * Redistribution, except as permitted by whichever of the GPL
- * or MNA you select, is prohibited.
- *
- * 1. For the GPL license (GPL), you can redistribute and/or
- * modify this file under the terms of the GNU General
- * Public License, Version 3, as published by the Free Software
- * Foundation. You should have received a copy of the GNU
- * General Public License, Version 3 along with this program;
- * if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 2. For the Magnolia Network Agreement (MNA), this file
- * and the accompanying materials are made available under the
- * terms of the MNA which accompanies this distribution, and
- * is available at http://www.magnolia-cms.com/mna.html
- *
- * Any modifications to this file must keep this entire header
- * intact.
- *
- */
package info.magnolia.cms.i18n;
-import info.magnolia.cms.beans.config.ContentRepository;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
import info.magnolia.cms.util.FactoryUtil;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.cms.util.ObservationUtil;
-import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.context.MgnlContext;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.map.LazyMap;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.jcr.observation.EventIterator;
-import javax.jcr.observation.EventListener;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Locale;
-import java.util.Map;
-
/**
- * From this class you get the i18n messages. You should pass a a request, but if you can't the getMessages method will
- * handle it properly. The get() methods are easy to use.
- *
- * @author philipp
+ *
+ * @author molaschi
+ *
*/
-public final class MessagesManager implements MessagesProvider{
- private final static Logger log = LoggerFactory.getLogger(MessagesManager.class);
+public abstract class MessagesManager {
- /**
- * Use this locale if no other provided.
- */
- public static final String FALLBACK_LOCALE = "en"; //$NON-NLS-1$
+ /**
+ * Use this locale if no other provided.
+ */
+ public static final String FALLBACK_LOCALE = "en"; //$NON-NLS-1$
- /**
- * Use this basename if no other is provided.
- */
- public static final String DEFAULT_BASENAME = "info.magnolia.module.admininterface.messages"; //$NON-NLS-1$
+ /**
+ * Use this basename if no other is provided.
+ */
+ public static final String DEFAULT_BASENAME = "info.magnolia.module.admininterface.messages"; //$NON-NLS-1$
- /**
- * The node name where the configuration for i18n is stored.
- */
- private static final String I18N_CONFIG_PATH = "/server/i18n/system"; //$NON-NLS-1$
+ /**
+ * The node name where the configuration for i18n is stored.
+ */
+ public static final String I18N_CONFIG_PATH = "/server/i18n/system"; //$NON-NLS-1$
- /**
- * The name of the property to store the current system language.
- */
- private static final String FALLBACK_NODEDATA = "fallbackLanguage"; //$NON-NLS-1$
+ /**
+ * The name of the property to store the current system language.
+ */
+ public static final String FALLBACK_NODEDATA = "fallbackLanguage"; //$NON-NLS-1$
- /**
- * Under this node all the available languages are stored. They are showed in the user dialog.
- */
- private static final String LANGUAGES_NODE_NAME = "languages"; //$NON-NLS-1$
+ /**
+ * Under this node all the available languages are stored. They are showed
+ * in the user dialog.
+ */
+ public static final String LANGUAGES_NODE_NAME = "languages"; //$NON-NLS-1$
+ public static MessagesManager getInstance() {
+ return (MessagesManager) FactoryUtil
+ .getSingleton(MessagesManager.class);
+ }
- public static MessagesProvider getInstance() {
- return (MessagesProvider) FactoryUtil.getSingleton(MessagesManager.class);
- }
+ public static Messages getMessages() {
+ return getMessages(null, getCurrentLocale());
+ }
- /**
- * The current locale of the application.
- */
- private Locale applicationLocale;
+ public static Messages getMessages(String basename) {
+ return getMessages(basename, getCurrentLocale());
+ }
- /**
- * List of the available locales.
- */
- private final Collection availableLocales = new ArrayList();
+ public static Messages getMessages(Locale locale) {
+ return getMessages(null, locale);
+ }
- /**
- * Map for the messages.
- */
- private Map messages;
+ public static Messages getMessages(String basename, Locale locale) {
+ return getInstance().getMessagesInternal(basename, locale);
+ }
- private String defaultBasename = DEFAULT_BASENAME;
+ public static String get(String key) {
+ return getMessages().get(key);
+ }
- public MessagesManager() {
- // setting default language (en)
- setDefaultLocale(FALLBACK_LOCALE);
+ /**
+ * Get a message with parameters inside: the value {0} must be a number.
+ *
+ * @param key
+ * key to find
+ * @param args
+ * replacement strings
+ * @return message
+ */
+ public static String get(String key, Object[] args) {
+ return getMessages().get(key, args);
+ }
- initMap();
- }
+ /**
+ * Use a default string.
+ *
+ * @param key
+ * key to find
+ * @param defaultMsg
+ * default message
+ * @return message
+ */
+ public static String getWithDefault(String key, String defaultMsg) {
+ return getMessages().getWithDefault(key, defaultMsg);
+ }
- // for tests
- void setDefaultBasename(String defaultBasename) {
- this.defaultBasename = defaultBasename;
- }
+ /**
+ * Get a message with parameters inside: the value {0} must be a number. Use
+ * a default message.
+ *
+ * @param key
+ * key to find
+ * @param args
+ * replacement strings
+ * @param defaultMsg
+ * default message
+ * @return message
+ */
+ public static String getWithDefault(String key, Object[] args,
+ String defaultMsg) {
+ return getMessages().getWithDefault(key, args, defaultMsg);
+ }
- /**
- * Called through the initialization process. (startup of the container)
- */
- public void init() {
- load();
- registerEventListener();
- }
+ private static Locale getCurrentLocale() {
+ return MgnlContext.getInstance().getLocale();
+ }
- /**
- * The lazy Map creates messages objects with a fall back to the default locale.
- */
- protected void initMap() {
- // FIXME use LRU: new LRUMap(20);
- // LazyMap will instanciate bundles on demand.
- final Map map = LazyMap.decorate(new HashMap(), new Transformer() {
- // this transformer will wrap the Messages in a MessagesChain which will fall back to a Messages instance for the same bundle with default locale.
- public Object transform(Object input) {
- final MessagesID id = (MessagesID) input;
- return newMessages(id);
- }
- });
- messages = Collections.synchronizedMap(map);
- }
+ public abstract void init();
- /**
- * Initializes a new Messages instances for the given MessagesID.
- * By default, we chain to the same bundle with the default Locale. (so untranslated messages show up in the default language)
- */
- protected Messages newMessages(MessagesID messagesID) {
- Messages msgs = new DefaultMessagesImpl(messagesID.basename, messagesID.locale);
- if (!getDefaultLocale().equals(messagesID.locale)) {
- msgs = new MessagesChain(msgs).chain(getMessages(messagesID.basename, getDefaultLocale()));
- }
- return msgs;
- }
+ public abstract Collection getAvailableLocales();
- /**
- * Load i18n configuration.
- */
- protected void load() {
+ public abstract Locale getDefaultLocale();
- // reading the configuration from the repository, no need for context
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(ContentRepository.CONFIG);
+ public abstract Messages getMessagesInternal(String basename, Locale locale);
- try {
- log.info("Loading i18n configuration - " + I18N_CONFIG_PATH); //$NON-NLS-1$
-
- // checks if node exists
- if (!hm.isExist(I18N_CONFIG_PATH)) {
- // configNode = ContentUtil.createPath(hm, I18N_CONFIG_PATH, ItemType.CONTENT, true);
- log.warn(I18N_CONFIG_PATH + " does not exist yet; skipping.");
- return;
- }
-
- final Content configNode = hm.getContent(I18N_CONFIG_PATH); //$NON-NLS-1$
-
- setDefaultLocale(NodeDataUtil.getString(configNode, FALLBACK_NODEDATA, FALLBACK_LOCALE));
-
- // get the available languages - creates it if it does not exist - necessary to update to 3.5
- final Content languagesNode;
- if (configNode.hasContent(LANGUAGES_NODE_NAME)) {
- languagesNode = configNode.getContent(LANGUAGES_NODE_NAME);
- } else {
- languagesNode = configNode.createContent(LANGUAGES_NODE_NAME, ItemType.CONTENT);
- }
-
- Map languageDefinitions = Content2BeanUtil.toMap(languagesNode, true, LocaleDefinition.class);
-
- // clear collection for reload
- availableLocales.clear();
-
- for (Iterator iter = languageDefinitions.values().iterator(); iter.hasNext();) {
- LocaleDefinition ld = (LocaleDefinition) iter.next();
- if (ld.isEnabled()) {
- availableLocales.add(ld.getLocale());
- }
- }
- }
- catch (Exception e) {
- log.error("Failed to load i18n configuration - " + I18N_CONFIG_PATH, e); //$NON-NLS-1$
- }
- }
-
- /**
- * Register an event listener: reload configuration when something changes.
- */
- private void registerEventListener() {
- log.info("Registering event listener for i18n"); //$NON-NLS-1$
- ObservationUtil.registerChangeListener(ContentRepository.CONFIG, I18N_CONFIG_PATH, new EventListener() {
- public void onEvent(EventIterator iterator) {
- // reload everything
- reload();
- }
- });
- }
-
- /**
- * Reload i18n configuration.
- */
- public void reload() {
- try {
- // reload all present
- for (Iterator iter = messages.values().iterator(); iter.hasNext();) {
- Messages msgs = (Messages) iter.next();
- msgs.reload();
- }
- }
- catch (Exception e) {
- log.error("Can't reload i18n messages", e);
- }
- initMap();
- load();
- }
-
- public Messages getMessagesInternal(String basename, Locale locale) {
- if (StringUtils.isEmpty(basename)) {
- basename = defaultBasename;
- }
- return (Messages) messages.get(new MessagesID(basename, locale));
- }
-
- public static Messages getMessages() {
- return getMessages(null, getCurrentLocale());
- }
-
- public static Messages getMessages(String basename) {
- return getMessages(basename, getCurrentLocale());
- }
-
- public static Messages getMessages(Locale locale) {
- return getMessages(null, locale);
- }
-
- public static Messages getMessages(String basename, Locale locale) {
- return getInstance().getMessagesInternal(basename, locale);
- }
-
- public static String get(String key) {
- return getMessages().get(key);
- }
-
- /**
- * Get a message with parameters inside: the value {0} must be a number.
- * @param key key to find
- * @param args replacement strings
- * @return message
- */
- public static String get(String key, Object[] args) {
- return getMessages().get(key, args);
- }
-
- /**
- * Use a default string.
- * @param key key to find
- * @param defaultMsg default message
- * @return message
- */
- public static String getWithDefault(String key, String defaultMsg) {
- return getMessages().getWithDefault(key, defaultMsg);
- }
-
- /**
- * Get a message with parameters inside: the value {0} must be a number. Use a default message.
- * @param key key to find
- * @param args replacement strings
- * @param defaultMsg default message
- * @return message
- */
- public static String getWithDefault(String key, Object[] args, String defaultMsg) {
- return getMessages().getWithDefault(key, args, defaultMsg);
- }
-
- private static Locale getCurrentLocale() {
- return MgnlContext.getInstance().getLocale();
- }
-
- public Locale getDefaultLocale() {
- return applicationLocale;
- }
-
- /**
- * @param defaultLocale The defaultLocale to set.
- * @deprecated since 4.0 - not used and should not be. Use setLocale() on the SystemContext instead.
- * --note: do not remove the method, make it private. applicationLocale field is still needed.
- * --and/or remove duplication with SystemContext.locale
- */
- public void setDefaultLocale(String defaultLocale) {
- this.applicationLocale = new Locale(defaultLocale);
- //MgnlContext.getSystemContext().setLocale(applicationLocale);
- }
-
- public Collection getAvailableLocales() {
- return availableLocales;
- }
-
- /**
- * Used as the key in the Map.
- * @author Philipp Bracher
- * @version $Revision: 21431 $ ($Author: gjoseph $)
- */
- static private class MessagesID {
- private final String basename;
- private final Locale locale;
-
- public MessagesID(String basename, Locale locale) {
- this.basename = basename;
- this.locale = locale;
- }
-
- // generated equals and hashcode methods
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- MessagesID that = (MessagesID) o;
-
- if (basename != null ? !basename.equals(that.basename) : that.basename != null) return false;
- if (locale != null ? !locale.equals(that.locale) : that.locale != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = basename != null ? basename.hashCode() : 0;
- result = 31 * result + (locale != null ? locale.hashCode() : 0);
- return result;
- }
- }
+ abstract void setDefaultBasename(String basename);
}
Deleted: trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesProvider.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesProvider.java 2009-02-13 16:33:21 UTC (rev 991)
+++ trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/MessagesProvider.java 2009-02-13 17:48:24 UTC (rev 992)
@@ -1,16 +0,0 @@
-package info.magnolia.cms.i18n;
-
-import java.util.Locale;
-
-/**
- * @author molaschi
- * @version $Id: $
- */
-public interface MessagesProvider {
-
- Locale getDefaultLocale();
-
- void init();
-
- Messages getMessagesInternal(String basename, Locale locale);
-}
Modified: trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/OpenutilsMgnlMessagesManager.java
===================================================================
--- trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/OpenutilsMgnlMessagesManager.java 2009-02-13 16:33:21 UTC (rev 991)
+++ trunk/openutils-mgnlmessages/src/main/java/info/magnolia/cms/i18n/OpenutilsMgnlMessagesManager.java 2009-02-13 17:48:24 UTC (rev 992)
@@ -1,271 +1,33 @@
package info.magnolia.cms.i18n;
-import info.magnolia.cms.beans.config.ContentRepository;
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.core.HierarchyManager;
-import info.magnolia.cms.core.ItemType;
-import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.cms.util.ObservationUtil;
-import info.magnolia.content2bean.Content2BeanUtil;
-import info.magnolia.context.MgnlContext;
+import net.sourceforge.openutils.mgnlmessages.i18n.ModulePropertyMessagesImpl;
+import net.sourceforge.openutils.mgnlmessages.i18n.RepositoryMessagesImpl;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import javax.jcr.observation.EventIterator;
-import javax.jcr.observation.EventListener;
-
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.map.LazyMap;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
/**
* @author molaschi
* @version $Id: $
*/
-public class OpenutilsMgnlMessagesManager implements MessagesProvider
+public class OpenutilsMgnlMessagesManager extends DefaultMessagesManager
{
/**
- * Logger.
+ * {@inheritDoc}
*/
- private Logger log = LoggerFactory.getLogger(OpenutilsMgnlMessagesManager.class);
-
- /**
- * The node name where the configuration for i18n is stored.
- */
- private static final String I18N_CONFIG_PATH = "/server/i18n/system"; //$NON-NLS-1$
-
- /**
- * The name of the property to store the current system language.
- */
- private static final String FALLBACK_NODEDATA = "fallbackLanguage"; //$NON-NLS-1$
-
- /**
- * Under this node all the available languages are stored. They are showed in the user dialog.
- */
- private static final String LANGUAGES_NODE_NAME = "languages"; //$NON-NLS-1$
-
- private Locale defaultLocale = new Locale(MessagesManager.FALLBACK_LOCALE);
-
- Map messages;
-
- private final Collection availableLocales = new ArrayList();
-
- /**
- *
- */
- public OpenutilsMgnlMessagesManager()
+ @Override
+ protected Messages newMessages(MessagesID messagesID)
{
- initMap();
- }
+ Messages msgs = new MessagesChain(new RepositoryMessagesImpl(messagesID.getBasename(), messagesID.getLocale()));
+ ((MessagesChain) msgs).chain(new ModulePropertyMessagesImpl(messagesID.getLocale()));
+ ((MessagesChain) msgs).chain(new DefaultMessagesImpl(messagesID.getBasename(), messagesID.getLocale()));
- public void init()
- {
- load();
- registerEventListener();
- }
-
- /**
- * The lazy Map creates messages objects with a fall back to the default locale.
- */
- protected void initMap()
- {
- // FIXME use LRU: new LRUMap(20);
- // LazyMap will instanciate bundles on demand.
- final Map map = LazyMap.decorate(new HashMap(), new Transformer()
+ if (!getDefaultLocale().equals(messagesID.getLocale()))
{
-
- // this transformer will wrap the Messages in a MessagesChain which will fall back to a Messages instance
- // for the same bundle with default locale.
- public Object transform(Object input)
- {
- final MessagesID id = (MessagesID) input;
- return newMessages(id);
- }
- });
- messages = Collections.synchronizedMap(map);
- }
-
- /**
- * Initializes a new Messages instances for the given MessagesID. By default, we chain to the same bundle with the
- * default Locale. (so untranslated messages show up in the default language)
- */
- protected Messages newMessages(MessagesID messagesID)
- {
- Messages msgs = new DefaultMessagesImpl(messagesID.basename, messagesID.locale);
- if (!getDefaultLocale().equals(messagesID.locale))
- {
- msgs = new MessagesChain(msgs).chain(getMessagesInternal(messagesID.basename, getDefaultLocale()));
+ msgs = ((MessagesChain) msgs).chain(MessagesManager.getMessages(
+ messagesID.getBasename(),
+ getDefaultLocale()));
}
return msgs;
}
- /**
- * {@inheritDoc}
- */
- public Locale getDefaultLocale()
- {
- return defaultLocale;
- }
-
- /**
- * {@inheritDoc}
- */
- public Messages getMessagesInternal(String basename, Locale locale)
- {
- if (StringUtils.isEmpty(basename))
- {
- basename = MessagesManager.DEFAULT_BASENAME;
- }
- return (Messages) messages.get(new MessagesID(basename, locale));
- }
-
- /**
- * Load i18n configuration.
- */
- protected void load()
- {
-
- // reading the configuration from the repository, no need for context
- HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(ContentRepository.CONFIG);
-
- try
- {
- log.info("Loading i18n configuration - " + I18N_CONFIG_PATH); //$NON-NLS-1$
-
- // checks if node exists
- if (!hm.isExist(I18N_CONFIG_PATH))
- {
- // configNode = ContentUtil.createPath(hm, I18N_CONFIG_PATH, ItemType.CONTENT, true);
- log.warn(I18N_CONFIG_PATH + " does not exist yet; skipping.");
- return;
- }
-
- final Content configNode = hm.getContent(I18N_CONFIG_PATH); //$NON-NLS-1$
-
- defaultLocale = new Locale(NodeDataUtil.getString(
- configNode,
- FALLBACK_NODEDATA,
- MessagesManager.FALLBACK_LOCALE));
-
- // get the available languages - creates it if it does not exist - necessary to update to 3.5
- final Content languagesNode;
- if (configNode.hasContent(LANGUAGES_NODE_NAME))
- {
- languagesNode = configNode.getContent(LANGUAGES_NODE_NAME);
- }
- else
- {
- languagesNode = configNode.createContent(LANGUAGES_NODE_NAME, ItemType.CONTENT);
- }
-
- Map languageDefinitions = Content2BeanUtil.toMap(languagesNode, true, LocaleDefinition.class);
-
- // clear collection for reload
- availableLocales.clear();
-
- for (Iterator iter = languageDefinitions.values().iterator(); iter.hasNext();)
- {
- LocaleDefinition ld = (LocaleDefinition) iter.next();
- if (ld.isEnabled())
- {
- availableLocales.add(ld.getLocale());
- }
- }
- }
- catch (Exception e)
- {
- log.error("Failed to load i18n configuration - " + I18N_CONFIG_PATH, e); //$NON-NLS-1$
- }
- }
-
- /**
- * Register an event listener: reload configuration when something changes.
- */
- private void registerEventListener()
- {
- log.info("Registering event listener for i18n"); //$NON-NLS-1$
- ObservationUtil.registerChangeListener(ContentRepository.CONFIG, I18N_CONFIG_PATH, new EventListener()
- {
-
- public void onEvent(EventIterator iterator)
- {
- // reload everything
- reload();
- }
- });
- }
-
- /**
- * Reload i18n configuration.
- */
- public void reload()
- {
- try
- {
- // reload all present
- for (Iterator iter = messages.values().iterator(); iter.hasNext();)
- {
- Messages msgs = (Messages) iter.next();
- msgs.reload();
- }
- }
- catch (Exception e)
- {
- log.error("Can't reload i18n messages", e);
- }
- initMap();
- load();
- }
-
- static private class MessagesID
- {
-
- private final String basename;
-
- private final Locale locale;
-
- public MessagesID(String basename, Locale locale)
- {
- this.basename = basename;
- this.locale = locale;
- }
-
- // generated equals and hashcode methods
- @Override
- public boolean equals(Object o)
- {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
-
- MessagesID that = (MessagesID) o;
-
- if (basename != null ? !basename.equals(that.basename) : that.basename != null)
- return false;
- if (locale != null ? !locale.equals(that.locale) : that.locale != null)
- return false;
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- int result = basename != null ? basename.hashCode() : 0;
- result = 31 * result + (locale != null ? locale.hashCode() : 0);
- return result;
- }
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X