branch feature/refactor_reference updated (19a0f2e -> 163a4e6)
This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git from 19a0f2e Revue de code sur la date de mise à jour des objets : toute donnée modifiée doit retourner une date de mise à jour à réimpacter dans les ui (première passe, mais ce n'est pas fini, il faut bien vérifier que dans l'application swing ça va être cohérent) new 163a4e6 Chargement des référentiels dans les modèles des écrans de l'application swing 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 163a4e66c1df259a577f296dd2728c7f97a12ae6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 29 19:58:22 2015 +0100 Chargement des référentiels dans les modèles des écrans de l'application swing Summary of changes: .../ird/observe/ui/content/ContentUIHandler.java | 18 ++--- .../fr/ird/observe/ui/content/ContentUIModel.java | 78 ++++++++++++---------- .../impl/longline/SetLonglineUIHandler.java | 2 + .../ActivitySeineObservedSystemUIHandler.java | 3 + ...ngObjectTransmittingBuoyOperationUIHandler.java | 1 + .../impl/seine/FloatingObjectUIHandler.java | 1 + .../ui/content/impl/seine/SetSeineUIHandler.java | 2 + .../impl/longline/ActivityLonglinesUIHandler.java | 1 + .../list/impl/longline/TripLonglinesUIHandler.java | 7 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 7 +- .../content/list/impl/seine/RoutesUIHandler.java | 7 +- .../list/impl/seine/TripSeinesUIHandler.java | 7 +- .../impl/longline/ActivityLonglineUIHandler.java | 3 + .../open/impl/longline/TripLonglineUIHandler.java | 3 + .../open/impl/seine/ActivitySeineUIHandler.java | 3 + .../ui/content/open/impl/seine/RouteUIHandler.java | 3 + .../open/impl/seine/TripSeineUIHandler.java | 3 + .../ui/content/ref/ContentReferenceUIHandler.java | 3 + .../ui/content/table/ContentTableUIHandler.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 15 +++-- .../table/impl/longline/EncounterUIHandler.java | 2 + .../longline/GearUseFeaturesLonglineUIHandler.java | 1 + .../table/impl/longline/SensorUsedUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 14 ++-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 1 + .../table/impl/seine/NonTargetCatchUIHandler.java | 3 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 3 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 1 + .../impl/seine/ObjectSchoolEstimateUIHandler.java | 1 + .../table/impl/seine/SchoolEstimateUIHandler.java | 3 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 11 ++- .../table/impl/seine/TargetSampleUIHandler.java | 1 + 33 files changed, 137 insertions(+), 81 deletions(-) -- 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/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 163a4e66c1df259a577f296dd2728c7f97a12ae6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 29 19:58:22 2015 +0100 Chargement des référentiels dans les modèles des écrans de l'application swing --- .../ird/observe/ui/content/ContentUIHandler.java | 18 ++--- .../fr/ird/observe/ui/content/ContentUIModel.java | 78 ++++++++++++---------- .../impl/longline/SetLonglineUIHandler.java | 2 + .../ActivitySeineObservedSystemUIHandler.java | 3 + ...ngObjectTransmittingBuoyOperationUIHandler.java | 1 + .../impl/seine/FloatingObjectUIHandler.java | 1 + .../ui/content/impl/seine/SetSeineUIHandler.java | 2 + .../impl/longline/ActivityLonglinesUIHandler.java | 1 + .../list/impl/longline/TripLonglinesUIHandler.java | 7 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 7 +- .../content/list/impl/seine/RoutesUIHandler.java | 7 +- .../list/impl/seine/TripSeinesUIHandler.java | 7 +- .../impl/longline/ActivityLonglineUIHandler.java | 3 + .../open/impl/longline/TripLonglineUIHandler.java | 3 + .../open/impl/seine/ActivitySeineUIHandler.java | 3 + .../ui/content/open/impl/seine/RouteUIHandler.java | 3 + .../open/impl/seine/TripSeineUIHandler.java | 3 + .../ui/content/ref/ContentReferenceUIHandler.java | 3 + .../ui/content/table/ContentTableUIHandler.java | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 15 +++-- .../table/impl/longline/EncounterUIHandler.java | 2 + .../longline/GearUseFeaturesLonglineUIHandler.java | 1 + .../table/impl/longline/SensorUsedUIHandler.java | 1 + .../content/table/impl/longline/TdrUIHandler.java | 14 ++-- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 1 + .../table/impl/seine/NonTargetCatchUIHandler.java | 3 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 3 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 1 + .../impl/seine/ObjectSchoolEstimateUIHandler.java | 1 + .../table/impl/seine/SchoolEstimateUIHandler.java | 3 +- .../table/impl/seine/TargetCatchUIHandler.java | 5 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 11 ++- .../table/impl/seine/TargetSampleUIHandler.java | 1 + 33 files changed, 137 insertions(+), 81 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index a0bd09a..0e10462 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -556,9 +556,9 @@ public abstract class ContentUIHandler<E extends IdDto> { String propertyName = propertyDefinition.getName(); ReferentialReferenceSet referentialReferenceSet = referentialReferenceSetsByType.get(propertyDefinition.getType()); - ReferentialReferenceSet filtredReferentialReferenceSet = filtredReferentialReferenceSet(propertyDefinition, referentialReferenceSet); + ReferentialReferenceSet filteredReferentialReferenceSet = filtredReferentialReferenceSet(propertyDefinition, referentialReferenceSet); - modelReferentialReferenceSets.put(propertyName, filtredReferentialReferenceSet); + modelReferentialReferenceSets.put(propertyName, filteredReferentialReferenceSet); } @@ -880,7 +880,7 @@ public abstract class ContentUIHandler<E extends IdDto> { data = Collections.emptyList(); } else { - Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(dtoClass, list.getModel().getProperty()); + Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(list.getModel().getProperty()); data = new ArrayList<>(referenceSetDto); } @@ -905,7 +905,7 @@ public abstract class ContentUIHandler<E extends IdDto> { data = Collections.emptyList(); } else { - Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(dtoClass, list.getModel().getProperty()); + Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(list.getModel().getProperty()); data = new ArrayList<>(referenceSetDto); } @@ -930,7 +930,7 @@ public abstract class ContentUIHandler<E extends IdDto> { data = Collections.emptyList(); } else { - Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(dtoClass, list.getName()); + Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(list.getName()); data = new ArrayList<>(referenceSetDto); } @@ -952,7 +952,7 @@ public abstract class ContentUIHandler<E extends IdDto> { data = Collections.emptyList(); } else { - Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(dtoClass, list.getName()); + Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(list.getName()); data = new ArrayList<>(referenceSetDto); } @@ -982,7 +982,7 @@ public abstract class ContentUIHandler<E extends IdDto> { } else { - Optional<Set<ReferentialReference<R>>> optionalReferenceSetDto = getModel().tryToGetReferentialReferenceSet(dtoClass, propertyName); + Optional<Set<ReferentialReference<R>>> optionalReferenceSetDto = getModel().tryToGetReferentialReferenceSet(propertyName); if (optionalReferenceSetDto.isPresent()) { @@ -990,7 +990,9 @@ public abstract class ContentUIHandler<E extends IdDto> { data = Lists.newArrayList(references); } else { + data = Collections.emptyList(); + } } @@ -1019,7 +1021,7 @@ public abstract class ContentUIHandler<E extends IdDto> { } else { - Optional<Set<DataReference<R>>> optionalReferenceSetDto = getModel().tryToGetDataReferenceSet(dtoClass, propertyName); + Optional<Set<DataReference<R>>> optionalReferenceSetDto = getModel().tryToGetDataReferenceSet(propertyName); if (optionalReferenceSetDto.isPresent()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index b8d0a20..bcfbb0c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -77,9 +77,6 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab protected final Class<E> beanType; - //FIXME -// protected TopiaEntityBinder<E> loadBinder; - protected Form<E> form; protected E bean; @@ -98,7 +95,15 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab protected boolean canWrite; - private ImmutableMap<String, ReferentialReferenceSet<?>> referentialReferenceSetsByPropertyName; + /** + * Les référentiels qu'on peut utiliser, ils sont chargés depuis le cache des référentiels et peuvent être filtrés. + */ + protected ImmutableMap<String, ReferentialReferenceSet<?>> referentialReferenceSetsByPropertyName; + + /** + * Les données métier qu'on peut utiliser. + */ + protected ImmutableMap<String, DataReferenceSet<?>> dataReferenceSetsByPropertyName; public static <E extends IdDto> ContentUIModel<E> newModel(ObserveContentUI<E> ui) { @@ -252,42 +257,30 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab firePropertyChange(PROPERTY_CAN_WRITE, oldValue, canWrite); } - public <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(Class<D> type, String name) { - - //FIXME A mettre dans ce modèle -// ReferenceSetDto<D> referenceSetDto1 = formDto.getReferenceSetDto(type, name); -// LinkedHashSet<ReferentialReference<D>> reference = (LinkedHashSet) referenceSetDto1.getReferences(); -// return reference; - return null; - - } - - public <D extends DataDto> Set<DataReference<D>> getDataReferences(Class<D> type, String name) { + public <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(String name) { - //FIXME A mettre dans ce modèle -// ReferenceSetDto<D> referenceSetDto1 = formDto.getReferenceSetDto(type, name); -// LinkedHashSet<ReferentialReference<D>> reference = (LinkedHashSet) referenceSetDto1.getReferences(); -// return reference; - return null; + ReferentialReferenceSet<D> referentialReferenceSet = getReferentialReferenceSet(name); + Set<ReferentialReference<D>> references =referentialReferenceSet.getReferences(); + return references; } - public <D extends DataDto> DataReferenceSet<D> getDataReferenceSet(Class<D> type, String name) { + public <D extends DataDto> Set<DataReference<D>> getDataReferences(String name) { - //FIXME A mettre dans ce modèle -// ReferenceSetDto<D> referenceSetDto = formDto.getReferenceSetDto(type, name); -// return referenceSetDto; - return null; + DataReferenceSet<D> referentialReferenceSet = getDataReferenceSet(name); + Set<DataReference<D>> references =referentialReferenceSet.getReferences(); + return references; } - public <D extends ReferentialDto> ReferentialReference<D> getReferentialReferenceById(Class<D> type, String name, String id) { + public <D extends ReferentialDto> ReferentialReference<D> getReferentialReferenceById(String name, String id) { - ReferentialReferenceSet<D> referentialReferenceSet = getReferentialReferenceSet(name); + ReferentialReferenceSet<D> referenceSet = getReferentialReferenceSet(name); + //FIXME Doit-on interdire la nullité ? ReferentialReference<D> reference = null; - if (referentialReferenceSet != null) { - reference = referentialReferenceSet.getReferenceById(id); + if (referenceSet != null) { + reference = referenceSet.getReferenceById(id); } return reference; @@ -297,16 +290,24 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab this.referentialReferenceSetsByPropertyName = referentialReferenceSetsByPropertyName; } - protected <R extends DataDto> Optional<Set<DataReference<R>>> tryToGetDataReferenceSet(Class<R> dtoClass, String propertyName) { - //FIXME A mettre dans ce modèle - return null; + public void setDataReferenceSetsByPropertyName(ImmutableMap<String, DataReferenceSet<?>> dataReferenceSetsByPropertyName) { + this.dataReferenceSetsByPropertyName = dataReferenceSetsByPropertyName; } - protected <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(Class<R> dtoClass, String propertyName) { - ReferentialReferenceSet<R> referentialReferenceSet = getReferentialReferenceSet(propertyName); + protected <R extends DataDto> Optional<Set<DataReference<R>>> tryToGetDataReferenceSet(String propertyName) { + DataReferenceSet<R> referenceSet = getDataReferenceSet(propertyName); + Set<DataReference<R>> references = null; + if (referenceSet != null) { + references = referenceSet.getReferences(); + } + return Optional.fromNullable(references); + } + + protected <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(String propertyName) { + ReferentialReferenceSet<R> referenceSet = getReferentialReferenceSet(propertyName); Set<ReferentialReference<R>> references = null; - if (referentialReferenceSet != null) { - references = referentialReferenceSet.getReferences(); + if (referenceSet != null) { + references = referenceSet.getReferences(); } return Optional.fromNullable(references); } @@ -318,4 +319,9 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab private <R extends ReferentialDto> ReferentialReferenceSet<R> getReferentialReferenceSet(String propertyName) { return (ReferentialReferenceSet<R>) referentialReferenceSetsByPropertyName.get(propertyName); } + + public <R extends DataDto> DataReferenceSet<R> getDataReferenceSet(String propertyName) { + return (DataReferenceSet<R>) dataReferenceSetsByPropertyName.get(propertyName); + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 40f213c..0cb1c5b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -227,6 +227,8 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); SetLonglineDtos.copySetLonglineDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java index dd90b56..4c0f636 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java @@ -90,6 +90,9 @@ public class ActivitySeineObservedSystemUIHandler extends ContentUIHandler<Activ getModel().setMode(mode); Form<ActivitySeineObservedSystemDto> form = getActivitySeineObservedSystemService().loadForm(activityId); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); ActivitySeineObservedSystemDtos.copyActivitySeineObservedSystemDto(form.getObject(), getBean()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index a7bf8bf..868b258 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -121,6 +121,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH getModel().setEditing(false); Form<FloatingObjectTransmittingBuoyDto> form = getTransmittingBuoyOperationService().loadForm(dcpId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); FloatingObjectTransmittingBuoyDtos.copyFloatingObjectTransmittingBuoyDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index e0a2f4e..79dbee5 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -123,6 +123,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> form = getFloatingObjectService().loadForm(dcpId); } + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); FloatingObjectDtos.copyFloatingObjectDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 837453b..6f8cfa9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -185,6 +185,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { // utilisation du mode requis setContentMode(mode); + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); SetSeineDtos.copySetSeineDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 62ff0cb..58a240f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -131,6 +131,7 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin protected void loadParentBean() { TripLonglineService service = getDataSource().newService(TripLonglineService.class); Form<TripLonglineDto> form = service.loadForm(getSelectedParentId()); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TripLonglineDtos.copyTripLonglineDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java index d69a402..fb4ab20 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -112,9 +112,10 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected void loadParentBean() { ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - Form<ProgramDto> programDtoForm = service.loadForm(ProgramDto.class, getSelectedParentId()); - getModel().setForm(programDtoForm); - ProgramDtos.copyProgramDto(programDtoForm.getObject(), getBean()); + Form<ProgramDto> form = service.loadForm(ProgramDto.class, getSelectedParentId()); + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); + ProgramDtos.copyProgramDto(form.getObject(), getBean()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index 5121191..a4bbf3c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -127,8 +127,9 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti @Override protected void loadParentBean() { RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); - Form<RouteDto> routeDtoForm = service.loadForm(getSelectedParentId()); - getModel().setForm(routeDtoForm); - RouteDtos.copyRouteDto(routeDtoForm.getObject(), getBean()); + Form<RouteDto> form = service.loadForm(getSelectedParentId()); + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); + RouteDtos.copyRouteDto(form.getObject(), getBean()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java index e569cac..f5462e1 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/RoutesUIHandler.java @@ -125,8 +125,9 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto @Override protected void loadParentBean() { TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); - Form<TripSeineDto> tripSeineDtoForm = service.loadForm(getSelectedParentId()); - getModel().setForm(tripSeineDtoForm); - TripSeineDtos.copyTripSeineDto(tripSeineDtoForm.getObject(), getBean()); + Form<TripSeineDto> form = service.loadForm(getSelectedParentId()); + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); + TripSeineDtos.copyTripSeineDto(form.getObject(), getBean()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java index 1dbf48f..85442e6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -110,8 +110,9 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected void loadParentBean() { ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - Form<ProgramDto> programDtoForm = service.loadForm(ProgramDto.class, getSelectedParentId()); - getModel().setForm(programDtoForm); - ProgramDtos.copyProgramDto(programDtoForm.getObject(), getBean()); + Form<ProgramDto> form = service.loadForm(ProgramDto.class, getSelectedParentId()); + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); + ProgramDtos.copyProgramDto(form.getObject(), getBean()); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 34ae2f0..b08d35f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -186,6 +186,9 @@ public class ActivityLonglineUIHandler extends ContentOpenableUIHandler<Activity } setContentMode(mode); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); ActivityLonglineDtos.copyActivityLonglineDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index e5a845b..81ccf7d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -174,6 +174,9 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline } setContentMode(mode); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); TripLonglineDtos.copyTripLonglineDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 5f003f1..010f48c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -213,6 +213,9 @@ public class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySei } setContentMode(mode); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); ActivitySeineDtos.copyActivitySeineDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index 3b314d6..d8ca426 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -146,6 +146,9 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } setContentMode(mode); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); RouteDtos.copyRouteDto(form.getObject(), editBean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index 63f6280..3ba0763 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -171,6 +171,9 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } setContentMode(mode); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); TripSeineDtos.copyTripSeineDto(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index dba5d4b..6f1015a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -540,6 +540,9 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content // creation mode Form<E> form = getReferentialService().preCreate(getBeanType()); + + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); copyIntoBean(form.getObject(), bean); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index 8572f1a..8312d2d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -463,7 +463,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex } else { speciesId = ((ReferentialReference<?>) ref).getId(); } - return getModel().getReferentialReferenceById(SpeciesDto.class, TargetCatchDto.PROPERTY_SPECIES, speciesId); + return getModel().getReferentialReferenceById(TargetCatchDto.PROPERTY_SPECIES, speciesId); } /** @@ -472,7 +472,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex */ protected List<ReferentialReference<WeightCategoryDto>> getSpeciesWeightCategories(String speciesId) { - Set<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(WeightCategoryDto.class, TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); + Set<ReferentialReference<WeightCategoryDto>> allCategories = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); return Lists.newArrayList(Iterables.filter(allCategories, new WeightCategorySpeciesPredicate(speciesId))); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java index ab0c5e6..64459df 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -605,14 +606,18 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat Form<SetLonglineCatchDto> form = getSetLonglineCatchService().loadForm(beanId); CatchLonglineUIModel model = getModel(); + + loadReferentialReferenceSetsInModel(form); + model.setForm(form); - LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); - positionHelper.initSections(model.getDataReferenceSet(SectionDto.class, CatchLonglineDto.PROPERTY_SECTION), - model.getDataReferenceSet(BasketDto.class, CatchLonglineDto.PROPERTY_BASKET), - model.getDataReferenceSet(BranchlineDto.class, CatchLonglineDto.PROPERTY_BRANCHLINE), - form.getObject().getCatchLongline()); + DataReferenceSet<SectionDto> sections= model.getDataReferenceSet(CatchLonglineDto.PROPERTY_SECTION); + DataReferenceSet<BasketDto> baskets = model.getDataReferenceSet(CatchLonglineDto.PROPERTY_BASKET); + DataReferenceSet<BranchlineDto> branchlines = model.getDataReferenceSet(CatchLonglineDto.PROPERTY_BRANCHLINE); + + LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); + positionHelper.initSections(sections, baskets, branchlines, form.getObject().getCatchLongline()); SetLonglineCatchDtos.copySetLonglineCatchDto(form.getObject(), getBean()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java index a6269e1..fe2ef62 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/EncounterUIHandler.java @@ -108,6 +108,8 @@ public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEn @Override protected void loadEditBean(String beanId) { Form<ActivityLonglineEncouterDto> form = getActivityLongLineEncouterService().loadForm(beanId); + loadReferentialReferenceSetsInModel(form); + getModel().setForm(form); ActivityLonglineEncouterDtos.copyActivityLonglineEncouterDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 51d55bf..449c96a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -492,6 +492,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip @Override protected void loadEditBean(String beanId) { Form<TripLonglineGearUseDto> form = getTripLonglineGearUseService().loadForm(beanId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TripLonglineGearUseDtos.copyTripLonglineGearUseDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index 84c860c..c1eccf8 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -239,6 +239,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS @Override protected void loadEditBean(String beanId) { Form<ActivityLonglineSensorUsedDto> form = getActivityLonglineSensorUsedService().loadForm(beanId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); ActivityLonglineSensorUsedDtos.copyActivityLonglineSensorUsedDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index 2a83b3d..7f0dba4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -28,9 +28,11 @@ import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.db.constants.DataContextType; +import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrDtos; @@ -474,13 +476,17 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt Form<SetLonglineTdrDto> form = getTdrService().loadForm(beanId); ContentTableUIModel<SetLonglineTdrDto, TdrDto> model = getModel(); + loadReferentialReferenceSetsInModel(form); model.setForm(form); - LonglinePositionHelper<TdrDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); + DataReferenceSet<SectionDto> sections = model.getDataReferenceSet(CatchLonglineDto.PROPERTY_SECTION); + DataReferenceSet<BasketDto> baskets = model.getDataReferenceSet(CatchLonglineDto.PROPERTY_BASKET); + DataReferenceSet<BranchlineDto> branchlines = model.getDataReferenceSet(CatchLonglineDto.PROPERTY_BRANCHLINE); - positionHelper.initSections(model.getDataReferenceSet(SectionDto.class, TdrDto.PROPERTY_SECTION), - model.getDataReferenceSet(BasketDto.class, TdrDto.PROPERTY_BASKET), - model.getDataReferenceSet(BranchlineDto.class, TdrDto.PROPERTY_BRANCHLINE), + LonglinePositionHelper<TdrDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); + positionHelper.initSections(sections, + baskets, + branchlines, form.getObject().getTdr()); SetLonglineTdrDtos.copySetLonglineTdrDto(form.getObject(), getBean()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 1c00447..e5ce0b0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -489,6 +489,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei @Override protected void loadEditBean(String beanId) { Form<TripSeineGearUseDto> form = getTripSeineGearUseService().loadForm(beanId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TripSeineGearUseDtos.copyTripSeineGearUseDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index d1ed6c2..e99beac 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -226,7 +226,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa JComponent requestFocus; if (create) { - Set<ReferentialReference<SpeciesDto>> speciesSet = getModel().getReferentialReferences(SpeciesDto.class, NonTargetCatchDto.PROPERTY_SPECIES); + Set<ReferentialReference<SpeciesDto>> speciesSet = getModel().getReferentialReferences(NonTargetCatchDto.PROPERTY_SPECIES); availableEspeces = Lists.newArrayList(speciesSet); requestFocus = ui.getSpecies(); @@ -371,6 +371,7 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa protected void loadEditBean(String beanId) { String tripSeineId = getDataContext().getSelectedTripSeineId(); Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId, tripSeineId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineNonTargetCatchDtos.copySetSeineNonTargetCatchDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index c3db701..b5cfb35 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -148,7 +148,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam ui.getAcquisitionModeGroup().setSelectedValue(ModeSaisieEchantillonEnum.byEffectif); } - Set<ReferentialReference<SpeciesDto>> speciesReferences = getModel().getReferentialReferences(SpeciesDto.class, NonTargetLengthDto.PROPERTY_SPECIES); + Set<ReferentialReference<SpeciesDto>> speciesReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SPECIES); availableEspeces = Lists.newArrayList(speciesReferences); requestFocus = ui.getSpecies(); @@ -305,6 +305,7 @@ public class NonTargetSampleUIHandler extends ContentTableUIHandler<NonTargetSam @Override protected void loadEditBean(String beanId) { Form<NonTargetSampleDto> form = getNonTargetSampleService().loadForm(beanId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); NonTargetSampleDtos.copyNonTargetSampleDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index bf044ed..7e556c4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -103,6 +103,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati @Override protected void loadEditBean(String beanId) { Form<FloatingObjectObservedSpeciesDto> form = getObjectObservedSpeciesService().loadForm(beanId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); FloatingObjectObservedSpeciesDtos.copyFloatingObjectObservedSpeciesDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index b59ce24..1604deb 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -99,6 +99,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin @Override protected void loadEditBean(String beanId) { Form<FloatingObjectSchoolEstimateDto> form = getObjectSchoolEstimateService().loadForm(beanId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); FloatingObjectSchoolEstimateDtos.copyFloatingObjectSchoolEstimateDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index 11d6629..b33abab 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -90,7 +90,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo JComponent requestFocus; if (create) { - Set<ReferentialReference<SpeciesDto>> references = getModel().getReferentialReferences(SpeciesDto.class, SchoolEstimateDto.PROPERTY_SPECIES); + Set<ReferentialReference<SpeciesDto>> references = getModel().getReferentialReferences(SchoolEstimateDto.PROPERTY_SPECIES); List<ReferentialReference<SpeciesDto>> listSpeciesUsed = model.getColumnValues(0); @@ -137,6 +137,7 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo protected void loadEditBean(String beanId) { String tripSeineId = getDataContext().getSelectedTripSeineId(); Form<SetSeineSchoolEstimateDto> form = getSchoolEstimateService().loadForm(beanId, tripSeineId); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); SetSeineSchoolEstimateDtos.copySetSeineSchoolEstimateDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java index f2d8303..76b6420 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -285,13 +285,10 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa @Override protected void loadEditBean(String beanId) { - String tripSeineId = getDataContext().getSelectedTripSeineId(); - Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, false, tripSeineId); - + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetSeineTargetCatchDtos.copySetSeineTargetCatchDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 3c7480b..5167056 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -437,7 +437,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT ReferentialReference<ReasonForDiscardDto> reasonForDiscard) { ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel(); - Set<ReferentialReference<ReasonForDiscardDto>> reasonForDiscardSet = getModel().getReferentialReferences(ReasonForDiscardDto.class, TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); + Set<ReferentialReference<ReasonForDiscardDto>> reasonForDiscardSet = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); List<ReferentialReference<ReasonForDiscardDto>> reasonForDiscardList = Lists.newArrayList(reasonForDiscardSet); @@ -457,7 +457,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT protected List<ReferentialReference<WeightCategoryDto>> getAllWeightCategories() { - Set<ReferentialReference<WeightCategoryDto>> weightCategorySet = getModel().getReferentialReferences(WeightCategoryDto.class, TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); + Set<ReferentialReference<WeightCategoryDto>> weightCategorySet = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY); List<ReferentialReference<WeightCategoryDto>> weightCategoryList = Lists.newArrayList(weightCategorySet); return weightCategoryList; @@ -467,7 +467,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT ContentTableModel<SetSeineTargetCatchDto, TargetCatchDto> model = getTableModel(); - Set<ReferentialReference<ReasonForDiscardDto>> reasonForDiscardSet = getModel().getReferentialReferences(ReasonForDiscardDto.class, TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); + Set<ReferentialReference<ReasonForDiscardDto>> reasonForDiscardSet = getModel().getReferentialReferences(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD); int nbReasonForDiscard = reasonForDiscardSet.size(); @@ -492,13 +492,10 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT @Override protected void loadEditBean(String beanId) { - String tripSeineId = getDataContext().getSelectedTripSeineId(); - Form<SetSeineTargetCatchDto> form = getTargetCatchService().loadForm(beanId, true, tripSeineId); - + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); - SetSeineTargetCatchDtos.copySetSeineTargetCatchDto(form.getObject(), getBean()); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java index 1e70b0e..ba6de85 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -321,6 +321,7 @@ public class TargetSampleUIHandler extends ContentTableUIHandler<TargetSampleDto @Override protected void loadEditBean(String beanId) { Form<TargetSampleDto> form = getTargetSampleService().loadForm(beanId, discarded); + loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TargetSampleDtos.copyTargetSampleDto(form.getObject(), getBean()); } -- 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