branch develop updated (2c84cb0 -> 48dd0e4)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See http://git.nuiton.org/i18n.git from 2c84cb0 Use nuitonpom 7 + fix back some dependencies (See #3881) new f8e14b4 Update maven-plugin-plugin to 3.3 (this is the last compatible with maven 2.x and make javadoc ok with java 8 new ef3d901 Update javadoc to be java 8 compliant (See #3894) new 48dd0e4 Fixes #3894 Merge branch 'feature/3894' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 48dd0e41e49011b6f2fd52e71a43769597cba686 Merge: 2c84cb0 ef3d901 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 10:47:51 2016 +0100 Fixes #3894 Merge branch 'feature/3894' into develop commit ef3d9018c2aa1e54bd6f9c920d1bc3907055dbe8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 10:47:45 2016 +0100 Update javadoc to be java 8 compliant (See #3894) commit f8e14b457a4655b7d718d7a354da77acde7e9782 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 10:46:30 2016 +0100 Update maven-plugin-plugin to 3.3 (this is the last compatible with maven 2.x and make javadoc ok with java 8 Summary of changes: .../java/org/nuiton/i18n/MessageConstants.java | 3 +- .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../src/test/java/org/nuiton/i18n/ReadTest.java | 2 +- .../org/nuiton/i18n/ReadMessageFormatTest.java | 2 +- .../i18n/plugin/AbstractI18nGenerateMojo.java | 4 +- .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 10 ++--- .../java/org/nuiton/i18n/plugin/GenerateMojo.java | 14 +++---- .../java/org/nuiton/i18n/plugin/GetterMojo.java | 2 +- .../i18n/plugin/bundle/AbstractI18nBundleMojo.java | 4 +- .../i18n/plugin/bundle/AvailableConverterMojo.java | 4 +- .../i18n/plugin/bundle/BundleFormatConverter.java | 6 +-- .../org/nuiton/i18n/plugin/bundle/BundleMojo.java | 32 +++++++-------- .../plugin/bundle/CollectI18nArtifactsMojo.java | 4 +- .../nuiton/i18n/plugin/bundle/I18nArtifact.java | 2 +- .../StringFormatToMessageFormatConverter.java | 6 +-- .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 18 ++++---- .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 6 +-- .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 8 ++-- .../i18n/plugin/parser/AbstractFileParser.java | 4 +- .../i18n/plugin/parser/AbstractI18nParserMojo.java | 12 +++--- .../org/nuiton/i18n/plugin/parser/FileParser.java | 4 +- .../plugin/parser/I18nParserConfiguration.java | 2 +- .../nuiton/i18n/plugin/parser/I18nSourceEntry.java | 2 +- .../nuiton/i18n/plugin/parser/ParserExecutor.java | 8 ++-- .../org/nuiton/i18n/plugin/parser/SourceEntry.java | 12 +++--- .../plugin/parser/impl/AbstractParserXmlMojo.java | 8 ++-- .../i18n/plugin/parser/impl/ParserGWTJavaMojo.java | 4 +- .../i18n/plugin/parser/impl/ParserJavaMojo.java | 24 +++++------ .../i18n/plugin/parser/impl/ParserStruts2Mojo.java | 4 +- .../plugin/parser/impl/ParserValidationMojo.java | 8 ++-- .../i18n/plugin/parser/impl/ParserXmlUserMojo.java | 4 +- .../i18n/plugin/parser/impl/ProcessorHelper.java | 4 +- .../StringFormatToMessageFormatConverterTest.java | 4 +- .../nuiton/i18n/plugin/parser/SourceEntryTest.java | 2 +- .../plugin/parser/impl/JavaFileParserTest.java | 2 +- .../parser/impl/Struts2JspFileParserTest.java | 2 +- .../java/org/nuiton/i18n/editor/I18nEditor.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorConfig.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorContext.java | 6 +-- .../i18n/editor/project/AbstractI18nProject.java | 2 +- .../project/AbstractI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/project/I18nProject.java | 2 +- .../project/I18nProjectConfigurePanelUI.java | 2 +- .../i18n/editor/project/I18nProjectFactory.java | 2 +- .../i18n/editor/project/I18nProjectProvider.java | 2 +- .../editor/project/impl/DirectoryI18nProject.java | 2 +- .../project/impl/DirectoryI18nProjectProvider.java | 2 +- .../i18n/editor/project/impl/JarI18nProject.java | 2 +- .../project/impl/JarI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/ui/I18nEditorUIHandler.java | 8 ++-- .../org/nuiton/i18n/editor/ui/TreeModelMode.java | 2 +- .../i18n/editor/ui/project/ProjectUIModel.java | 2 +- .../editor/ui/project/SelectBundlesTableModel.java | 2 +- .../src/main/java/org/nuiton/i18n/CountryEnum.java | 8 ++-- .../src/main/java/org/nuiton/i18n/I18n.java | 48 +++++++++++----------- .../org/nuiton/i18n/I18nDefaultTooltipFilter.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nFilter.java | 2 +- .../main/java/org/nuiton/i18n/I18nLanguage.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nStore.java | 14 +++---- .../src/main/java/org/nuiton/i18n/I18nUtil.java | 8 ++-- .../main/java/org/nuiton/i18n/LanguageEnum.java | 4 +- .../java/org/nuiton/i18n/bundle/I18nBundle.java | 18 ++++---- .../org/nuiton/i18n/bundle/I18nBundleEntry.java | 12 +++--- .../org/nuiton/i18n/bundle/I18nBundleScope.java | 20 ++++----- .../org/nuiton/i18n/bundle/I18nBundleUtil.java | 20 ++++----- .../java/org/nuiton/i18n/bundle/package-info.java | 2 +- .../nuiton/i18n/format/I18nMessageFormatter.java | 12 +++--- .../format/MessageFormatI18nMessageFormatter.java | 2 +- .../format/StringFormatI18nMessageFormatter.java | 2 +- .../java/org/nuiton/i18n/format/package-info.java | 2 +- .../nuiton/i18n/init/ClassPathI18nInitializer.java | 6 +-- .../nuiton/i18n/init/DefaultI18nInitializer.java | 2 +- .../java/org/nuiton/i18n/init/I18nInitializer.java | 4 +- .../org/nuiton/i18n/init/UserI18nInitializer.java | 6 +-- .../java/org/nuiton/i18n/init/package-info.java | 2 +- .../main/java/org/nuiton/i18n/package-info.java | 2 +- .../org/nuiton/util/converter/LocaleConverter.java | 2 +- .../org/nuiton/util/converter/package-info.java | 2 +- .../test/java/org/nuiton/i18n/I18nStoreTest.java | 2 +- .../src/test/java/org/nuiton/i18n/I18nTest.java | 2 +- .../nuiton/i18n/bundle/I18nBundleScopeTest.java | 2 +- .../nuiton/util/converter/LocaleConverterTest.java | 2 +- pom.xml | 2 +- 84 files changed, 248 insertions(+), 255 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See http://git.nuiton.org/i18n.git commit f8e14b457a4655b7d718d7a354da77acde7e9782 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 10:46:30 2016 +0100 Update maven-plugin-plugin to 3.3 (this is the last compatible with maven 2.x and make javadoc ok with java 8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ddb8b92..3077f0d 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ <locales>fr,en</locales> <mavenVersion>2.2.1</mavenVersion> - <pluginPluginVersion>3.2</pluginPluginVersion> + <pluginPluginVersion>3.3</pluginPluginVersion> </properties> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See http://git.nuiton.org/i18n.git commit ef3d9018c2aa1e54bd6f9c920d1bc3907055dbe8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 10:47:45 2016 +0100 Update javadoc to be java 8 compliant (See #3894) --- .../java/org/nuiton/i18n/MessageConstants.java | 3 +- .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../src/test/java/org/nuiton/i18n/ReadTest.java | 2 +- .../org/nuiton/i18n/ReadMessageFormatTest.java | 2 +- .../i18n/plugin/AbstractI18nGenerateMojo.java | 4 +- .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 10 ++--- .../java/org/nuiton/i18n/plugin/GenerateMojo.java | 14 +++---- .../java/org/nuiton/i18n/plugin/GetterMojo.java | 2 +- .../i18n/plugin/bundle/AbstractI18nBundleMojo.java | 4 +- .../i18n/plugin/bundle/AvailableConverterMojo.java | 4 +- .../i18n/plugin/bundle/BundleFormatConverter.java | 6 +-- .../org/nuiton/i18n/plugin/bundle/BundleMojo.java | 32 +++++++-------- .../plugin/bundle/CollectI18nArtifactsMojo.java | 4 +- .../nuiton/i18n/plugin/bundle/I18nArtifact.java | 2 +- .../StringFormatToMessageFormatConverter.java | 6 +-- .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 18 ++++---- .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 6 +-- .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 8 ++-- .../i18n/plugin/parser/AbstractFileParser.java | 4 +- .../i18n/plugin/parser/AbstractI18nParserMojo.java | 12 +++--- .../org/nuiton/i18n/plugin/parser/FileParser.java | 4 +- .../plugin/parser/I18nParserConfiguration.java | 2 +- .../nuiton/i18n/plugin/parser/I18nSourceEntry.java | 2 +- .../nuiton/i18n/plugin/parser/ParserExecutor.java | 8 ++-- .../org/nuiton/i18n/plugin/parser/SourceEntry.java | 12 +++--- .../plugin/parser/impl/AbstractParserXmlMojo.java | 8 ++-- .../i18n/plugin/parser/impl/ParserGWTJavaMojo.java | 4 +- .../i18n/plugin/parser/impl/ParserJavaMojo.java | 24 +++++------ .../i18n/plugin/parser/impl/ParserStruts2Mojo.java | 4 +- .../plugin/parser/impl/ParserValidationMojo.java | 8 ++-- .../i18n/plugin/parser/impl/ParserXmlUserMojo.java | 4 +- .../i18n/plugin/parser/impl/ProcessorHelper.java | 4 +- .../StringFormatToMessageFormatConverterTest.java | 4 +- .../nuiton/i18n/plugin/parser/SourceEntryTest.java | 2 +- .../plugin/parser/impl/JavaFileParserTest.java | 2 +- .../parser/impl/Struts2JspFileParserTest.java | 2 +- .../java/org/nuiton/i18n/editor/I18nEditor.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorConfig.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorContext.java | 6 +-- .../i18n/editor/project/AbstractI18nProject.java | 2 +- .../project/AbstractI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/project/I18nProject.java | 2 +- .../project/I18nProjectConfigurePanelUI.java | 2 +- .../i18n/editor/project/I18nProjectFactory.java | 2 +- .../i18n/editor/project/I18nProjectProvider.java | 2 +- .../editor/project/impl/DirectoryI18nProject.java | 2 +- .../project/impl/DirectoryI18nProjectProvider.java | 2 +- .../i18n/editor/project/impl/JarI18nProject.java | 2 +- .../project/impl/JarI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/ui/I18nEditorUIHandler.java | 8 ++-- .../org/nuiton/i18n/editor/ui/TreeModelMode.java | 2 +- .../i18n/editor/ui/project/ProjectUIModel.java | 2 +- .../editor/ui/project/SelectBundlesTableModel.java | 2 +- .../src/main/java/org/nuiton/i18n/CountryEnum.java | 8 ++-- .../src/main/java/org/nuiton/i18n/I18n.java | 48 +++++++++++----------- .../org/nuiton/i18n/I18nDefaultTooltipFilter.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nFilter.java | 2 +- .../main/java/org/nuiton/i18n/I18nLanguage.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nStore.java | 14 +++---- .../src/main/java/org/nuiton/i18n/I18nUtil.java | 8 ++-- .../main/java/org/nuiton/i18n/LanguageEnum.java | 4 +- .../java/org/nuiton/i18n/bundle/I18nBundle.java | 18 ++++---- .../org/nuiton/i18n/bundle/I18nBundleEntry.java | 12 +++--- .../org/nuiton/i18n/bundle/I18nBundleScope.java | 20 ++++----- .../org/nuiton/i18n/bundle/I18nBundleUtil.java | 20 ++++----- .../java/org/nuiton/i18n/bundle/package-info.java | 2 +- .../nuiton/i18n/format/I18nMessageFormatter.java | 12 +++--- .../format/MessageFormatI18nMessageFormatter.java | 2 +- .../format/StringFormatI18nMessageFormatter.java | 2 +- .../java/org/nuiton/i18n/format/package-info.java | 2 +- .../nuiton/i18n/init/ClassPathI18nInitializer.java | 6 +-- .../nuiton/i18n/init/DefaultI18nInitializer.java | 2 +- .../java/org/nuiton/i18n/init/I18nInitializer.java | 4 +- .../org/nuiton/i18n/init/UserI18nInitializer.java | 6 +-- .../java/org/nuiton/i18n/init/package-info.java | 2 +- .../main/java/org/nuiton/i18n/package-info.java | 2 +- .../org/nuiton/util/converter/LocaleConverter.java | 2 +- .../org/nuiton/util/converter/package-info.java | 2 +- .../test/java/org/nuiton/i18n/I18nStoreTest.java | 2 +- .../src/test/java/org/nuiton/i18n/I18nTest.java | 2 +- .../nuiton/i18n/bundle/I18nBundleScopeTest.java | 2 +- .../nuiton/util/converter/LocaleConverterTest.java | 2 +- 83 files changed, 247 insertions(+), 254 deletions(-) diff --git a/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java b/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java index b1e2588..8b88b4d 100644 --- a/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java +++ b/i18n-maven-plugin/src/it/ano-1494/iso-8859-1/src/main/java/org/nuiton/i18n/MessageConstants.java @@ -27,8 +27,7 @@ package org.nuiton.i18n; /** * Created: 30/04/11 * - * @author fdesbois <desbois@codelutin.com> - * $Id$ + * @author Florian Desbois */ public interface MessageConstants { diff --git a/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java b/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java index b1e2588..ed12c1a 100644 --- a/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java +++ b/i18n-maven-plugin/src/it/ano-1494/migrate/src/main/java/org/nuiton/i18n/MessageConstants.java @@ -27,7 +27,7 @@ package org.nuiton.i18n; /** * Created: 30/04/11 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois * $Id$ */ public interface MessageConstants { diff --git a/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java b/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java index 82da26d..95dc3f0 100644 --- a/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java +++ b/i18n-maven-plugin/src/it/ano-1494/utf-8/src/main/java/org/nuiton/i18n/MessageConstants.java @@ -27,7 +27,7 @@ package org.nuiton.i18n; /** * Created: 30/04/11 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois * $Id$ */ public interface MessageConstants { diff --git a/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java b/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java index 9bd4b5e..a4b8a3f 100644 --- a/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java +++ b/i18n-maven-plugin/src/it/ano-1494/utf-8/src/test/java/org/nuiton/i18n/ReadTest.java @@ -34,7 +34,7 @@ import java.util.Locale; /** * Created: 30/04/11 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois * $Id$ */ public class ReadTest { diff --git a/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java b/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java index 3d17081..2c685c5 100644 --- a/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java +++ b/i18n-maven-plugin/src/it/evo-1507/src/test/java/org/nuiton/i18n/ReadMessageFormatTest.java @@ -36,7 +36,7 @@ import java.util.Locale; /** * Created: 06/05/11 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois * $Id$ */ public class ReadMessageFormatTest { diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java index 037c9b9..f44f4f3 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nGenerateMojo.java @@ -40,7 +40,7 @@ public abstract class AbstractI18nGenerateMojo extends AbstractI18nMojo { /** * Name to use as prefix of generated files. - * <p/> + * * <b>Note :</b> By default, use the artifact id. */ @Parameter(property = "i18n.artifactId", defaultValue = "${project.artifactId}", readonly = true) @@ -61,7 +61,7 @@ public abstract class AbstractI18nGenerateMojo extends AbstractI18nMojo { /** * Prend en compte qu'un getter a été détecté. - * <p/> + * * Cela veut dire qu'un goal de parser a détecté des clefs. Il faudra donc * activer les goal get et gen. */ diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java index 0cbeafe..8895a7d 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java @@ -42,11 +42,11 @@ import java.util.TreeSet; /** * Lower level i18n mojo abstraction. - * <p/> + * * We defines here all commons parameters and shared behaviour. * - * @author tchemit <chemit@codelutin.com> - * @author jruchaud <ruchaud@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com + * @author Julien Ruchaud - ruchaud@codelutin.com */ public abstract class AbstractI18nMojo extends AbstractPlugin implements PluginWithEncoding { @@ -60,7 +60,7 @@ public abstract class AbstractI18nMojo extends AbstractPlugin implements PluginW /** * Locales to treate, separated by comma. - * <p/> + * * Example : * <pre>fr_FR,en_GB</pre> */ @@ -73,7 +73,7 @@ public abstract class AbstractI18nMojo extends AbstractPlugin implements PluginW /** * Verbose flag. - * <p/> + * * <b>Note :</b> if not setted, we used the {@code maven.verbose} property. */ @Parameter(property = "i18n.verbose", defaultValue = "${maven.verbose}") diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java index 84df835..22c6bd9 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java @@ -38,8 +38,8 @@ import java.util.Locale; /** * Merge new generated i18n bundles with older existing ones. * - * @author jruchaud <ruchaud@codelutin.com> - * @author chemit <chemit@codelutin.com> + * @author Julien Ruchaud - ruchaud@codelutin.com + * @author Tony Chemit - chemit@codelutin.com */ @Mojo(name = "gen", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) @Execute(goal = "get") @@ -51,7 +51,7 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { /** * To update generated files to user i18n files. - * <p/> + * * <b>Note :</b> By default, this is active, in order to have a project uptodate * with last i18n bundles detected. */ @@ -60,7 +60,7 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { /** * Strict mode to only keep in user i18n detected i18n keys and remove obsolete keys. - * <p/> + * * <b>Note :</b> By default not active. Use this with care since it can * delete keys. Moreover if this flag is activated, then all files will be parsed. */ @@ -77,7 +77,7 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { /** * A flag to show missing i18n translation. - * <p/> + * * <b>Note :</b> Need the {@link #checkBundle} to be activated). * * @since 1.0.0 @@ -87,7 +87,7 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { /** * To keep a backup of old i18n bundles (suffiex by a {@code ~}). - * <p/> + * * <b>Note: </b> By default, this property is not active. */ @Parameter(property = "i18n.keepBackup", defaultValue = "false") @@ -95,7 +95,7 @@ public class GenerateMojo extends AbstractI18nGenerateMojo { /** * To keep generated getter files. - * <p/> + * * <b>Note: </b> By default, this property is not active. */ @Parameter(property = "i18n.keepGetters", defaultValue = "false") diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java index 82bcb80..538ce41 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java @@ -46,7 +46,7 @@ public class GetterMojo extends AbstractI18nGenerateMojo { /** * To keep generated getter files. - * <p/> + * * <b>Note: </b> By default, this property is not active. */ @Parameter(property = "i18n.keepGetters", defaultValue = "false") diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java index 8458d45..5ce5936 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java @@ -37,7 +37,7 @@ import java.util.Locale; /** * Created: 26 déc. 2009 * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ public abstract class AbstractI18nBundleMojo extends AbstractI18nMojo { @@ -61,7 +61,7 @@ public abstract class AbstractI18nBundleMojo extends AbstractI18nMojo { /** * Pour obtenir les urls des fichiers i18n d'un projet (avec recherche dans * ses dépendances). - * <p/> + * * <b>Note:</b> L'ordre des urls reflète l'ordre des dépendances. * * @param locale la locale a traiter diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java index edfb6ea..cf4ede6 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AvailableConverterMojo.java @@ -35,10 +35,10 @@ import java.util.Map; /** * Mojo used to display available {@link BundleFormatConverter}. - * <p/> + * * Created: 09/05/11 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois * $Id$ * @since 2.4 */ diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java index b05e710..7ee9d76 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleFormatConverter.java @@ -26,11 +26,11 @@ package org.nuiton.i18n.plugin.bundle; /** * Contract to make a conversion from a syntax to another one. - * <p/> - * <p/> + * + * * Created: 05/05/11 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois * $Id$ * @since 2.4 */ diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java index 85f76bb..ad80e6a 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java @@ -65,19 +65,19 @@ import java.util.SortedSet; /** * Generate an aggregate i18n bundle for all dependencies of the project. - * <p/> + * * The main idea is to have a final unique i18n bundle for a application to * launch, this really improve i18n loading time to have a unique named bundle, * no need to seek in all dependencies... - * <p/> + * * Moreover, this permits also to deal with order of i18n keys, more precisly, * we want to use the higher level i18n key for an application. If the i18n * key is present on a library, we want to be able to override it in * application (or user wants it:)). - * <p/> + * * This goal permits this using the dependencies graph order of artifacts. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.12 */ @Mojo(name = "bundle", @@ -89,7 +89,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * Encoding used to load any i18n property files. - * <p/> + * * If not defined, will use the {@link #encoding} parameter. * * @since 2.4 @@ -99,7 +99,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * Encoding used to write any i18n property files. - * <p/> + * * If not defined, will use the {@link #encoding} parameter. * * @since 2.4 @@ -118,13 +118,13 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * Package name of the generate aggregated bundles. - * <p/> + * * <strong>Note:</strong> By default we use the <code>META-INF</code> package * since it is the favorite package of <code>I18n</code> runtime initializer. - * <p/> + * * The package name is dotted as it will be stored as folder like in Java * language. - * <p/> + * * Example : * <pre> * package name : foo.bar @@ -155,7 +155,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * A flag to check that bundles are complete (no missing i18n translations). - * <p/> + * * <b>Note :</b> This behaviour will be activated is {@link #failsIfWarning} is on. * * @since 1.0.0 @@ -165,7 +165,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * A flag to show missing i18n translation. - * <p/> + * * <b>Note :</b> Need the {@link #checkBundle} to be activated). * * @since 1.0.0 @@ -176,7 +176,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * A flag to make the build fails if there is some warnings while generating * bundle, says when it misses some translations. - * <p/> + * * <b>Note :</b> This parameter should be used in a release profile to * ensure bundles are complete. * @@ -198,7 +198,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * A flag to generate the i18n definition file. - * <p/> + * * This file contains all generated bundles and the paths of all i18n * artifacts used to make it. * @@ -210,7 +210,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * A flag to generate the i18n csv file wich contains all translation for * all locales. - * <p/> + * * Useful to translate from a language to another one. * * @since 2.5 @@ -517,7 +517,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * Generates a csv file with all translations. - * <p/> + * * First column is key, second is first locale translation, ... * * @throws IOException if any IO problem while the copy. @@ -600,7 +600,7 @@ public class BundleMojo extends AbstractI18nBundleMojo { /** * Generates the default bundle, says the bundle with no locale specialized. - * <p/> + * * This bundle is a copy of the bundle of the first locale (which in fact * is considered as the main locale). * diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java index fc5a539..62e03b5 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java @@ -55,11 +55,11 @@ import java.util.Map; /** * Detects any i18n artifacts in the dependencies of the project and store * their references in a file. - * <p/> + * * The generated file will be used by {@code bundle} mojo to generate the final * aggregated bundle. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.0.2 */ @Mojo(name = "collect-i18n-artifacts", diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java index b4685c9..f147e57 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.Locale; /** - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 0.12 */ public class I18nArtifact { diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java index 8c2c45f..478001b 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverter.java @@ -36,11 +36,11 @@ import java.util.regex.Pattern; /** * Implementation of {@link BundleFormatConverter} to convert {@link Formatter} * syntax to a {@link MessageFormat} syntax. - * <p/> + * * Created: 05/05/11 * - * @author fdesbois <desbois@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author Florian Desbois + * @author Tony Chemit - chemit@codelutin.com * @plexus.component role="org.nuiton.i18n.plugin.bundle.BundleFormatConverter" role-hint="toMessageFormat" * @since 2.4 */ diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java index 0c37815..57ea101 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/GenerateCsvBundleMojo.java @@ -42,10 +42,10 @@ import java.util.TreeMap; /** * To generate a csv file from the full bundle of the module. - * <p/> + * * The csv file will have a first column with i18n keys, and a * column for each locale defined in {@link #locales}. - * <p/> + * * Created on 7/26/14. * * @author Tony Chemit - chemit@codelutin.com @@ -65,7 +65,7 @@ public class GenerateCsvBundleMojo extends AbstractCsvBundleMojo { /** * Encoding used to read any i18n property files. - * <p/> + * * If not defined, will use the {@link #encoding} parameter. */ @Parameter(property = "i18n.bundleInputEncoding") @@ -73,7 +73,7 @@ public class GenerateCsvBundleMojo extends AbstractCsvBundleMojo { /** * Encoding used to write any files. - * <p/> + * * If not defined, will use the {@link #encoding} parameter. */ @Parameter(property = "i18n.bundleOutputEncoding") @@ -88,13 +88,13 @@ public class GenerateCsvBundleMojo extends AbstractCsvBundleMojo { /** * Package name of the generate aggregated bundles. - * <p/> + * * <strong>Note:</strong> By default we use the <code>META-INF</code> package * since it is the favorite package of <code>I18n</code> runtime initializer. - * <p/> + * * The package name is dotted as it will be stored as folder like in Java * language. - * <p/> + * * Example : * <pre> * package name : foo.bar @@ -106,7 +106,7 @@ public class GenerateCsvBundleMojo extends AbstractCsvBundleMojo { /** * To add the generated csv file in the classpath. - * <p/> + * * If {@link #bundleCsvDirectory} is filled, then will add the generated csv file at the root of class-path, * otherwise will add add it in the {@link #bundleOutputPackage} package. */ @@ -121,7 +121,7 @@ public class GenerateCsvBundleMojo extends AbstractCsvBundleMojo { /** * If you want to specify where to generate the csv file. - * <p/> + * * If not filled, then will generate it in the same directory where bundles are stored. */ @Parameter(property = "i18n.bundleCsvDirectory") diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java index 413a8a6..c7ebbe4 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/MergeBackCsvBundleMojo.java @@ -41,7 +41,7 @@ import java.util.Locale; /** * To merge back from a csv bundle to a module i18n bundle files. - * <p/> + * * Created on 7/26/14. * * @author Tony Chemit - chemit@codelutin.com @@ -55,7 +55,7 @@ public class MergeBackCsvBundleMojo extends AbstractCsvBundleMojo { /** * To accept to add new keys in the original i18n bundle. - * <p/> + * * The option is {@code false} by default, since merging operation should not add any new keys. */ @Parameter(property = "i18n.mergeNewKeys", defaultValue = "false") @@ -67,7 +67,7 @@ public class MergeBackCsvBundleMojo extends AbstractCsvBundleMojo { /** * Name to use as prefix of generated files. - * <p/> + * * <strong>Note :</strong> By default, use the artifact id. */ @Parameter(property = "i18n.artifactId", defaultValue = "${project.artifactId}", readonly = true) diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java index a865e6b..cdbe9ee 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/csv/SplitCsvBundleMojo.java @@ -41,10 +41,10 @@ import java.util.Locale; /** * To split a previously csv i18n file into simple i18n bundles for the locales defined in {@link #locales}. - * <p/> + * * The order of {@link #locales} will be used to extract for each locale i18n bundle (means the order defined * in the csv file is not used). Make sure to use exactly the same order. - * <p/> + * * Created on 7/26/14. * * @author Tony Chemit - chemit@codelutin.com @@ -71,8 +71,8 @@ public class SplitCsvBundleMojo extends AbstractCsvBundleMojo { /** * Name to use as prefix of generated files. - * <p/> - * <string>Note :</string> By default, use the artifact id. + * + * <strong>Note :</strong> By default, use the artifact id. */ @Parameter(property = "i18n.artifactId", defaultValue = "${project.artifactId}", readonly = true) protected String artifactId; diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java index 6b7fa9a..832edf2 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java @@ -36,7 +36,7 @@ import java.util.regex.Pattern; /** * A abstract implementation of a {@link FileParser} with no logic. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public abstract class AbstractFileParser implements FileParser { @@ -146,7 +146,7 @@ public abstract class AbstractFileParser implements FileParser { /** * To prepare the file (if any thing to be done before scanning it). - * <p/> + * * By default do nothing, use directly the input file. * * @param file the incoming file diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java index 7b93389..6cd1e0d 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java @@ -40,7 +40,7 @@ import java.util.regex.Pattern; /** * Abstract implementation for parsing goal. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public abstract class AbstractI18nParserMojo extends AbstractI18nGenerateMojo implements I18nParserConfiguration { @@ -75,7 +75,7 @@ public abstract class AbstractI18nParserMojo extends AbstractI18nGenerateMojo im /** * Strict mode to only keep in user i18n detected i18n keys and remove obsolete keys. - * <p/> + * * <b>Note :</b> By default not active. Use this with care since it can * delete keys. Moreover if this flag is activated, then all files will be parsed. */ @@ -96,7 +96,7 @@ public abstract class AbstractI18nParserMojo extends AbstractI18nGenerateMojo im /** * Flag to display touched files while parsing. - * <p/> + * * Note: the value will be always {@code true} if {@link #verbose} is * set at {@code true}. * @@ -107,7 +107,7 @@ public abstract class AbstractI18nParserMojo extends AbstractI18nGenerateMojo im /** * Flag to save previous getter in a backup before doing parsing. - * <p/> + * * Note: by default, do not perform backup (but it was here originaly so let * it possible...) * @@ -126,7 +126,7 @@ public abstract class AbstractI18nParserMojo extends AbstractI18nGenerateMojo im /** * A regex pattern to accept incoming keys. - * <p/> + * * Only incoming keys which match the pattern will be kept. * * @since 2.5 @@ -319,7 +319,7 @@ public abstract class AbstractI18nParserMojo extends AbstractI18nGenerateMojo im /** * Add the default entry to entries given in configuration. - * <p/> + * * This is a convinient method to simplify the configuration of the plugin. */ protected void addDefaultEntry() { diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java index da2816b..fefae72 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java @@ -34,7 +34,7 @@ import java.io.IOException; /** * the contract of a i18n file parser. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public interface FileParser { @@ -54,7 +54,7 @@ public interface FileParser { /** * TODO As we do not used anylonger old language, we should directly - * <p/> + * * TODO use only a set of keys, no need to keep i18n value... * * @return the results of i18n keys found for the given file diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java index 1d4929d..ac8d07e 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java @@ -31,7 +31,7 @@ import org.nuiton.io.SortedProperties; /** * Shared configuration for a parser mojo. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.2 */ public interface I18nParserConfiguration { diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java index 95a9e06..d37862e 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java @@ -32,7 +32,7 @@ import java.util.List; /** * Customized {@link SourceEntry} for parsers goals. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class I18nSourceEntry extends SourceEntry { diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java index a13427e..d0e1250 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java @@ -133,10 +133,10 @@ public class ParserExecutor extends ThreadPoolExecutor /** * Ask the thread to stop. - * <p/> + * * It will finish all incoming files (but will not accept more files to * parse) - * <p/> + * * <b>Note:</b> The method does not return until all files are not * consumed. * @@ -186,7 +186,7 @@ public class ParserExecutor extends ThreadPoolExecutor /** * This is a task to parse a {@link #file}. - * <p/> + * * The task will be executed in the executor service created in the thread. */ class ParserTask implements Runnable { @@ -257,7 +257,7 @@ public class ParserExecutor extends ThreadPoolExecutor /** * Register the result of the parsing of the {@link #file} after {@link * #run()} method was invoked. - * <p/> + * * This method should be invoked by the executor as an ending hook. * * @param treatedFiles list of files already treated diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java index 912ec79..f51467f 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java @@ -39,25 +39,25 @@ import java.util.List; /** * A simple model for a sourceEntry represents by a basedir and includes and/or * exlucdes pattern. - * <p/> + * * The class offers the usefull method : {@link #getIncludedFiles(File, * String[], String[])} - * <p/> + * * to obtain the list of files from the {@link #basedir} directory which * respects the {@link #includes} and/or {@link #excludes} patterns using an * internal {@link DirectoryScanner} object. - * <p/> + * * Note : <b>The class does not extends <code>DirectoryScanner</code> since we * DO not want to expose his methods.</b> * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class SourceEntry { /** * If you want to restrict use of the entry, set the class name goal to this * property via {@link #setSpecificGoal(String)}. - * <p/> + * * If let to <code>null</code>, all goals can use this entry. */ protected String specificGoal; @@ -127,7 +127,7 @@ public class SourceEntry { /** * Test if a file is up to date and not to be treated. - * <p/> + * * * @param file the file path to test * @return {@code true} if file is up to date and do not need to be parsed diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java index 01e7fbf..e188f86 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java @@ -65,8 +65,8 @@ import java.util.regex.Pattern; /** * Abstract xml parser mojo. * - * @author tchemit <chemit@codelutin.com> - * @author jruchaud <ruchaud@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com + * @author Julien Ruchaud - ruchaud@codelutin.com * @since 2.0 */ public abstract class AbstractParserXmlMojo extends AbstractI18nParserMojo { @@ -85,7 +85,7 @@ public abstract class AbstractParserXmlMojo extends AbstractI18nParserMojo { /** * Extra rules files to use for detecting i18n keys in xml validation files. - * <p/> + * * <b>Note : </b> If the {@code coreRulesFile} is not defined, then you must * fill this parameter. * @@ -96,7 +96,7 @@ public abstract class AbstractParserXmlMojo extends AbstractI18nParserMojo { /** * Defines namespaces mapping if needed. - * <p/> + * * Example : * <pre> * <namespaces> diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java index 7b86245..c3ac9b6 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserGWTJavaMojo.java @@ -66,7 +66,7 @@ import java.util.regex.Pattern; * <b>Note: </b> this goal must always be invoked before the {@code process-resources} * phase, otherwise all files will be considered as uptodate. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.1 */ @Mojo(name = "parserGWTJava", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) @@ -80,7 +80,7 @@ public class ParserGWTJavaMojo extends AbstractI18nParserMojo { /** * Default included files to process (ant-like expression). - * <p/> + * * <strong>Note:</strong> default value is **\/*.java */ @Parameter(property = "i18n.defaultIncludes", defaultValue = DEFAULT_INCLUDES, required = true) diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java index 5a097ff..df3f5a4 100755 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java @@ -25,19 +25,9 @@ package org.nuiton.i18n.plugin.parser.impl; -import java.io.File; -import java.io.IOException; -import java.util.HashSet; -import java.util.Set; -import java.util.regex.Pattern; - import org.antlr.v4.runtime.ANTLRInputStream; -import org.antlr.v4.runtime.BailErrorStrategy; import org.antlr.v4.runtime.CommonTokenStream; -import org.antlr.v4.runtime.DefaultErrorStrategy; import org.antlr.v4.runtime.TokenStream; -import org.antlr.v4.runtime.atn.PredictionMode; -import org.antlr.v4.runtime.misc.ParseCancellationException; import org.antlr.v4.runtime.tree.TerminalNode; import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.logging.Log; @@ -63,14 +53,20 @@ import org.nuiton.io.FileUpdater; import org.nuiton.io.FileUpdaterHelper; import org.nuiton.io.SortedProperties; +import java.io.File; +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; +import java.util.regex.Pattern; + /** * To parse java files to detect new i18n keys. - * <p/> + * * <b>Note: </b> this goal must always be invoked before the {@code process-resources} * phase, otherwise all files will be considered as uptodate. * - * @author jruchaud <ruchaud@codelutin.com> - * @author tchemit <tchemit@codelutin.com> + * @author Julien Ruchaud - ruchaud@codelutin.com + * @author Tony Chemit - chemit@codelutin.com */ @Mojo(name = "parserJava", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserJavaMojo extends AbstractI18nParserMojo { @@ -83,7 +79,7 @@ public class ParserJavaMojo extends AbstractI18nParserMojo { /** * Default included files to process (ant-like expression). - * <p/> + * * <strong>Note:</strong> default value is **\/*.java */ @Parameter(property = "i18n.defaultIncludes", defaultValue = DEFAULT_INCLUDES, required = true) diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java index 2406f94..ab7301e 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserStruts2Mojo.java @@ -49,7 +49,7 @@ import java.util.regex.Pattern; /** * To parse struts2 jsp and obtain all keys. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ @Mojo(name = "parserStruts2", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) @@ -63,7 +63,7 @@ public class ParserStruts2Mojo extends AbstractI18nParserMojo { /** * Default included files to process (ant-like expression). - * <p/> + * * <strong>Note:</strong> default value is **\/*.jsp */ @Parameter(property = "i18n.defaultIncludes", defaultValue = DEFAULT_INCLUDES, required = true) diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java index 76db50e..aa92fe8 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java @@ -47,11 +47,11 @@ import java.util.Map; /** * Find i18n keys from xworks xml validation files. - * <p/> + * * <b>Note: </b> this goal must always be invoked before the {@code process-resources} * phase, otherwise all files will be considered as uptodate. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ @Mojo(name = "parserValidation", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class ParserValidationMojo extends AbstractParserXmlMojo { @@ -64,7 +64,7 @@ public class ParserValidationMojo extends AbstractParserXmlMojo { /** * Default included files to process (ant-like expression). - * <p/> + * * <strong>Note:</strong> default value is **\/**-validation.xml */ @Parameter(property = "i18n.defaultIncludes", defaultValue = DEFAULT_INCLUDES, required = true) @@ -73,7 +73,7 @@ public class ParserValidationMojo extends AbstractParserXmlMojo { /** * Defines the core rules file used to detect i18n keys in xml validation * files. - * <p/> + * * <b>Note :</b> If you do not want to use it, set it to empty and fill the * {@link #userRulesFiles} parameter. * diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java index a8dc1c4..9ed366e 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java @@ -39,12 +39,12 @@ import java.io.File; /** * To obtain i18n keys from xml files using the {@code userRulesFiles} (and * an optional {@code coreRuleFile} if any serves your purpose). - * <p/> + * * <b>Note: </b> this goal must always be invoked before the * {@code process-resources} phase, otherwise all files will be considered as * uptodate. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.0 */ @Mojo(name = "parserXml", defaultPhase = LifecyclePhase.GENERATE_RESOURCES) diff --git a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java index 4614350..2d6c366 100644 --- a/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java +++ b/i18n-maven-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ProcessorHelper.java @@ -45,7 +45,7 @@ import java.util.Set; /** * Helper of processor api. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.0 */ public class ProcessorHelper extends ProcessorUtil { @@ -56,7 +56,7 @@ public class ProcessorHelper extends ProcessorUtil { /** * Abstract processor to be used with some smooth logic... * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.1 */ public abstract static class AbstractParserProcessor extends Processor { diff --git a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java index 8470493..f7253fd 100644 --- a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java +++ b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/bundle/StringFormatToMessageFormatConverterTest.java @@ -29,10 +29,10 @@ import org.junit.Test; /** * Tests the {@link StringFormatToMessageFormatConverter}. - * <p/> + * * Created: 05/05/11 * - * @author fdesbois <desbois@codelutin.com> + * @author Florian Desbois */ public class StringFormatToMessageFormatConverterTest { diff --git a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java index 05800c4..6824f27 100644 --- a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java +++ b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/SourceEntryTest.java @@ -34,7 +34,7 @@ import java.io.File; /** * Tests the {@link SourceEntry}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.4.3 */ public class SourceEntryTest { diff --git a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java index 331e1ac..b9ec686 100644 --- a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java +++ b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/JavaFileParserTest.java @@ -45,7 +45,7 @@ import java.util.function.Consumer; /** * Tests the class {@link ParserJavaMojo.JavaFileParser} * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.3 */ public class JavaFileParserTest { diff --git a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java index a0ad570..8fa118c 100644 --- a/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java +++ b/i18n-maven-plugin/src/test/java/org/nuiton/i18n/plugin/parser/impl/Struts2JspFileParserTest.java @@ -41,7 +41,7 @@ import java.util.regex.Pattern; /** * To tes the {@link ParserStruts2Mojo.Struts2JspFileParser} parser. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.5 */ public class Struts2JspFileParserTest { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java index e0c2f77..0ee86ed 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java @@ -39,7 +39,7 @@ import static org.nuiton.i18n.I18n.t; /** * L'application. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class I18nEditor { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java index 4727d76..7ad8bc2 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java @@ -49,7 +49,7 @@ import org.nuiton.util.VersionUtil; * TODO ajouter d'autres propriete pour controler quel storage est utilise * et quel est son type (local ou pas). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see DefaultApplicationContext.AutoLoad */ @DefaultApplicationContext.AutoLoad diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java index 5b92a92..b698894 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java @@ -33,12 +33,12 @@ import org.nuiton.i18n.editor.ui.I18nEditorUI; /** * Le contexte de l'application. - * <p/> + * * On définit ici toutes les entrées du contexte. - * <p/> + * * Note : cette classe possède une instance partagée accéssible via la méthode {@link #get()}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class I18nEditorContext extends DefaultApplicationContext { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java index 025553d..83f0bd4 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java @@ -41,7 +41,7 @@ import org.nuiton.i18n.bundle.I18nBundleUtil; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class AbstractI18nProject implements I18nProject { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java index f126ddf..b31d978 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java @@ -32,7 +32,7 @@ import org.nuiton.i18n.editor.ui.project.ProjectUIModel; * * @param <P> le type de projet supporte. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public abstract class AbstractI18nProjectProvider<P extends I18nProject> implements I18nProjectProvider<P> { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProject.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProject.java index f176745..a81c616 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProject.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProject.java @@ -29,7 +29,7 @@ import java.util.Properties; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public interface I18nProject { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectConfigurePanelUI.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectConfigurePanelUI.java index 1f551f6..4246c61 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectConfigurePanelUI.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectConfigurePanelUI.java @@ -26,7 +26,7 @@ import jaxx.runtime.JAXXObject; * * @param <P> le type de projet * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public interface I18nProjectConfigurePanelUI<P extends I18nProject> extends JAXXObject { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java index 6bd1abd..bd0543c 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java @@ -33,7 +33,7 @@ import org.nuiton.i18n.editor.ui.project.ProjectUIModel; /** * L'usine de projets. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see I18nProject * @see I18nProjectProvider */ diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectProvider.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectProvider.java index f217f8c..fb86f8b 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectProvider.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectProvider.java @@ -29,7 +29,7 @@ import org.nuiton.i18n.editor.ui.project.ProjectUIModel; * Le contrat d'un provider du projet. * * @param <P> le type de projet connu par le provider. - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public interface I18nProjectProvider<P extends I18nProject> { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java index 783b60a..aa7e280 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java @@ -25,7 +25,7 @@ import org.nuiton.i18n.editor.project.I18nProject; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class DirectoryI18nProject extends AbstractI18nProject { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java index aa92731..95b13f5 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java @@ -35,7 +35,7 @@ import static org.nuiton.i18n.I18n.*; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class DirectoryI18nProjectProvider extends AbstractI18nProjectProvider<DirectoryI18nProject> { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java index 402f30e..ae02c70 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java @@ -25,7 +25,7 @@ import org.nuiton.i18n.editor.project.I18nProject; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class JarI18nProject extends AbstractI18nProject { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java index 12db0f4..50a96a3 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java @@ -40,7 +40,7 @@ import java.util.TreeMap; /** * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class JarI18nProjectProvider extends AbstractI18nProjectProvider<JarI18nProject> { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java index 3431548..9d7c1f6 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java @@ -66,7 +66,7 @@ import static org.nuiton.i18n.I18n.t; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.editor.I18nEditorConfig.Option; -/** @author tchemit <chemit@codelutin.com> */ +/** @author Tony Chemit - chemit@codelutin.com */ @AutoLoad public class I18nEditorUIHandler { @@ -75,7 +75,7 @@ public class I18nEditorUIHandler { /** * Methode pour initialiser l'ui principale sans l'afficher. - * <p/> + * * Si un projet est charge dans le context, alors on le charge dans l'ui. * * @param context le context applicatif @@ -265,7 +265,7 @@ public class I18nEditorUIHandler { /** * Méthode pour changer de mode d'affichage. - * <p/> + * * Si <code>fullscreen</code> est à {@code true} alors on passe en * mode console (c'est à dire en mode plein écran exclusif), sinon on * passe en mode fenetré normal. @@ -287,7 +287,7 @@ public class I18nEditorUIHandler { /** * Methode pour changer la langue utilisee. - * <p/> + * * Cette action recharge le systeme i18n avec la nouvelle locale * donnee puis recherge les interfaces graphiques. * diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/TreeModelMode.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/TreeModelMode.java index 4a1ff61..a41da54 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/TreeModelMode.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/TreeModelMode.java @@ -21,7 +21,7 @@ package org.nuiton.i18n.editor.ui; /** * Pour caracteriser le mode a utiliser dans le modele de navigation. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public enum TreeModelMode { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java index a1e8978..4a246ef 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java @@ -43,7 +43,7 @@ import org.nuiton.util.FileUtil; /** * Le modele de l'ui pour creer un projet via un assistant * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class ProjectUIModel extends WizardModel<ProjectStep> { diff --git a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java index a35ff0e..6c27754 100644 --- a/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java +++ b/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java @@ -30,7 +30,7 @@ import org.nuiton.i18n.I18n; * Le modèle pour la tableau dans l'import GPS qui contient les activités et * les points gps calculés via le fichier gps importé. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class SelectBundlesTableModel extends AbstractTableModel { diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java index b14b29d..7aa65b7 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java @@ -29,17 +29,17 @@ import java.util.logging.Logger; /** * Une énumération pour représenter le pays d'une locale - * <p/> + * * <a href="http://www.iso.org/iso/country_codes"><code>ISO 3166-1:1998 (ICS n° * 01.140.20)</code></a>. - * <p/> + * * <a href="http://www.iso.org/iso/french_country_names_and_code_elements">la * liste des codes</a> - * <p/> + * * Chaque pays est repésenté ainsi : * <pre>A2, // A3 Number Country name</pre> * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public enum CountryEnum { diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java index 2aa3bc1..5178ac2 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java @@ -37,10 +37,10 @@ import java.util.Locale; /** * New generation I18n class. - * <p/> + * * <b>Note:</b> This class replace the previous one in project {@code * nuiton-utils}. - * <p/> + * * This class is a facility for internationalization. To use it in your soft, * you can either : <ul> <li> import the org.nuiton.i18n.I18n class, <li> init * the translation support with the init(String language) or init(String @@ -50,7 +50,7 @@ import java.util.Locale; * language following the naming convention given in the * java.util.ResourceBundle javadoc and translate all the sentence. </ul> * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class I18n { @@ -76,7 +76,7 @@ public class I18n { /** * Formatter to apply on each translation. - * <p/> + * * This formatter can not be configured directly here, but must be setted * into the {@code initializer} used to configure the I18n system. * @@ -96,20 +96,20 @@ public class I18n { /** * Initialize I18n system. - * <p/> + * * The {@code initializer} can be null, in that case it will use the default * implementation of it given by the method {@link I18n#getDefaultInitializer()}. - * <p/> + * * The {@code locale} can also be null, and in that case we will use the * default locale of the system given by the method * {@link Locale#getDefault()}. - * <p/> + * * <strong>We strongly recommand not to use the default initializer</strong>, * since this one scanq all the class-path to detects i18n files and can * <strong>NOT</strong> garantee the order of loading such files. - * <p/> + * * Prefer use at least the {@link DefaultI18nInitializer} instead. - * <p/> + * * In version 3.0, we will try to make the {@link DefaultI18nInitializer} the * default initializer using a convention over i18n files names. * @@ -154,11 +154,11 @@ public class I18n { /** * Sets the default locale used by I18n for the method * {@link I18n#t(String, Object...)}. * - * <p/> + * * As a side effect, it will also set this locale is the default locale in * the system (says the method {@link Locale#getDefault()} will return the * given locale). - * <p/> + * * <b>Note :</b> The I18n system must have been initialized by one of the * {@code init} method. * @@ -176,7 +176,7 @@ public class I18n { * Obtain the default locale setted in I18n. This very locale is used in * translation when no locale information is given * (says in method {@link I18n#t(String, Object...)}. - * <p/> + * * <b>Note :</b> The I18n system must have been initialized by one of the * {@code init} method. * @@ -350,16 +350,16 @@ public class I18n { /** * Retourne la chaine passée en argument. - * <p/> + * * Utile surtout pour collecter les chaines et ne pas les traduires à leur * apparition. - * <p/> + * * Par exemple : * <pre>String key = "nuitonutils.key"; * String result = l(key)</pre> * fonctionnera, mais la chaine n'aura pas été marquée comme devant être * internationalisé. - * <p/> + * * Tres utile par exemple, pour crée des objets non internationnalisé, et * devant être traduit seulement à leur lecture suivant la locale du lecteur * et non du créateur. @@ -376,16 +376,16 @@ public class I18n { /** * Retourne la chaine passée en argument. - * <p/> + * * Utile surtout pour collecter les chaines et ne pas les traduires à leur * apparition. - * <p/> + * * Par exemple : * <pre>String key = "nuitonutils.key"; * String result = l(key)</pre> * fonctionnera, mais la chaine n'aura pas été marquée comme devant être * internationalisé. - * <p/> + * * Tres utile par exemple, pour crée des objets non internationnalisé, et * devant être traduit seulement à leur lecture suivant la locale du lecteur * et non du créateur. @@ -416,7 +416,7 @@ public class I18n { /** * Close i18n caches, says the store if exists. - * <p/> + * * This method should be called to reset all caches (languages, * bundles,...) */ @@ -432,7 +432,7 @@ public class I18n { /** * Get the i18n store. - * <p/> + * * If store is not init, then instanciate it. * * @return the instanciated i18n store @@ -457,7 +457,7 @@ public class I18n { /** * Obtain the registred language from the store. - * <p/> + * * If no language were registred in the store, then use the language * with the default locale of the store. * @@ -471,10 +471,10 @@ public class I18n { /** * Obtain the language for the given {@code locale}. - * <p/> + * * If locale is {@code null}, it means we wants to use the language * registred in the store. - * <p/> + * * As a fallback if this language is not defined, we use the language of * the default locale of the store. * @@ -518,7 +518,7 @@ public class I18n { /** * Init the store with given parameters and set the current language in the * store to the default given {@code locale}. - * <p/> + * * All values must be none {@code null}. * * @param initializer the initializer to use to detect bundles diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java index e1422da..4e74ab7 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java @@ -26,10 +26,10 @@ package org.nuiton.i18n; /** * i18nDefaultTooltipFilter.java - * <p/> + * * Created: 2 déc. 2003 * - * @author Benjamin Poussin <poussin@codelutin.com> + * @author Benjamin Poussin - poussin@codelutin.com * @deprecated since 2.4, this filter has nothing to do in i18n api, will be * removed in version 3.0 and never replaced here... */ diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java index b0318e6..e671918 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java @@ -28,7 +28,7 @@ * * Created: 2 déc. 2003 * - * @author Benjamin Poussin <poussin@codelutin.com> + * @author Benjamin Poussin - poussin@codelutin.com * Copyright Code Lutin * @version $Revision$ * diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java index 94e5099..c7ff9a3 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java @@ -43,10 +43,10 @@ import java.util.Properties; /** * Represents a language in i18n system with all his translations. - * <p/> + * * To obtain a translation, use the method {@link #translate(String)} * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class I18nLanguage { diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java index 723d124..6c145d6 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java @@ -40,11 +40,11 @@ import java.util.Map; /** * Represents the store of languages of the i18n system. - * <p/> + * * Replace the {@code org.nuiton.i18n.I18nLoader} class from project * http://maven-site.nuiton.org/nuiton-utils * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class I18nStore { @@ -78,7 +78,7 @@ public class I18nStore { /** * Obtain the current language setted in the store. - * <p/> + * * This language is used for all translations without locale information * (says the method {@link I18n#t(String, Object...)}). * @@ -91,7 +91,7 @@ public class I18nStore { /** * Obtain the current locale setted in the store. - * <p/> + * * This locale is coming from the current language and is used for all * translations without locale information (says the method {@link I18n#t(String, Object...)}. * @@ -104,7 +104,7 @@ public class I18nStore { /** * Sets the current locale for the store. - * <p/> + * * This will set the current language with this given locale. * * @param locale the new current locale @@ -233,7 +233,7 @@ public class I18nStore { /** * Close store and release cache ofg language. - * <p/> + * * Current language will be also cleaned. */ protected void close() { @@ -264,7 +264,7 @@ public class I18nStore { /** * Recherche un object de type {@link I18nLanguage} pour la locale donnée * en paramètre dans le cache des langues chargées ({@link #languages}). - * <p/> + * * Si un tel objet n'existe pas, alors on en crée un et on le place dans le * cache. * diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java index a668a0d..46d7523 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java @@ -49,7 +49,7 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import java.util.zip.ZipFile; -/** @author tchemit <chemit@codelutin.com> */ +/** @author Tony Chemit - chemit@codelutin.com */ public class I18nUtil { /** Logger. */ @@ -73,7 +73,7 @@ public class I18nUtil { /** * Parse a list of {@link Locale} seperated by comma. - * <p/> + * * Example : fr_FR,en_GB * * @param str the string representation of locale separated by comma @@ -256,7 +256,7 @@ public class I18nUtil { /** * Returns the all urls to be used in a {@link URLClassLoader}. - * <p/> + * * If classloader has only one url and the url is a jar, try to load in * manifest class-path. * @@ -305,7 +305,7 @@ public class I18nUtil { /** * Recupere la liste des urls d'un {@link URLClassLoader}. - * <p/> + * * Note : Un cas particulier est positionné pour JBoss qui utilise la method * getAllURLs. * diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java index efc188c..dffdd8c 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java @@ -31,11 +31,11 @@ import java.util.logging.Logger; * Une énumération pour représenter le langue d'une locale définie dans la norme * <a href="http://www.iso.org/iso/iso_catalogue/catalogue_ics/catalogue_detail_ics.htm?csnumber=22109&ICS1=1&ICS2=140&ICS3=20"><code>ISO * 639-1:1998 (ICS n° 01.140.20)</code></a>. - * <p/> + * * <a href="http://www.loc.gov/standards/iso639-2/php/French_list.php">la liste * des codes</a> * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public enum LanguageEnum { diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java index 4878166..b3bbc2e 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java @@ -35,20 +35,20 @@ import java.util.Locale; /** * Class to represent a i18n Bundle. - * <p/> + * * A bundle is defined by a resource prefix (eg /tmp/bundle.properties), and a * list of locale implemented entries. - * <p/> + * * The property {@link #bundlePrefix} is the equals order property. - * <p/> + * * The property {@link #entries} contains all entries defined for this bundle. - * <p/> + * * The method {@link #getEntries(Locale)} filter entries for a given locale, * including scope inclusive property. - * <p/> + * * The method {@link #getEntries(I18nBundleScope)} filter entries for a given * scope, with no inclusive logi. - * <p/> + * * Thoses filter methods return result in the order defines in {@link * I18nBundleEntry}, e.g * <pre> @@ -59,7 +59,7 @@ import java.util.Locale; * In that way, we can load resource in the good order : load before more * general scope to more specialized. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see I18nBundleScope * @see I18nBundleEntry */ @@ -84,7 +84,7 @@ public class I18nBundle implements Iterable<I18nBundleEntry> { /** * Obtain the entries for a given locale, with a inclusive scope search. - * <p/> + * * The order of result respect {@link I18nBundleEntry} order. * * @param locale the required locale @@ -111,7 +111,7 @@ public class I18nBundle implements Iterable<I18nBundleEntry> { /** * Obtain the entries for a given <code>scope</code> with no incluvie * logic. - * <p/> + * * The order of result respect {@link I18nBundleEntry} order. * * @param scope the required scope diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java index 92f2f1d..ed45499 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java @@ -39,20 +39,20 @@ import java.util.Properties; /** * A class to represent an entry in a bundle. - * <p/> + * * The object matches exactly one resource file in a given scope. - * <p/> + * * The object has three properties : <ul> <li> {@link #path} : the path to * resource file where to find transaltion for the entry. <li> {@link #locale} : * the locale of the entry <li> {link #scope} ; the scope of the entry </ul> * This object defines a equals order base on property {@link #path}. - * <p/> + * * This object is {@link Comparable}, the order relation is defined like this : * <ul> <li> sort first on {@link #scope}, in the scope order (see {@link * I18nBundleScope}), <li> if scopes are equals, sort on {@link #locale} string * representation. </ul> * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @see I18nBundleScope */ public class I18nBundleEntry implements Comparable<I18nBundleEntry> { @@ -68,7 +68,7 @@ public class I18nBundleEntry implements Comparable<I18nBundleEntry> { /** * Constructor if an bundle entry. - * <p/> + * * It is defined by a <code>path</code> of the resource file, a scope and a * locale. * @@ -96,7 +96,7 @@ public class I18nBundleEntry implements Comparable<I18nBundleEntry> { /** * Method to match or not a bundle entry for a given scope and locale. - * <p/> + * * We use the inclusive property of scope, means that we accept all entries * on the path to the generalest entry for a givne locale. * diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java index 45a9f13..9a5912a 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java @@ -33,33 +33,33 @@ import java.util.regex.Pattern; /** * The enumaration defines the scope of a bundle entry. - * <p/> + * * There is three scope possible: <ul> <li>{@link #GENERAL} : for a bundle entry * with no locale specialized information, eg : <code>bundle.properties</code></li> * <li>{@link #LANGUAGE} : for a bundle entry with language locale specialized * information, eg : <code>bundle-en.properties</code></li> <li>{@link #FULL} : * for a bundle entry with full locale specialized information, eg : * <code>bundle-en_GB.properties</code></li> </ul> - * <p/> + * * We define a order relation, from general to full scope : - * <p/> + * * {@link #GENERAL} < {@link #LANGUAGE} < {@link #FULL} - * <p/> + * * Scopes are inclusives, in a search of entries, eg the search of * <code>en_GB</code> will include <code>en</code> scope... - * <p/> + * * The {@code #patternAll} is the searching pattern of bundle of the scope. - * <p/> + * * The method {@link #getMatcher(String)} obtain from the {@code #patternAll} * the matcher for a bundle path. - * <p/> + * * The method {@link #getLocale(Matcher)} obtain from the {@code #patternAll} * matched in a bundle path, the corresponding locale. - * <p/> + * * The class offer also a static method {@link #valueOf(Locale)} to obtain the * scope of a locale. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public enum I18nBundleScope { @@ -101,7 +101,7 @@ public enum I18nBundleScope { /** * Obtain the scope of a given <code>locale</code>. - * <p/> + * * The given locale can be null, which means {@link I18nBundleScope#GENERAL} * scope. * diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java index a4878e6..bfce0c4 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java @@ -48,10 +48,10 @@ import java.util.zip.ZipInputStream; /** * Usefull methods on bundles. - * <p/> + * * <b>Note:</b> Replace the previous class {@code org.nuiton.i18n.bundle.I18nBundleFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class I18nBundleUtil { @@ -135,13 +135,13 @@ public class I18nBundleUtil { /** * Filtrage des entrées de bundles pour une locale donnée. - * <p/> + * * On essaye de trouver les meilleurs entrées possibles (possibilité de * promotion). - * <p/> + * * Note: Cette méthode doit être utilisé pour trouver toutes les entrées à * charger par le système i18n pour une locale donnée. - * <p/> + * * Note: Par defaut, on n'effectue pas les promotions générales ({@link * #getBundleEntries(Locale, Locale, boolean, I18nBundle...)} * @@ -158,10 +158,10 @@ public class I18nBundleUtil { /** * Filtrage des entrées de bundles pour une locale donnée. - * <p/> + * * On essaye de trouver les meilleurs entrées possibles (possibilité de * promotion). - * <p/> + * * Note: Cette méthode doit être utilisé pour trouver toutes les entrées à * charger par le système i18n pour une locale donnée. * @@ -300,7 +300,7 @@ public class I18nBundleUtil { /** * Detecte les bundles i18n a partir des urls des fichiers de traduction * donnes. - * <p/> + * * Tous les entrées de bundles sont triees dans l'ordre des scopes i18n. * * @param urls les urls des fichiers de traductions @@ -381,7 +381,7 @@ public class I18nBundleUtil { /** * Obtain some rescue entries for a given locale. - * <p/> + * * Note: <b>Calling this method implies there is no entry matched by the * common method {@link #getBundleEntries(Locale, Locale, I18nBundle...)} * returns a empty array.</b> @@ -599,7 +599,7 @@ public class I18nBundleUtil { /** * Compute the search pattern according to the {@link File#separator} on * the underlying os. - * <p/> + * * Under linux this is {@code .*i18n/.+\.properties}, and under windows this * is {@code .*i18n\\\\.+\.properties}. * diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java index daeb62b..008b01b 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/package-info.java @@ -25,6 +25,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 diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java index 8781e85..c945670 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/I18nMessageFormatter.java @@ -28,13 +28,11 @@ 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> + * @author Florian Desbois + * @author Tony Chemit - chemit@codelutin.com * @see StringFormatI18nMessageFormatter * @see MessageFormatI18nMessageFormatter * @since 2.4 @@ -43,10 +41,10 @@ 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, ...) diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java index d53fc12..5ef5263 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/MessageFormatI18nMessageFormatter.java @@ -30,7 +30,7 @@ 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. diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java index d36acc8..5ec38ee 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/StringFormatI18nMessageFormatter.java @@ -30,7 +30,7 @@ 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. * diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java index e78ba85..9902da6 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/format/package-info.java @@ -26,7 +26,7 @@ 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 diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java index 6eaecf6..005f3aa 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java @@ -42,12 +42,12 @@ import java.util.List; /** * Implementation of a {@link I18nInitializer} using all i18n resources (from * artifacts) discovered in classpath. - * <p/> + * * Will scan all classpath. - * <p/> + * * <b>Note:</b> No order can be predicted with this implementation on bundles. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class ClassPathI18nInitializer extends I18nInitializer { diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java index c8bd823..1cadb2d 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java @@ -43,7 +43,7 @@ import java.util.Properties; * Default implementation of a {@link I18nInitializer} using the default i18n * implementation (one unique bundle with a definition properties file). * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class DefaultI18nInitializer extends I18nInitializer { diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java index 300f060..5e95d70 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java @@ -43,8 +43,8 @@ import java.util.Properties; * Abstract object to resolv {@link I18nBundle} and prepare initialization of * {@link I18n}. * - * @author tchemit <chemit@codelutin.com> - * @author fdebois <debois@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com + * @author Florian Desbois * @since 1.1 */ public abstract class I18nInitializer { diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java index 61024e2..e79fbfb 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java @@ -45,7 +45,7 @@ import java.util.Properties; * Initializer which expose i18n resources in the {@link #userDirectory}, then * use resources from this user directories. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class UserI18nInitializer extends DefaultI18nInitializer { @@ -145,7 +145,7 @@ public class UserI18nInitializer extends DefaultI18nInitializer { /** * Creates the user i18n structure or fill it if required. - * <p/> + * * will use the default initializer to obtain i18n resources from default * system, then copy them to the user directory. * @@ -231,7 +231,7 @@ public class UserI18nInitializer extends DefaultI18nInitializer { /** * Hook to update the user i18n structure. - * <p/> + * * If you wants to do something specific, overriddes this method. * * @param directory the user directory where are i18n resources diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java index 244d4ed..a03c0a9 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/init/package-info.java @@ -26,7 +26,7 @@ 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 diff --git a/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java b/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java index dcfae56..5d3c126 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/package-info.java @@ -25,7 +25,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 diff --git a/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java b/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java index 55d0bad..6c19c9f 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java +++ b/nuiton-i18n/src/main/java/org/nuiton/util/converter/LocaleConverter.java @@ -40,7 +40,7 @@ import static org.apache.commons.logging.LogFactory.getLog; /** * classe pour convertir une chaine en un objet {@link Locale}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.0.1 * @deprecated since 3.2 use instead {@link org.nuiton.converter.LocaleConverter} (<strong>Note:</strong> This converter is no more loaded by the {@link org.nuiton.converter.ConverterUtil#initConverters()}) */ diff --git a/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java b/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java index 0cab743..e7bb3c7 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java +++ b/nuiton-i18n/src/main/java/org/nuiton/util/converter/package-info.java @@ -27,7 +27,7 @@ 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 diff --git a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java index 7f221e1..0539996 100644 --- a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java +++ b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java @@ -36,7 +36,7 @@ import java.util.Locale; /** * Tests {@link I18nStore}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 1.1 */ public class I18nStoreTest { diff --git a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java index 27ebffb..6751bff 100644 --- a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java +++ b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java @@ -38,7 +38,7 @@ import java.util.Locale; /** * Test the class {@link I18n}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com * @since 2.1 */ public class I18nTest { diff --git a/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java b/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java index 586cd3e..2ed1af6 100644 --- a/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java +++ b/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java @@ -33,7 +33,7 @@ import java.util.Locale; /** * Tests {@link I18nBundleScope} * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ public class I18nBundleScopeTest { diff --git a/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java b/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java index 430c5f5..f83753d 100644 --- a/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java +++ b/nuiton-i18n/src/test/java/org/nuiton/util/converter/LocaleConverterTest.java @@ -33,7 +33,7 @@ import java.util.Locale; /** * Tests {@link LocaleConverter}. * - * @author tchemit <chemit@codelutin.com> + * @author Tony Chemit - chemit@codelutin.com */ @Deprecated public class LocaleConverterTest extends TestCase { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See http://git.nuiton.org/i18n.git commit 48dd0e41e49011b6f2fd52e71a43769597cba686 Merge: 2c84cb0 ef3d901 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 10:47:51 2016 +0100 Fixes #3894 Merge branch 'feature/3894' into develop .../java/org/nuiton/i18n/MessageConstants.java | 3 +- .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../java/org/nuiton/i18n/MessageConstants.java | 2 +- .../src/test/java/org/nuiton/i18n/ReadTest.java | 2 +- .../org/nuiton/i18n/ReadMessageFormatTest.java | 2 +- .../i18n/plugin/AbstractI18nGenerateMojo.java | 4 +- .../org/nuiton/i18n/plugin/AbstractI18nMojo.java | 10 ++--- .../java/org/nuiton/i18n/plugin/GenerateMojo.java | 14 +++---- .../java/org/nuiton/i18n/plugin/GetterMojo.java | 2 +- .../i18n/plugin/bundle/AbstractI18nBundleMojo.java | 4 +- .../i18n/plugin/bundle/AvailableConverterMojo.java | 4 +- .../i18n/plugin/bundle/BundleFormatConverter.java | 6 +-- .../org/nuiton/i18n/plugin/bundle/BundleMojo.java | 32 +++++++-------- .../plugin/bundle/CollectI18nArtifactsMojo.java | 4 +- .../nuiton/i18n/plugin/bundle/I18nArtifact.java | 2 +- .../StringFormatToMessageFormatConverter.java | 6 +-- .../plugin/bundle/csv/GenerateCsvBundleMojo.java | 18 ++++---- .../plugin/bundle/csv/MergeBackCsvBundleMojo.java | 6 +-- .../i18n/plugin/bundle/csv/SplitCsvBundleMojo.java | 8 ++-- .../i18n/plugin/parser/AbstractFileParser.java | 4 +- .../i18n/plugin/parser/AbstractI18nParserMojo.java | 12 +++--- .../org/nuiton/i18n/plugin/parser/FileParser.java | 4 +- .../plugin/parser/I18nParserConfiguration.java | 2 +- .../nuiton/i18n/plugin/parser/I18nSourceEntry.java | 2 +- .../nuiton/i18n/plugin/parser/ParserExecutor.java | 8 ++-- .../org/nuiton/i18n/plugin/parser/SourceEntry.java | 12 +++--- .../plugin/parser/impl/AbstractParserXmlMojo.java | 8 ++-- .../i18n/plugin/parser/impl/ParserGWTJavaMojo.java | 4 +- .../i18n/plugin/parser/impl/ParserJavaMojo.java | 24 +++++------ .../i18n/plugin/parser/impl/ParserStruts2Mojo.java | 4 +- .../plugin/parser/impl/ParserValidationMojo.java | 8 ++-- .../i18n/plugin/parser/impl/ParserXmlUserMojo.java | 4 +- .../i18n/plugin/parser/impl/ProcessorHelper.java | 4 +- .../StringFormatToMessageFormatConverterTest.java | 4 +- .../nuiton/i18n/plugin/parser/SourceEntryTest.java | 2 +- .../plugin/parser/impl/JavaFileParserTest.java | 2 +- .../parser/impl/Struts2JspFileParserTest.java | 2 +- .../java/org/nuiton/i18n/editor/I18nEditor.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorConfig.java | 2 +- .../org/nuiton/i18n/editor/I18nEditorContext.java | 6 +-- .../i18n/editor/project/AbstractI18nProject.java | 2 +- .../project/AbstractI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/project/I18nProject.java | 2 +- .../project/I18nProjectConfigurePanelUI.java | 2 +- .../i18n/editor/project/I18nProjectFactory.java | 2 +- .../i18n/editor/project/I18nProjectProvider.java | 2 +- .../editor/project/impl/DirectoryI18nProject.java | 2 +- .../project/impl/DirectoryI18nProjectProvider.java | 2 +- .../i18n/editor/project/impl/JarI18nProject.java | 2 +- .../project/impl/JarI18nProjectProvider.java | 2 +- .../nuiton/i18n/editor/ui/I18nEditorUIHandler.java | 8 ++-- .../org/nuiton/i18n/editor/ui/TreeModelMode.java | 2 +- .../i18n/editor/ui/project/ProjectUIModel.java | 2 +- .../editor/ui/project/SelectBundlesTableModel.java | 2 +- .../src/main/java/org/nuiton/i18n/CountryEnum.java | 8 ++-- .../src/main/java/org/nuiton/i18n/I18n.java | 48 +++++++++++----------- .../org/nuiton/i18n/I18nDefaultTooltipFilter.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nFilter.java | 2 +- .../main/java/org/nuiton/i18n/I18nLanguage.java | 4 +- .../src/main/java/org/nuiton/i18n/I18nStore.java | 14 +++---- .../src/main/java/org/nuiton/i18n/I18nUtil.java | 8 ++-- .../main/java/org/nuiton/i18n/LanguageEnum.java | 4 +- .../java/org/nuiton/i18n/bundle/I18nBundle.java | 18 ++++---- .../org/nuiton/i18n/bundle/I18nBundleEntry.java | 12 +++--- .../org/nuiton/i18n/bundle/I18nBundleScope.java | 20 ++++----- .../org/nuiton/i18n/bundle/I18nBundleUtil.java | 20 ++++----- .../java/org/nuiton/i18n/bundle/package-info.java | 2 +- .../nuiton/i18n/format/I18nMessageFormatter.java | 12 +++--- .../format/MessageFormatI18nMessageFormatter.java | 2 +- .../format/StringFormatI18nMessageFormatter.java | 2 +- .../java/org/nuiton/i18n/format/package-info.java | 2 +- .../nuiton/i18n/init/ClassPathI18nInitializer.java | 6 +-- .../nuiton/i18n/init/DefaultI18nInitializer.java | 2 +- .../java/org/nuiton/i18n/init/I18nInitializer.java | 4 +- .../org/nuiton/i18n/init/UserI18nInitializer.java | 6 +-- .../java/org/nuiton/i18n/init/package-info.java | 2 +- .../main/java/org/nuiton/i18n/package-info.java | 2 +- .../org/nuiton/util/converter/LocaleConverter.java | 2 +- .../org/nuiton/util/converter/package-info.java | 2 +- .../test/java/org/nuiton/i18n/I18nStoreTest.java | 2 +- .../src/test/java/org/nuiton/i18n/I18nTest.java | 2 +- .../nuiton/i18n/bundle/I18nBundleScopeTest.java | 2 +- .../nuiton/util/converter/LocaleConverterTest.java | 2 +- pom.xml | 2 +- 84 files changed, 248 insertions(+), 255 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm