This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit 3e81d2a057e1db620fa4363f40b0e3cc4b83fceb Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 16:44:19 2019 +0200 [iso] Code style --- nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java | 9 ++++----- .../src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java | 3 +-- .../main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java | 4 ++-- 3 files changed, 7 insertions(+), 9 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 8c9d2cd..81b6c68 100644 --- a/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java +++ b/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java @@ -213,7 +213,7 @@ public class I18nUtil { log.trace("search '" + pattern + "' in " + repository); } - List<URL> urlList = new ArrayList<URL>(); + List<URL> urlList = new ArrayList<>(); File[] filesList = repository.listFiles(); if (filesList != null) { @@ -265,8 +265,8 @@ public class I18nUtil { * @return all the url found in the classloader */ static public URL[] getDeepURLs(URLClassLoader loader) { - Stack<URL> urlToTreate = new Stack<URL>(); - List<URL> urlTreated = new ArrayList<URL>(); + Stack<URL> urlToTreate = new Stack<>(); + List<URL> urlTreated = new ArrayList<>(); // first get the urls from classloader URL[] result = getURLs(loader); @@ -285,8 +285,7 @@ public class I18nUtil { if (newArrayURLs == null) { continue; } - List<URL> newURLs = Arrays.asList(newArrayURLs); - for (URL newURL : newURLs) { + for (URL newURL : newArrayURLs) { if (!urlTreated.contains(newURL) && !urlToTreate.contains(newURL)) { urlToTreate.add(newURL); 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 bfce0c4..46466ee 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 @@ -203,8 +203,7 @@ public class I18nBundleUtil { try { // on calcule toutes les urls utilisable dans le classloader donnee - List<URL> urlToSeek = new ArrayList<URL>(); - urlToSeek.addAll(Arrays.asList(urls)); + List<URL> urlToSeek = new ArrayList<>(Arrays.asList(urls)); // on va maintenant supprimer toutes les urls qui ne respectent pas // le pattern i18n : il faut que la resource contienne un 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 005f3aa..192129f 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 @@ -76,9 +76,9 @@ public class ClassPathI18nInitializer extends I18nInitializer { public URL[] resolvURLs() throws Exception { // on calcule toutes les urls utilisable dans le classloader donnee - List<URL> urlToSeek = new ArrayList<URL>(); URLClassLoader loader = (URLClassLoader) getLoader(); - urlToSeek.addAll(Arrays.asList(I18nUtil.getDeepURLs(loader))); + URL[] deepURLs = I18nUtil.getDeepURLs(loader); + List<URL> urlToSeek = new ArrayList<>(Arrays.asList(deepURLs)); // on va maintenant supprimer toutes les urls qui ne respectent pas // le pattern i18n : il faut que la resource contienne un repertoire i18n -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.