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 e7e6142cf75dc98461b88ddc08dbbcf835592457 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 29 23:12:19 2015 +0100 Ne pas charger les composants BeanListHeader si un marqueur de non chargement est présent --- .../ird/observe/ui/content/ContentUIHandler.java | 26 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 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 807f709..a7f08f2 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 @@ -932,13 +932,22 @@ public abstract class ContentUIHandler<E extends IdDto> { protected <R extends ReferentialDto> void updateReferentialBeanListHeader(Class<R> dtoClass, BeanListHeader<ReferentialReference<R>> list) { + Boolean noLoad = (Boolean) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); + List<ReferentialReference<R>> data; - if (getModel().getForm() == null) { + String propertyName = list.getName(); + + if (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null) { + + if (log.isInfoEnabled()) { + log.info(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); + } data = Collections.emptyList(); + } else { - Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(list.getName()); + Set<ReferentialReference<R>> referenceSetDto = getModel().getReferentialReferences(propertyName); data = new ArrayList<>(referenceSetDto); } @@ -954,13 +963,22 @@ public abstract class ContentUIHandler<E extends IdDto> { protected <R extends DataDto> void updateDataBeanListHeader(Class<R> dtoClass, BeanListHeader<DataReference<R>> list) { + Boolean noLoad = (Boolean) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); + List<DataReference<R>> data; - if (getModel().getForm() == null) { + String propertyName = list.getName(); + + if (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null) { + + if (log.isInfoEnabled()) { + log.info(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); + } data = Collections.emptyList(); + } else { - Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(list.getName()); + Set<DataReference<R>> referenceSetDto = getModel().getDataReferences(propertyName); data = new ArrayList<>(referenceSetDto); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.