This is an automated email from the git hooks/post-receive script. New commit to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git commit 799b75f9749066eed9d90144212120381dc40eea Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 11 18:11:30 2016 +0100 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) --- .../service/pupitri/PupitriSpeciesContext.java | 29 +++++++++++++++++++--- 1 file changed, 25 insertions(+), 4 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..c87d6da 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 @@ -145,7 +145,7 @@ public class PupitriSpeciesContext implements Serializable { public void addToSignContext(Signs sign, BoxType boxType, Float weight) { - PupitriSignContext signContext = getOrCreateSignContext(sign); + PupitriSignContext signContext = getOrCreateSignContext(sign, true); signContext.addWeight(weight); switch (boxType) { case SMALL: @@ -161,7 +161,7 @@ public class PupitriSpeciesContext implements Serializable { public void setMelagElevatedWeight(Signs melagElevatedSign, Float weight) { PupitriSignContext melagContext = getSignContext(Signs.MELAG); - PupitriSignContext pupitriSignContext = getOrCreateSignContext(melagElevatedSign); + PupitriSignContext pupitriSignContext = getOrCreateSignContext(melagElevatedSign, true); pupitriSignContext.addWeight(weight); //FIXME Check this??? pupitriSignContext.addNbBoxs(melagContext); @@ -175,7 +175,7 @@ public class PupitriSpeciesContext implements Serializable { PupitriSignContext melagContext = getSignContext(Signs.MELAG); - PupitriSignContext defaultSignContext = getOrCreateSignContext(Signs.DEFAULT); + PupitriSignContext defaultSignContext = getOrCreateSignContext(Signs.DEFAULT, true); defaultSignContext.addWeight(melagContext.getWeight()); //FIXME Check this??? defaultSignContext.addNbBoxs(melagContext); @@ -273,12 +273,33 @@ public class PupitriSpeciesContext implements Serializable { return signs.get(sign); } - private PupitriSignContext getOrCreateSignContext(Signs sign) { + private PupitriSignContext getOrCreateSignContext(Signs sign, boolean createOtherCategorySigns) { PupitriSignContext signContext = getSignContext(sign); if (signContext == null) { signContext = new PupitriSignContext(sign); signs.put(sign, signContext); } + + if (createOtherCategorySigns) { + // cf #6116 + + switch (sign) { + case MALE: + getOrCreateSignContext(Signs.FEMALE, false); + break; + case FEMALE: + getOrCreateSignContext(Signs.MALE, false); + break; + case BIG: + getOrCreateSignContext(Signs.SMALL, false); + break; + case SMALL: + getOrCreateSignContext(Signs.BIG, false); + break; + + } + } + return signContext; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.