branch develop updated (0b44104 -> 47f5ab6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 0b44104 optimize dependencies new ff377b1 Ajout de la propriété Program#gearTypePrefix (See #7701) new 69f9ba8 Ajout du gearTypePrefix dans la décoration des programmes (See #7701) new c7844b6 Correction de l'algorithme de transformation des propriétés Entity <-> Dto new f9dd0a6 Correction du test sur les marées de type seine new 47f5ab6 Faire paraitre le type de marée dans le nom du programme (termine #7701) Merge branch 'feature/7701' into develop The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 47f5ab650efbaeb913f2ea7eff34db05308f9648 Merge: 0b44104 f9dd0a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:35 2015 +0100 Faire paraitre le type de marée dans le nom du programme (termine #7701) Merge branch 'feature/7701' into develop commit f9dd0a60f86467d5a5b461131f602c9fc4b3ca9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:25 2015 +0100 Correction du test sur les marées de type seine commit c7844b60d94eadadeb1171dd133b3e605289aa1d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:02 2015 +0100 Correction de l'algorithme de transformation des propriétés Entity <-> Dto commit 69f9ba8bc9ced2467c40feb039589cac2efb1bfd Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:54:03 2015 +0100 Ajout du gearTypePrefix dans la décoration des programmes (See #7701) commit ff377b1883de70f9449f689633a1c5793a1c82f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:53:33 2015 +0100 Ajout de la propriété Program#gearTypePrefix (See #7701) Summary of changes: .../java/fr/ird/observe/ui/DecoratorService.java | 4 +- .../ird/observe/entities/constants/GearType.java | 16 ++++++- .../observe/entities/referentiel/ProgramImpl.java | 20 ++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 37033 -> 37617 bytes .../observe/services/dto/constants/GearType.java | 16 ++++++- .../services/dto/referential/ProgramDto.java | 18 +++++++ .../services/builder/DtoToEntityBuilder.java | 12 +++++ .../services/dto/ObserveDtosInitializer.java | 15 ++++++ .../service/seine/TripSeineServiceTopiaTest.java | 52 ++++++++++----------- 9 files changed, 119 insertions(+), 34 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 ff377b1883de70f9449f689633a1c5793a1c82f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:53:33 2015 +0100 Ajout de la propriété Program#gearTypePrefix (See #7701) --- .../fr/ird/observe/entities/constants/GearType.java | 16 ++++++++++++++-- .../observe/entities/referentiel/ProgramImpl.java | 20 ++++++++++++++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 37033 -> 37617 bytes .../observe/services/dto/constants/GearType.java | 16 ++++++++++++++-- .../services/dto/referential/ProgramDto.java | 18 ++++++++++++++++++ 5 files changed, 66 insertions(+), 4 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java index 01a2a49..d221da3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/GearType.java @@ -34,10 +34,20 @@ import static org.nuiton.i18n.I18n.t; public enum GearType { /** Seine */ - seine(n("observe.reference.gearType.seine")), + seine(n("observe.reference.gearType.seine")) { + @Override + public String getPrefix() { + return "PS"; + } + }, /** Longline */ - longline(n("observe.reference.gearType.longline")); + longline(n("observe.reference.gearType.longline")) { + @Override + public String getPrefix() { + return "LL"; + } + }; private String i18nKey; @@ -64,4 +74,6 @@ public enum GearType { } return result; } + + public abstract String getPrefix(); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java new file mode 100644 index 0000000..0d7f9dc --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java @@ -0,0 +1,20 @@ +package fr.ird.observe.entities.referentiel; + +public class ProgramImpl extends ProgramAbstract { + + private static final long serialVersionUID = 3546129729498396258L; + + @Override + public String getGearTypePrefix() { + + String result = gearType==null?null:gearType.getPrefix(); + return result; + + } + + // Nécessaire pour les binders, mais non utilisé2 + @Override + public void setGearTypePrefix(String gearTypePrefix) { + + } +} diff --git a/observe-entities/src/main/xmi/observe-common.zargo b/observe-entities/src/main/xmi/observe-common.zargo index aadf6fe..c472cb6 100644 Binary files a/observe-entities/src/main/xmi/observe-common.zargo and b/observe-entities/src/main/xmi/observe-common.zargo differ diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java index f32ddd8..a7ec1a6 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java @@ -31,10 +31,20 @@ package fr.ird.observe.services.dto.constants; public enum GearType { /** Seine */ - seine, + seine { + @Override + public String getPrefix() { + return "PS"; + } + }, /** Longline */ - longline; + longline { + @Override + public String getPrefix() { + return "LL"; + } + }; public static GearType fromOrdinal(int ordinal) { @@ -47,4 +57,6 @@ public enum GearType { return result; } + public abstract String getPrefix(); + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java new file mode 100644 index 0000000..0ed59d8 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDto.java @@ -0,0 +1,18 @@ +package fr.ird.observe.services.dto.referential; + +public class ProgramDto extends AbstractProgramDto { + + private static final long serialVersionUID = 1L; + + public static final String PROPERTY_GEAR_TYPE_PREFIX = "gearTypePrefix"; + + public String getGearTypePrefix() { + + String result = gearType == null ? null : gearType.getPrefix(); + return result; + + } + + // Nécessaire pour les binders, mais non utilisé2 + public void setGearTypePrefix(String gearTypePrefix) {} +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 69f9ba8bc9ced2467c40feb039589cac2efb1bfd Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:54:03 2015 +0100 Ajout du gearTypePrefix dans la décoration des programmes (See #7701) --- .../src/main/java/fr/ird/observe/ui/DecoratorService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index dec2413..a20f590 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -419,8 +419,8 @@ public class DecoratorService extends DecoratorProvider { String libelle = referentialLocale.getLibelle(); registerReferenceDtoDecorator(ProgramDto.class, - t("observe.common.program") + " ${" + libelle + "}$s", - t("observe.common.program") + " ${label}$s"); + "[${gearTypePrefix}$s] " + t("observe.common.program") + " ${" + libelle + "}$s", + "[${gearTypePrefix}$s] " + t("observe.common.program") + " ${label}$s"); registerReferenceDtoDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerReferenceDtoDecorator(ActivitySeineDto.class, "${time}$tH:%1$tM##${vesselActivitySeine/label}$s", -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 c7844b60d94eadadeb1171dd133b3e605289aa1d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:02 2015 +0100 Correction de l'algorithme de transformation des propriétés Entity <-> Dto --- .../ird/observe/services/builder/DtoToEntityBuilder.java | 12 ++++++++++++ .../ird/observe/services/dto/ObserveDtosInitializer.java | 15 +++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java index d80a253..4fc9ea9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java @@ -22,12 +22,14 @@ package fr.ird.observe.services.builder; * #L% */ +import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.reflect.TypeToken; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDtoBinders; +import fr.ird.observe.services.dto.ObserveDtosInitializer; import fr.ird.observe.services.dto.ReferenceDto; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaEntity; @@ -185,6 +187,8 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen } + propertyValue = transform(propertyValue); + // simple property addProperty(propertyName, propertyValue, entityProperties); @@ -258,4 +262,12 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen entitiesProperties.put(propertyName, propertyValue); } + + protected static Object transform(Object propertyValue) { + Function function = ObserveDtosInitializer.getDtoToEntityFunction(propertyValue); + if (function != null) { + propertyValue = function.apply(propertyValue); + } + return propertyValue; + } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 7714707..96eecd4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -327,6 +327,21 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { return function; } + public static Function getDtoToEntityFunction(Object propertyValue) { + Function function = null; + if (propertyValue!=null) { + for (Map.Entry<Class, Function> entry : DTO_TO_ENTITY_FUNCTIONS.entrySet()) { + Class type = entry.getKey(); + + if (type.isAssignableFrom(propertyValue.getClass())) { + function = entry.getValue(); + break; + } + } + } + return function; + } + @Override public void start() { DTO_TO_ENTITY_TYPE_BUILDER = new ImmutableMap.Builder<>(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 f9dd0a60f86467d5a5b461131f602c9fc4b3ca9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:25 2015 +0100 Correction du test sur les marées de type seine --- .../service/seine/TripSeineServiceTopiaTest.java | 52 ++++++++++------------ 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index c79d232..2628c00 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -22,17 +22,20 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceContextTopiaTaiste; import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -45,7 +48,6 @@ import org.junit.Test; import org.nuiton.util.DateUtil; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.Set; @@ -143,14 +145,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(PersonDto.class)); - Assert.assertTrue(types.contains(VesselDto.class)); - Assert.assertTrue(types.contains(OceanDto.class)); - Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 7); + assertTripFormLabels(formDto); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -184,14 +179,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertEquals(tripSeine.getComment(), tripSeineDto.getComment()); Assert.assertEquals(tripSeine.getLastUpdate(), tripSeineDto.getLastUpdate()); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(PersonDto.class)); - Assert.assertTrue(types.contains(VesselDto.class)); - Assert.assertTrue(types.contains(OceanDto.class)); - Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 7); + assertTripFormLabels(formDto); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -223,14 +211,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNull(tripSeineDto.getComment()); Assert.assertNull(tripSeineDto.getLastUpdate()); - Assert.assertNotNull(formDto.getLabels()); - - Collection<Class> types = Collections2.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction()); - Assert.assertTrue(types.contains(PersonDto.class)); - Assert.assertTrue(types.contains(VesselDto.class)); - Assert.assertTrue(types.contains(OceanDto.class)); - Assert.assertTrue(types.contains(HarbourDto.class)); - Assert.assertEquals(formDto.sizeLabels(), 7); + assertTripFormLabels(formDto); for (ReferenceSetDto referenceSetDto : formDto.getLabels()) { @@ -298,8 +279,6 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNotEquals(lastUpdateBefore, lastUpdateAfter); } - - @Test public void saveUpdateTest() { @@ -356,6 +335,8 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } + + @Test(expected = ConcurrentModificationException.class) public void saveConcurrentTest() { @@ -403,5 +384,20 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } + protected <T extends IdDto> void assertTripFormLabels(FormDto<T> formDto) { + + Assert.assertNotNull(formDto.getLabels()); + + Set<Class> types = Sets.newLinkedHashSet(Iterables.transform(formDto.getLabels(), ReferenceSetDtos.getTypeFunction())); + Assert.assertTrue(types.contains(PersonDto.class)); + Assert.assertTrue(types.contains(VesselDto.class)); + Assert.assertTrue(types.contains(OceanDto.class)); + Assert.assertTrue(types.contains(HarbourDto.class)); + Assert.assertTrue(types.contains(ProgramDto.class)); + Assert.assertEquals(5, types.size()); + Assert.assertEquals(8, formDto.sizeLabels()); + + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 47f5ab650efbaeb913f2ea7eff34db05308f9648 Merge: 0b44104 f9dd0a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:35 2015 +0100 Faire paraitre le type de marée dans le nom du programme (termine #7701) Merge branch 'feature/7701' into develop .../java/fr/ird/observe/ui/DecoratorService.java | 4 +- .../ird/observe/entities/constants/GearType.java | 16 ++++++- .../observe/entities/referentiel/ProgramImpl.java | 20 ++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 37033 -> 37617 bytes .../observe/services/dto/constants/GearType.java | 16 ++++++- .../services/dto/referential/ProgramDto.java | 18 +++++++ .../services/builder/DtoToEntityBuilder.java | 12 +++++ .../services/dto/ObserveDtosInitializer.java | 15 ++++++ .../service/seine/TripSeineServiceTopiaTest.java | 52 ++++++++++----------- 9 files changed, 119 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm