[I18n-commits] r1928 - in trunk: maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl nuiton-i18n/src/main/java/org/nuiton/i18n nuiton-i18n/src/main/java/org/nuiton/i18n/bundle nuiton-i18n/src/main/java/org/nuiton/i18n/format nuiton-i18n/src/main/java/org/nuiton/i18n/init nuiton-i18n/src/main/java/org/nuiton/util/converter nuiton-i18n/src/test/java/org/nuiton/i18n

Author: tchemit Date: 2011-05-13 11:59:47 +0200 (Fri, 13 May 2011) New Revision: 1928 Url: http://nuiton.org/repositories/revision/i18n/1928 Log: add package info (need more documentation inside them...) format everything + fix some javadocs introduce format package to push to I18nMessageFormatter Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java Removed: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java Modified: trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java Modified: trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java =================================================================== --- trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/maven-i18n-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -27,6 +27,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; +import org.nuiton.i18n.format.MessageFormatI18nMessageFormatter; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.I18nInitializer; @@ -51,7 +52,7 @@ I18nInitializer initializer = new DefaultI18nInitializer("ResultBundle"); initializer.setMessageFormatter( - new I18nUtil.MessageFormatI18nMessageFormatter()); + new MessageFormatI18nMessageFormatter()); I18n.init(initializer, Locale.FRANCE); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -46,6 +46,7 @@ */ public class StringFormatToMessageFormatConverter implements BundleFormatConverter { + /** Logger. */ private static final Log log = LogFactory.getLog(StringFormatToMessageFormatConverter.class); Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -186,7 +186,7 @@ ) { // document should be well-formed... - + } else { // to be sure, document is well formed, add a start and end tag resultFileContent = "<div>\n" + resultFileContent + "\n</div>"; Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -50,7 +50,7 @@ */ public class ProcessorHelper extends ProcessorUtil { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(ProcessorHelper.class); /** Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.format.I18nMessageFormatter; import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.I18nInitializer; @@ -54,7 +55,7 @@ */ public class I18n { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(I18n.class); /** Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -22,21 +22,18 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ +package org.nuiton.i18n; -/* * +/** * i18nDefaultTooltipFilter.java - * + * <p/> * Created: 2 déc. 2003 * * @author Benjamin Poussin <poussin@codelutin.com> - * Copyright Code Lutin - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : */ - -package org.nuiton.i18n; - + * @deprecated since 2.4, this filter has nothing to do in i18n api, will be + * removed in version 3.0 and never replaced here... + */ +@Deprecated public class I18nDefaultTooltipFilter implements I18nFilter { // I18nDefaultTooltipFilter @Override Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -50,7 +50,7 @@ */ public class I18nLanguage { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ private static final Log log = LogFactory.getLog(I18nLanguage.class); /** toutes les traductions pour cette langue */ @@ -77,7 +77,7 @@ * * @param bundleEntries the used bundles entries to load * @deprecated since 2.4 use {@link #load(I18nBundleEntry[], Charset)} instead, - * charset must be provided to avoid encoding problems + * charset must be provided to avoid encoding problems */ @Deprecated public void load(I18nBundleEntry[] bundleEntries) { @@ -89,7 +89,7 @@ * fichiers de traduction. * * @param bundleEntries the used bundles entries to load - * @param encoding Charset to use for Properties loading + * @param encoding Charset to use for Properties loading * @since 2.4 */ public void load(I18nBundleEntry[] bundleEntries, Charset encoding) { Deleted: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -1,57 +0,0 @@ -/* - * #%L - * I18n :: Api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2011 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.i18n; - -import java.util.Locale; - -/** - * Contract to format a i18n message. - * <p/> - * Created: 05/05/11 - * - * @author fdesbois <desbois@codelutin.com> - * @author tchemit <chemit@codelutin.com> - * @see I18nUtil.DefaultI18nMessageFormatters - * $Id$ - * @since 2.4 - */ -public interface I18nMessageFormatter { - - /** - * Format a given {@code message} with {@code locale} and optinal {@code args}. - * <p/> - * The main purpose is to replace placeholders in {@code message} with - * {@code args} value. - * <p/> - * This may depend on {@code locale} for date purpose for example. - * - * @param locale locale to use for formatting (number, date, ...) - * @param message message to format (that contains placeholders) - * @param args object array to use in formatting the message - * @return the formatted message - */ - String format(Locale locale, String message, Object... args); - -} Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -49,7 +49,7 @@ */ public class I18nStore { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(I18nStore.class); /** le language actuellement utilise */ Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -27,6 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.format.I18nMessageFormatter; +import org.nuiton.i18n.format.StringFormatI18nMessageFormatter; import org.nuiton.util.converter.LocaleConverter; import java.io.File; @@ -40,7 +42,6 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Formatter; import java.util.List; import java.util.Locale; import java.util.Stack; @@ -392,45 +393,4 @@ return result; } - /** - * Implementation of {@link I18nMessageFormatter} based on {@link Formatter} - * syntax. - * <p/> - * <strong>Note: </strong> This is the default message formatter used by - * i18n system. - * - * @see Formatter - * @see String#format(Locale, String, Object...) - * @since 2.4 - */ - public static class StringFormatI18nMessageFormatter implements I18nMessageFormatter { - - @Override - public String format(Locale locale, String message, Object... args) { - String result; - // Previous behavior, no format will be done for empty args - if (args.length == 0) { - result = message; - } else { - result = String.format(locale, message, args); - } - return result; - } - } - - /** - * Implementation of {@link I18nMessageFormatter} based on - * {@link MessageFormat} syntax. - * - * @see MessageFormat - * @since 2.4 - */ - public static class MessageFormatI18nMessageFormatter implements I18nMessageFormatter { - @Override - public String format(Locale locale, String message, Object... args) { - MessageFormat formatter = new MessageFormat(message, locale); - return formatter.format(args); - } - } - } Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -65,14 +65,14 @@ */ public class I18nBundle implements Iterable<I18nBundleEntry> { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ static final Log log = LogFactory.getLog(I18nBundle.class); /** les entrés du bundle */ protected List<I18nBundleEntry> entries; /** le nom du bundle encapsulé (correspond au prefix de l'url de chargement) */ - final String bundlePrefix; + protected final String bundlePrefix; public I18nBundle(String bundlePrefix) { this.bundlePrefix = bundlePrefix; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -126,7 +126,7 @@ * @param resource the save of resources already loaded * @throws IOException if any pb while reading resource file * @deprecated since 2.4 use {@link #load(Properties, Charset)} instead, - * charset must be provided to avoid encoding problems + * charset must be provided to avoid encoding problems */ @Deprecated public void load(Properties resource) throws IOException { Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -56,7 +56,7 @@ */ public class I18nBundleUtil { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(I18nBundleUtil.class); public static final String DIRECTORY_SEARCH_BUNDLE_PATTERN = "i18n"; Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,6 @@ +package org.nuiton.i18n.bundle; +/** + * This package contains the model of the bundle api. + * <p/> + * TODO Continue the documentation. + */ \ No newline at end of file Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Copied: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java (from rev 1927, trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nMessageFormatter.java) =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,59 @@ +/* + * #%L + * I18n :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.i18n.format; + +import java.util.Locale; + +/** + * Contract to format a i18n message. + * <p/> + * Created: 05/05/11 + * <p/> + * $Id$ + * + * @author fdesbois <desbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> + * @see StringFormatI18nMessageFormatter + * @see MessageFormatI18nMessageFormatter + * @since 2.4 + */ +public interface I18nMessageFormatter { + + /** + * Format a given {@code message} with {@code locale} and optinal {@code args}. + * <p/> + * The main purpose is to replace placeholders in {@code message} with + * {@code args} value. + * <p/> + * This may depend on {@code locale} for date purpose for example. + * + * @param locale locale to use for formatting (number, date, ...) + * @param message message to format (that contains placeholders) + * @param args object array to use in formatting the message + * @return the formatted message + */ + String format(Locale locale, String message, Object... args); + +} Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,24 @@ +package org.nuiton.i18n.format; + +import java.text.MessageFormat; +import java.util.Locale; + +/** + * Implementation of {@link I18nMessageFormatter} based on + * {@link MessageFormat} syntax. + * <p/> + * <strong>Note:</strong> A formatter will always be used even if there is no + * parameters in translation. As {@link MessageFormat} requires to espece + * quotes, we need to do this for every translation with or without parameters. + * + * @see MessageFormat + * @since 2.4 + */ +public class MessageFormatI18nMessageFormatter implements I18nMessageFormatter { + + @Override + public String format(Locale locale, String message, Object... args) { + MessageFormat formatter = new MessageFormat(message, locale); + return formatter.format(args); + } +} Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,35 @@ +package org.nuiton.i18n.format; + +import java.util.Formatter; +import java.util.Locale; + +/** + * Implementation of {@link I18nMessageFormatter} based on {@link Formatter} + * syntax. + * <p/> + * <strong>Note: </strong> This is the default message formatter used by + * i18n system. + * + * @see Formatter + * @see String#format(Locale, String, Object...) + * @since 2.4 + */ +public class StringFormatI18nMessageFormatter implements I18nMessageFormatter { + + @Override + public String format(Locale locale, String message, Object... args) { + String result; + + if (args.length == 0) { + + // keep the same behavior than before version 2.3 : no format will + // be done if no arguments are present + result = message; + } else { + + // do format with given locale, message and arguments + result = String.format(locale, message, args); + } + return result; + } +} Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,9 @@ +package org.nuiton.i18n.format; +/** + * This package contains the format api says the contract and offered + * implementations of object responsible of formatting translations. + * <p/> + * + * TODO Continue the documentation. + * @since 2.4 + */ \ No newline at end of file Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -52,7 +52,7 @@ */ public class ClassPathI18nInitializer extends I18nInitializer { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(ClassPathI18nInitializer.class); Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -48,7 +48,7 @@ */ public class DefaultI18nInitializer extends I18nInitializer { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(DefaultI18nInitializer.class); @@ -64,15 +64,16 @@ public static String BUNDLES_FOR_LOCALE = "bundles."; - /** the name of the bundle */ + /** the name of the bundle. */ protected final String bundleName; - /** class loader to use (optional) */ + /** class loader to use (optional). */ protected ClassLoader loader; - /** i18n path where to seek for resources (optional) */ + /** i18n path where to seek for resources (optional). */ protected String i18nPath; + /** location of the definition file. */ protected URL definitionURL; public static final String DEFAULT_I18N_PATH = "META-INF/"; @@ -121,8 +122,8 @@ } protected URL getResourceURL(String resource) { - if (log.isInfoEnabled()) { - log.info("resource to seek : " + resource); + if (log.isDebugEnabled()) { + log.debug("resource to seek : " + resource); } URL url = getLoader().getResource(resource); return url; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; -import org.nuiton.i18n.I18nMessageFormatter; +import org.nuiton.i18n.format.I18nMessageFormatter; import org.nuiton.i18n.I18nUtil; import org.nuiton.i18n.bundle.I18nBundle; import org.nuiton.i18n.bundle.I18nBundleEntry; @@ -44,11 +44,12 @@ * {@link I18n}. * * @author tchemit <chemit@codelutin.com> + * @author fdebois <debois@codelutin.com> * @since 1.1 */ public abstract class I18nInitializer { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(I18nInitializer.class); /** @@ -103,7 +104,8 @@ /** * Get the {@link Charset} encoding used for i18n {@link Properties} file loading. * - * @return Charset + * @return encoding to use + * @since 2.4 */ public Charset getEncoding() { return encoding; @@ -124,9 +126,11 @@ } /** - * Get the {@link I18nMessageFormatter} to use on each i18n message translation. + * Get the {@link I18nMessageFormatter} to use on each i18n message + * translation. * - * @return I18nMessageFormatter + * @return formatter to use + * @since 2.4 */ public I18nMessageFormatter getMessageFormatter() { return messageFormatter; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -28,7 +28,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18nMessageFormatter; +import org.nuiton.i18n.format.I18nMessageFormatter; import org.nuiton.i18n.bundle.I18nBundle; import org.nuiton.i18n.bundle.I18nBundleEntry; import org.nuiton.i18n.bundle.I18nBundleUtil; @@ -50,7 +50,7 @@ */ public class UserI18nInitializer extends DefaultI18nInitializer { - /** Logger */ + /** Logger. */ private static final Log log = LogFactory.getLog(UserI18nInitializer.class); /** the user directory where to store the i18n resources. */ Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,8 @@ +package org.nuiton.i18n.init; +/** + * This package contains the initializer api says the contract and offered + * implementations of object responsible of init I18n runtime system. + * <p/> + * + * TODO Continue the documentation. + */ \ No newline at end of file Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,7 @@ +package org.nuiton.i18n; +/** + * This is the main package of the I18n runtime api. + * <p/> + * + * TODO Continue the documentation. + */ \ No newline at end of file Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -51,7 +51,7 @@ private static final Pattern MEDIUM_SCOPE_PATTERN = Pattern.compile("([a-zA-Z]{2})"); - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger. */ static Log log = getLog(LocaleConverter.class); @Override @@ -133,14 +133,14 @@ public LocaleConverter() { if (log.isDebugEnabled()) { - log.debug(this); + log.debug("init locale converter : " + this); } } protected boolean isEnabled(Class<?> aClass) { return Locale.class.equals(aClass); } - + public Class<?> getType() { return Locale.class; } Added: trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java (rev 0) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -0,0 +1,8 @@ +package org.nuiton.util.converter; +/** + * This package contains some converters. The very package is used by the + * nuiton-utils converter api to load converters. + * <p/> + * + * TODO Continue the documentation. + */ \ No newline at end of file Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-05-13 09:17:46 UTC (rev 1927) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java 2011-05-13 09:59:47 UTC (rev 1928) @@ -28,6 +28,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.i18n.format.MessageFormatI18nMessageFormatter; import org.nuiton.i18n.init.DefaultI18nInitializer; import java.util.Date; @@ -204,7 +205,7 @@ @Test public void testFormatterMessageFormat() { - initializer.setMessageFormatter(new I18nUtil.MessageFormatI18nMessageFormatter()); + initializer.setMessageFormatter(new MessageFormatI18nMessageFormatter()); I18n.init(initializer, Locale.UK); Date date = new GregorianCalendar(2011, 4, 5).getTime();