This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 57de5a764f631a890dcfcaf70239b42e997d9c72 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:28:50 2015 +0100 On trie les listes d'utilisateurs par nom (fixes #6535) --- .../src/main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 ++++++++++++++++ .../services/service/administration/WaoUsersList.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java index d8b7680..8d00fc7 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java @@ -48,6 +48,14 @@ public class WaoUsers { return new GetOrganisation(); } + public static Comparator<WaoUser> lastNameComparator() { + return Ordering.from(String.CASE_INSENSITIVE_ORDER).onResultOf(getLastName()); + } + + public static Function<WaoUser, String> getLastName() { + return new GetLastName(); + } + protected static class GetLogin implements Function<WaoUser, String> { @Override @@ -71,4 +79,12 @@ public class WaoUsers { return input.getOrganisation(); } } + + protected static class GetLastName implements Function<WaoUser, String> { + + @Override + public String apply(WaoUser input) { + return input.getLastName(); + } + } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java index aeab72d..83e90a0 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java @@ -44,7 +44,7 @@ public class WaoUsersList { public WaoUsersList(Organisation organisation, Collection<WaoUser> waoUsers) { this.organisation = organisation; - this.waoUsers = ImmutableSortedSet.orderedBy(WaoUsers.loginComparator()).addAll(waoUsers).build(); + this.waoUsers = ImmutableSortedSet.orderedBy(WaoUsers.lastNameComparator()).addAll(waoUsers).build(); } public Organisation getOrganisation() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.