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>.