This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ff316428c0b7dbc7b862c873dbbb8497dbc97cda Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 29 10:50:34 2015 +0200 ajout du DTO pour les utilisateurs de la base PG (refs #7549) --- .../java/fr/ird/observe/services/dto/UserDtos.java | 22 +++++++++++++++++++++ .../ird/observe/services/dto/constants/Role.java | 13 ++++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 36919 -> 38585 bytes .../services/dto/ObserveDtosInitializer.java | 5 +++++ 4 files changed, 40 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/UserDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/UserDtos.java new file mode 100644 index 0000000..215d40c --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/UserDtos.java @@ -0,0 +1,22 @@ +package fr.ird.observe.services.dto; + +import java.util.Comparator; + +public class UserDtos extends AbstractUserDtos { + + protected static UserDtoComparator USER_DTO_COMPARATOR = new UserDtoComparator(); + + public static UserDtoComparator getUserDtoComparator() { + return USER_DTO_COMPARATOR; + } + + protected static class UserDtoComparator implements Comparator<UserDto> { + + @Override + public int compare(UserDto user1, UserDto user2) { + return user1.getName().compareTo(user2.getName()); + } + } + + +} \ No newline at end of file diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/Role.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/Role.java new file mode 100644 index 0000000..896cba6 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/Role.java @@ -0,0 +1,13 @@ +package fr.ird.observe.services.dto.constants; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public enum Role { + + UNUSED, + REFERENTIAL, + USER, + TECHNICAL; + +} diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 346fde6..2bdd1d5 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 4b4c20c..92ec5bd 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -350,6 +350,11 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { // Rien à faire } + @Override + public void initUserDto() { + // Rien à faire + } + // -------------------------------------------------------------------------------------------------------------- // // -- DATA LONGLINE --------------------------------------------------------------------------------------------- // // -------------------------------------------------------------------------------------------------------------- // -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.