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 96578ad25d0a6ca99938db41d2c6b2f26a97dcea Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 10:05:37 2015 +0200 Ajout de décorateurs sur les entités --- .../referentiel/I18nReferenceEntities.java | 23 ++++++++++++++++++ .../ird/observe/entities/referentiel/Species2.java | 25 +++++++++++++++++++ .../ird/observe/entities/seine/ActivitySeines.java | 9 +++++++ .../fr/ird/observe/entities/seine/TripSeines.java | 28 ++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java new file mode 100644 index 0000000..c1c2f18 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java @@ -0,0 +1,23 @@ +package fr.ird.observe.entities.referentiel; + +import fr.ird.observe.entities.constants.ReferenceLocale; + +/** + * Created on 29/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class I18nReferenceEntities { + + public static <E extends I18nReferenceEntity> String decorate(ReferenceLocale referenceLocale, E i18nReferenceEntitiy) { + + StringBuilder builder = new StringBuilder(); + + builder.append(i18nReferenceEntitiy.getCode()); + builder.append(" - ").append(referenceLocale.getLabel(i18nReferenceEntitiy)); + + return builder.toString(); + + } + +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java index f24bdec..0e5ec3e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java @@ -30,8 +30,11 @@ import fr.ird.observe.entities.referentiel.seine.WeightCategory; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Set; +import static org.nuiton.i18n.I18n.l; + /** * Helper class around {@link Species}. * @@ -52,6 +55,7 @@ public class Species2 { final Ocean ocean) { return Lists.newArrayList(Iterables.filter(speciess, new Predicate<E>() { + @Override public boolean apply(E input) { return input.getOcean().contains(ocean); @@ -63,6 +67,7 @@ public class Species2 { final Set<String> speciesIds) { return Lists.newArrayList(Iterables.filter(speciess, new Predicate<WeightCategory>() { + @Override public boolean apply(WeightCategory input) { return speciesIds.contains(input.getSpecies().getTopiaId()); @@ -74,6 +79,7 @@ public class Species2 { final Ocean ocean) { return Lists.newArrayList(Iterables.filter(speciess, new Predicate<WeightCategory>() { + @Override public boolean apply(WeightCategory input) { return input.getSpecies().getOcean().contains(ocean); @@ -81,6 +87,24 @@ public class Species2 { })); } + public static String decorate(Locale locale, Species species) { + + String oldCode = l(locale, "observe.persistence.oldCode3L"); + StringBuilder builder = new StringBuilder(); + builder.append(species.getFaoCode()); + if (species.getScientificLabel() == null) { + builder.append(" - ").append("xx"); + + } else { + builder.append(" - ").append(species.getScientificLabel()); + } + builder.append(" - ").append(oldCode); + builder.append(" - ").append(species.getHomeId()); + + return builder.toString(); + + } + public static List<Species> toSpecies(Collection<WeightCategory> categories) { Set<Species> result = Sets.newHashSet(); @@ -92,6 +116,7 @@ public class Species2 { } private static class SpeciesByIdPredicate implements Predicate<Species> { + private final Set<String> ids; public SpeciesByIdPredicate(Set<String> ids) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java index a3dcd99..a48ced4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java @@ -22,6 +22,7 @@ package fr.ird.observe.entities.seine; * #L% */ +import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import org.apache.commons.logging.Log; @@ -56,6 +57,14 @@ public class ActivitySeines { /** Logger. */ private static final Log log = LogFactory.getLog(ActivitySeines.class); + public static String decorate(ReferenceLocale referenceLocale, ActivitySeine activitySeine) { + + return String.format("%1$tH:%1$tM", activitySeine.getTime()) + + " - " + + referenceLocale.getLabel(activitySeine.getVesselActivitySeine()); + + } + public static ActivitySeine getPreviousActivity(List<ActivitySeine> activitySeines, ActivitySeine activitySeine) { if (activitySeine == null) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java new file mode 100644 index 0000000..3c2a10a --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java @@ -0,0 +1,28 @@ +package fr.ird.observe.entities.seine; + +import fr.ird.observe.entities.constants.ReferenceLocale; +import fr.ird.observe.entities.referentiel.Person; + +/** + * Created on 29/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class TripSeines { + + public static String decorate(ReferenceLocale referenceLocale, TripSeine tripSeine) { + + StringBuilder builder = new StringBuilder(); + + builder.append(String.format("%1$td/%1$tm/%1$tY", tripSeine.getStartDate())); + builder.append(" - ").append(String.format("%1$td/%1$tm/%1$tY", tripSeine.getEndDate())); + builder.append(" - ").append(referenceLocale.getLabel(tripSeine.getVessel())); + + Person observer = tripSeine.getObserver(); + builder.append(" - ").append(observer == null ? "" : observer.getLastName() + " " + observer.getFirstName()); + + return builder.toString(); + + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.