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 88bb66c098a1d778054de845350b642b05561e96 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Oct 30 16:26:01 2014 +0100 Suite au remaniement de l'énumération ContactState, il y a eu une inversion entre deux champs (fixes #6039) --- wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java index bb39ebd..b273c0e 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java @@ -74,10 +74,10 @@ public enum ContactState { ImmutableSet.copyOf(values()); protected static final ImmutableSet<ContactState> FINAL_CONTACT_STATES = - ImmutableSet.of(OBSERVATION_CANCELLED, OBSERVATION_CANCELLED_WEATHER, CONTACT_REFUSED, CONTACT_DEFINITELY_REFUSED); + ImmutableSet.of(OBSERVATION_CANCELLED, OBSERVATION_CANCELLED_WEATHER, CONTACT_REFUSED, CONTACT_DEFINITELY_REFUSED, OBSERVATION_DONE); protected static final ImmutableSet<ContactState> UNFINISHED_CONTACT_STATES = - ImmutableSet.of(OBSERVATION_DONE, OBSERVATION_CANCELLED, OBSERVATION_CANCELLED_WEATHER, CONTACT_REFUSED, CONTACT_DEFINITELY_REFUSED); + ImmutableSet.of(OBSERVATION_CANCELLED, OBSERVATION_CANCELLED_WEATHER, CONTACT_REFUSED, CONTACT_DEFINITELY_REFUSED); protected static final ImmutableSetMultimap<ObsProgram, ContactState> ALLOWED_CONTACT_STATES_PER_OBS_PROGRAM = ImmutableSetMultimap.<ObsProgram, ContactState>builder() -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.