branch feature/7553-4 created (now 44b61d0)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7553-4 in repository observe. See http://git.codelutin.com/observe.git at 44b61d0 gestion des noeuds de référentiel (refs #7553) This branch includes the following new commits: new 44b61d0 gestion des noeuds de référentiel (refs #7553) The 1 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 44b61d04bcddb87d80282a9f342607ade0ee8b12 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 18:21:50 2015 +0200 gestion des noeuds de référentiel (refs #7553) -- 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 feature/7553-4 in repository observe. See http://git.codelutin.com/observe.git commit 44b61d04bcddb87d80282a9f342607ade0ee8b12 Author: Kevin Morin <morin@codelutin.com> Date: Tue Oct 13 18:21:50 2015 +0200 gestion des noeuds de référentiel (refs #7553) --- .../java/fr/ird/observe/ui/DecoratorService.java | 7 +++ .../observe/ui/content/ContentUIInitializer.java | 2 +- .../ird/observe/ui/content/ContentUIManager.java | 73 +++++++++++----------- .../loadors/ReferenceCommonNodeChildLoador.java | 10 +-- .../loadors/ReferenceLonglineNodeChildLoador.java | 11 ++-- .../loadors/ReferenceSeineNodeChildLoador.java | 12 ++-- 6 files changed, 63 insertions(+), 52 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 1b67a18..d63d690 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 @@ -41,11 +41,13 @@ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.HarbourDto; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.VesselDto; @@ -542,6 +544,8 @@ public class DecoratorService extends DecoratorProvider { String oldCode = l(locale, "observe.common.oldCode3L"); // Species decorator registerDecorator(new SpeciesDecorator(libelle, oldCode)); + registerReferenceDtoDecorator(SpeciesDto.class, + "${faoCode}$s##${scientificLabel}$s##" + oldCode + " ${homeId}$s"); // ObjectObservedSpecies decorator registerDecorator(new ObjectObservedSpeciesDecorator(libelle)); @@ -554,6 +558,9 @@ public class DecoratorService extends DecoratorProvider { // LengthWeightParameter decorator registerDecorator(new LengthWeightParameterDecorator(libelle)); + registerReferenceDtoDecorator(LengthWeightParameterDto.class, + "${gender}$s##${ocean/" + libelle + "}$s##${species/scientificLabel}$s##" + + t("observe.common.lengthWeightFormula") + " ${lengthWeightFormula}$s"); // gps decorators registerJXPathDecorator(ActivitySeineDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index c45535a..978aaab 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -657,7 +657,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E list.putClientProperty("decorator", decorator); // set datas to list and init renderer - list.init((JXPathDecorator<ReferenceDto>) decorator, Collections.<ReferenceDto>emptyList(), Collections.<ReferenceDto>emptyList()); + list.init((JXPathDecorator<ReferenceDto>) decorator, new ArrayList<ReferenceDto>(), new ArrayList<ReferenceDto>()); // get the renderer initialized ListCellRenderer renderer = list.getSelectedList().getCellRenderer(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java index d76bfe2..fdb03c5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIManager.java @@ -30,6 +30,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -59,6 +61,7 @@ import fr.ird.observe.ui.content.open.impl.longline.TripLonglineUI; import fr.ird.observe.ui.content.open.impl.seine.ActivitySeineUI; import fr.ird.observe.ui.content.open.impl.seine.RouteUI; import fr.ird.observe.ui.content.open.impl.seine.TripSeineUI; +import fr.ird.observe.ui.content.ref.ContentReferenceUI; import fr.ird.observe.ui.content.ref.ReferenceHomeUI; import fr.ird.observe.ui.content.table.impl.longline.CatchLonglineUI; import fr.ird.observe.ui.content.table.impl.longline.EncounterUI; @@ -78,6 +81,7 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.CardLayout2; import jaxx.runtime.swing.ErrorDialogUI; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -172,42 +176,41 @@ public class ContentUIManager { // --- Referential --- // //FIXME -// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { -// Class<? extends TopiaEntity> editType = anEnum.getContract(); -// String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl." + editType.getSimpleName() + "UI"; -// Class<?> result; -// try { -// result = Class.forName(fqn); -// addMapping(REFERENCE, editType, null, result); -// } catch (ClassNotFoundException e) { -// throw new IllegalStateException("Could not find " + fqn); -// } -// } - -// for (ObserveEntityEnum anEnum : Entities.REFERENCE_SEINE_ENTITIES_LIST) { -// Class<? extends TopiaEntity> editType = anEnum.getContract(); -// String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.seine." + editType.getSimpleName() + "UI"; -// Class<?> result; -// try { -// result = Class.forName(fqn); -// addMapping(REFERENCE, editType, null, result); -// } catch (ClassNotFoundException e) { -// throw new IllegalStateException("Could not find " + fqn); -// } -// } + for (Class<? extends ReferentialDto> editType : ReferentialDtos.REFERENCE_COMMON_DTOS) { + String simpleName = StringUtils.removeEnd(editType.getSimpleName(), "Dto"); + String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl." + simpleName + "UI"; + Class<?> result; + try { + result = Class.forName(fqn); + addMapping(REFERENCE, editType, null, result); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("Could not find " + fqn); + } + } - //FIXME -// for (ObserveEntityEnum anEnum : Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { -// Class<? extends TopiaEntity> editType = anEnum.getContract(); -// String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.longline." + editType.getSimpleName() + "UI"; -// Class<?> result; -// try { -// result = Class.forName(fqn); -// addMapping(REFERENCE, editType, null, result); -// } catch (ClassNotFoundException e) { -// throw new IllegalStateException("Could not find " + fqn); -// } -// } + for (Class<? extends ReferentialDto> editType : ReferentialDtos.REFERENCE_SEINE_DTOS) { + String simpleName = StringUtils.removeEnd(editType.getSimpleName(), "Dto"); + String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.seine." + simpleName + "UI"; + Class<?> result; + try { + result = Class.forName(fqn); + addMapping(REFERENCE, editType, null, result); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("Could not find " + fqn); + } + } + + for (Class<? extends ReferentialDto> editType : ReferentialDtos.REFERENCE_LONGLINE_DTOS) { + String simpleName = StringUtils.removeEnd(editType.getSimpleName(), "Dto"); + String fqn = ContentReferenceUI.class.getPackage().getName() + ".impl.longline." + simpleName + "UI"; + Class<?> result; + try { + result = Class.forName(fqn); + addMapping(REFERENCE, editType, null, result); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("Could not find " + fqn); + } + } addMapping(REFERENCE, null, ReferenceHomeUI.class); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java index 08e9ae1..05b9821 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceCommonNodeChildLoador.java @@ -22,6 +22,8 @@ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialDtos; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -74,10 +76,9 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); - //FIXME -// for (ObserveEntityEnum anEnum : Entities.REFERENCE_COMMON_ENTITIES_LIST) { -// result.add(anEnum.getContract()); -// } + for (Class<? extends ReferentialDto> referenceCommonDto : ReferentialDtos.REFERENCE_COMMON_DTOS) { + result.add(referenceCommonDto); + } UIHelper.sortReferentiel(result); return result; } @@ -85,7 +86,6 @@ public class ReferenceCommonNodeChildLoador extends AbstractNodeChildLoador<Clas @Override public ObserveNode createNode(Class data, NavDataProvider dataProvider) { - //FIXME ObserveNode result = new ObserveNode( data, data.getSimpleName(), diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java index 91c5968..3c24349 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceLonglineNodeChildLoador.java @@ -22,6 +22,8 @@ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialDtos; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -80,12 +82,11 @@ public class ReferenceLonglineNodeChildLoador extends AbstractNodeChildLoador<Cl NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); - //FIXME -// for (ObserveEntityEnum anEnum : Entities.REFERENCE_LONGLINE_ENTITIES_LIST) { -// result.add(anEnum.getContract()); -// } + for (Class<? extends ReferentialDto> referenceCommonDto : ReferentialDtos.REFERENCE_LONGLINE_DTOS) { + result.add(referenceCommonDto); + } UIHelper.sortReferentiel(result); - return null; + return result; } @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java index a6a4b8e..bb9bc6a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ReferenceSeineNodeChildLoador.java @@ -22,6 +22,8 @@ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialDtos; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.tree.ObserveNode; import jaxx.runtime.swing.nav.NavDataProvider; @@ -72,13 +74,11 @@ public class ReferenceSeineNodeChildLoador extends AbstractNodeChildLoador<Class NavDataProvider dataProvider) { List<Class> result = new ArrayList<Class>(); - //FIXME -// for (ObserveEntityEnum anEnum : Entities.REFERENCE_SEINE_ENTITIES_LIST) { -// result.add(anEnum.getContract()); -// } + for (Class<? extends ReferentialDto> referenceCommonDto : ReferentialDtos.REFERENCE_SEINE_DTOS) { + result.add(referenceCommonDto); + } UIHelper.sortReferentiel(result); - //FIXME - return null; + return result; } @Override -- 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