This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6b129ec9e92d2d896e3c07d48b6d5b94997a9cb6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 2 11:13:02 2016 +0100 Ne pas utiliser adagio dans les ui --- .../persistence/entities/referential/Sexs.java | 21 ++++++++++++++++++ .../frequency/SpeciesFrequencyUIHandler.java | 25 ++++++++++------------ 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Sexs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Sexs.java new file mode 100644 index 0000000..6ea6420 --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Sexs.java @@ -0,0 +1,21 @@ +package fr.ifremer.tutti.persistence.entities.referential; + +import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; + +/** + * Created on 02/03/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class Sexs { + + + public static boolean isMale(CaracteristicQualitativeValue caracteristicQualitativeValue) { + return QualitativeValueId.SEX_MALE.getValue().equals(caracteristicQualitativeValue.getIdAsInt()); + } + + public static boolean isFemale(CaracteristicQualitativeValue caracteristicQualitativeValue) { + return QualitativeValueId.SEX_FEMALE.getValue().equals(caracteristicQualitativeValue.getIdAsInt()); + } + +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index defb56e..a353385 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; @@ -36,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.persistence.entities.referential.Sexs; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.TaxonCache; import fr.ifremer.tutti.persistence.entities.referential.TaxonCaches; @@ -663,19 +663,16 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if (optSpeciesProtocol.isPresent()) { SpeciesProtocol speciesProtocol = optSpeciesProtocol.get(); Rtp rtp; - QualitativeValueId sex = - (QualitativeValueId) speciesBatch.getSampleCategoryValue(sexCaracteristic.getIdAsInt()); - if (sex != null) { - - switch (sex) { - case SEX_MALE: - rtp = speciesProtocol.getRtpMale(); - break; - case SEX_FEMALE: - rtp = speciesProtocol.getRtpFemale(); - break; - default: - rtp = speciesProtocol.getRtpUndefined(); + CaracteristicQualitativeValue sampleCategoryValue = (CaracteristicQualitativeValue) speciesBatch.getSampleCategoryValue(sexCaracteristic.getIdAsInt()); + + if (sampleCategoryValue != null) { + + if (Sexs.isMale(sampleCategoryValue)) { + rtp = speciesProtocol.getRtpMale(); + } else if (Sexs.isFemale(sampleCategoryValue)) { + rtp = speciesProtocol.getRtpFemale(); + } else { + rtp = speciesProtocol.getRtpUndefined(); } } else { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.