branch feature/java9+ created (now 346f5ad)
This is an automated email from the git hooks/post-receive script. New change to branch feature/java9+ in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git at 346f5ad [iso] code style This branch includes the following new commits: new 8fcddef Modification nécessaire pour compiler en Java 9+ new f4bc76e Le support de Java 9+ casse la rétrocompatibilité, donc c'est un changement majeur de version new d574c22 Corrige le nommage des constantes new 346f5ad [iso] code style The 4 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 346f5ad69c4bb78f4a03985d02cb44bbd6cc72bb Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:31:04 2020 +0100 [iso] code style commit d574c2242f2c6f082dc6083b8425be2ba3df7002 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:30:23 2020 +0100 Corrige le nommage des constantes commit f4bc76e0ab7eedabd95d5bd74fc6890a31421063 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:29:16 2020 +0100 Le support de Java 9+ casse la rétrocompatibilité, donc c'est un changement majeur de version commit 8fcddef5c75f4f894a421efadb003af7030de13c Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:28:35 2020 +0100 Modification nécessaire pour compiler en Java 9+ -- 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 feature/java9+ in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 8fcddef5c75f4f894a421efadb003af7030de13c Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:28:35 2020 +0100 Modification nécessaire pour compiler en Java 9+ --- .../ano-672/src/test/java/org/nuiton/i18n/I18nTest.java | 2 +- .../i18n/plugin/parser/impl/AbstractParserXmlMojo.java | 2 +- nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java | 15 --------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java b/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java index deeb690..003358f 100644 --- a/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java +++ b/i18n-maven-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java @@ -52,7 +52,7 @@ public class I18nTest { } @Test - public void _() { + public void t() { String expected, actual; 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 e188f86..4471ebe 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 @@ -343,7 +343,7 @@ public abstract class AbstractParserXmlMojo extends AbstractI18nParserMojo { } @Override - public Iterator<?> getPrefixes(String namespaceURI) { + public Iterator<String> getPrefixes(String namespaceURI) { return null; } }; 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 5178ac2..d0374e0 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java @@ -310,21 +310,6 @@ public class I18n { } } - /** - * Retourne la chaine traduite si possible. - * - * @param message message formate avec {@link I18nMessageFormatter} - * @param args les parametres pour le message. - * @return la traduction si possible ou la chaine passee en parametre - * sinon. - * @deprecated since 2.9, will be removed soon or later (hopes before Java SE 9), as part of syntax - * keyword for lambda functions. Prefer use now method {@link #t(String, Object...)} - */ - @Deprecated - public static String _(String message, Object... args) { - return t(message, args); - } - /** * Retourne la chaine traduite si possible. * -- 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 feature/java9+ in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit f4bc76e0ab7eedabd95d5bd74fc6890a31421063 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:29:16 2020 +0100 Le support de Java 9+ casse la rétrocompatibilité, donc c'est un changement majeur de version --- i18n-maven-plugin/pom.xml | 2 +- nuiton-i18n-editor/pom.xml | 2 +- nuiton-i18n/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml index 659a916..4286dd8 100644 --- a/i18n-maven-plugin/pom.xml +++ b/i18n-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.9-SNAPSHOT</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n-editor/pom.xml b/nuiton-i18n-editor/pom.xml index 2207f4e..7e0d477 100644 --- a/nuiton-i18n-editor/pom.xml +++ b/nuiton-i18n-editor/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.7-SNAPSHOT</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/nuiton-i18n/pom.xml b/nuiton-i18n/pom.xml index 560eda0..71258cf 100644 --- a/nuiton-i18n/pom.xml +++ b/nuiton-i18n/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.9-SNAPSHOT</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> diff --git a/pom.xml b/pom.xml index a92c5c8..1085510 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.9-SNAPSHOT</version> + <version>4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> -- 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 feature/java9+ in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit d574c2242f2c6f082dc6083b8425be2ba3df7002 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:30:23 2020 +0100 Corrige le nommage des constantes --- nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6540382..5ad25cf 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java @@ -64,11 +64,11 @@ public class I18nUtil { /** Logger. */ private static final Log log = LogFactory.getLog(I18nUtil.class); - public static final String ISO_8859_1_ENCONDING = "ISO-8859-1"; + public static final String ISO_8859_1_ENCODING = "ISO-8859-1"; - public static final String UTF_8_ENCONDING = "UTF-8"; + public static final String UTF_8_ENCODING = "UTF-8"; - public static final String DEFAULT_ENCODING = UTF_8_ENCONDING; + public static final String DEFAULT_ENCODING = UTF_8_ENCODING; public static final Charset DEFAULT_CHARSET = Charset.forName(DEFAULT_ENCODING); -- 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 feature/java9+ in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 346f5ad69c4bb78f4a03985d02cb44bbd6cc72bb Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 3 17:31:04 2020 +0100 [iso] code style --- nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 5ad25cf..236e762 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java @@ -93,18 +93,18 @@ public class I18nUtil { public static Locale[] parseLocales(String str) throws IllegalArgumentException { List<Locale> result = new ArrayList<Locale>(); String[] bundlesToUse = str.split(","); - for (int i = 0, j = bundlesToUse.length; i < j; i++) { - String s = bundlesToUse[i].trim(); + for (String value : bundlesToUse) { + String s = value.trim(); // on devrait verifier que le bundle existe try { Locale l = LOCALE_CONVERTER.valueOf(s); result.add(l); } catch (Exception e) { throw new IllegalArgumentException("bundle " + s + - " is not a valid locale", e); + " is not a valid locale", e); } } - return result.toArray(new Locale[result.size()]); + return result.toArray(new Locale[0]); } public static Locale newLocale(String str) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm