This is an automated email from the git hooks/post-receive script. New commit to branch feature/6061 in repository tutti. See http://git.codelutin.com/tutti.git commit 0f49e697cbc76c594dce0c103f89b6e4f79cc698 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 12 18:30:59 2016 +0100 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) --- .../service/pupitri/PupitriSpeciesContext.java | 4 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 43 +++++++++++----------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java index 30dbd99..172096e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.service.pupitri; */ import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -31,6 +30,7 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.TreeMap; /** * Pour aggreger toutes les lignes lors d'un import pupitri ayant la même tuple (espece - sorted). @@ -91,7 +91,7 @@ public class PupitriSpeciesContext implements Serializable { public PupitriSpeciesContext(Species species, boolean sorted) { this.species = species; this.sorted = sorted; - this.signs = Maps.newHashMap(); + this.signs = new TreeMap<>(); } public Species getSpecies() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java index e2e0505..53c1539 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/Signs.java @@ -38,7 +38,7 @@ import java.util.Map; */ public enum Signs { - DEFAULT("0") { + MALE("1") { @Override public Integer getCategory() { return PmfmId.SEX.getValue(); @@ -46,45 +46,43 @@ public enum Signs { @Override public Integer getQualitativeValueId() { - return QualitativeValueId.SEX_UNDEFINED.getValue(); + return QualitativeValueId.SEX_MALE.getValue(); } }, - UNSORTED("H") { + FEMALE("2") { @Override public Integer getCategory() { - // special case, there is no cateogry possible here - return null; + return PmfmId.SEX.getValue(); } @Override public Integer getQualitativeValueId() { - // special case, there is no cateogry possible here - return null; + return QualitativeValueId.SEX_FEMALE.getValue(); } }, - MALE("1") { + SMALL("P") { @Override public Integer getCategory() { - return PmfmId.SEX.getValue(); + return PmfmId.SIZE_CATEGORY.getValue(); } @Override public Integer getQualitativeValueId() { - return QualitativeValueId.SEX_MALE.getValue(); + return QualitativeValueId.SIZE_SMALL.getValue(); } }, - FEMALE("2") { + MEDIUM("M") { @Override public Integer getCategory() { - return PmfmId.SEX.getValue(); + return PmfmId.SIZE_CATEGORY.getValue(); } @Override public Integer getQualitativeValueId() { - return QualitativeValueId.SEX_FEMALE.getValue(); + return QualitativeValueId.SIZE_MEDIUM.getValue(); } }, - SMALL("P") { + BIG("G") { @Override public Integer getCategory() { return PmfmId.SIZE_CATEGORY.getValue(); @@ -92,29 +90,32 @@ public enum Signs { @Override public Integer getQualitativeValueId() { - return QualitativeValueId.SIZE_SMALL.getValue(); + return QualitativeValueId.SIZE_BIG.getValue(); } }, - MEDIUM("M") { + + DEFAULT("0") { @Override public Integer getCategory() { - return PmfmId.SIZE_CATEGORY.getValue(); + return PmfmId.SEX.getValue(); } @Override public Integer getQualitativeValueId() { - return QualitativeValueId.SIZE_MEDIUM.getValue(); + return QualitativeValueId.SEX_UNDEFINED.getValue(); } }, - BIG("G") { + UNSORTED("H") { @Override public Integer getCategory() { - return PmfmId.SIZE_CATEGORY.getValue(); + // special case, there is no cateogry possible here + return null; } @Override public Integer getQualitativeValueId() { - return QualitativeValueId.SIZE_BIG.getValue(); + // special case, there is no cateogry possible here + return null; } }, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.