This is an automated email from the git hooks/post-receive script. New commit to branch feature/optimisationEcranList in repository tutti. See http://git.codelutin.com/tutti.git commit 458e311db73d2346ad83ce4fec3bb30c87524d67 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 17:22:59 2016 +0100 Dns les écrans de type liste, il n'est pas utile de chargé le DTO parents. Son Id suffit. pour les liste de marées seul le libellé du programme est utile. (refs #7591, #7593, #7594) --- .../fr/ird/observe/db/ObserveSwingDataSource.java | 16 ++++++++++++++-- .../ui/content/list/ContentListUIHandler.java | 10 ++++------ .../impl/longline/ActivityLonglinesUIHandler.java | 16 ++-------------- .../list/impl/longline/TripLonglinesUIHandler.java | 20 +++++--------------- .../list/impl/seine/ActivitySeinesUIHandler.java | 16 ++-------------- .../ui/content/list/impl/seine/RoutesUIHandler.java | 16 ++-------------- .../content/list/impl/seine/TripSeinesUIHandler.java | 20 +++++--------------- 7 files changed, 34 insertions(+), 80 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index eaa11af..5d475cd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -271,16 +271,28 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements } - public <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(Class<D> type) { + protected <D extends ReferentialDto> ReferentialReferenceSet<D> getReferentialReferenceSet(Class<D> type) { checkIsOpen(); ReferentialService referentialService = newService(ReferentialService.class); - ReferentialReferenceSet<D> referentialReferenceSet = referentialCache.getReferentialReferenceSet(referentialService, type); + return referentialCache.getReferentialReferenceSet(referentialService, type); + } + + public <D extends ReferentialDto> Set<ReferentialReference<D>> getReferentialReferences(Class<D> type) { + + ReferentialReferenceSet<D> referentialReferenceSet = getReferentialReferenceSet(type); return referentialReferenceSet.getReferences(); } + public <D extends ReferentialDto> ReferentialReference<D> getReferentialReference(Class<D> type, String id) { + + ReferentialReferenceSet<D> referentialReferenceSet = getReferentialReferenceSet(type); + return referentialReferenceSet.getReferenceById(id); + + } + public boolean isOpen() { return connection != null; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java index bb87833..4461701 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/list/ContentListUIHandler.java @@ -68,10 +68,10 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto> e * Obtain the list of entities to display on ui from his container * {@code bean}. * - * @param bean the container of entities to display + * @param parentId the parent id of entities to display * @return the list of entities to display */ - protected abstract List<DataReference<C>> getChilds(E bean); + protected abstract List<DataReference<C>> getChilds(String parentId); @Override protected boolean computeCanWrite(ObserveSwingDataSource source) { @@ -134,10 +134,9 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto> e } model.setCanReopen(canReopen); - loadParentBean(); + // il n'est pas nécessaire de charger le bean car seuls ses enfants nous sont utile dans cette ecran - E bean = getBean(); - List<DataReference<C>> data = getChilds(bean); + List<DataReference<C>> data = getChilds(getSelectedParentId()); model.setData(data); @@ -268,5 +267,4 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto> e } } - protected abstract void loadParentBean(); } 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 58a240f..11e6a09 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 @@ -27,12 +27,9 @@ import fr.ird.observe.db.DataContext; 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.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.longline.TripLonglineDtos; import fr.ird.observe.services.service.longline.ActivityLonglineService; -import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -114,10 +111,10 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin } @Override - protected List<DataReference<ActivityLonglineDto>> getChilds(TripLonglineDto bean) { + protected List<DataReference<ActivityLonglineDto>> getChilds(String parentId) { ActivityLonglineService service = ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); - DataReferenceSet<ActivityLonglineDto> activityLonglineStubByRoute = service.getActivityLonglineByTripLongline(bean.getId()); + DataReferenceSet<ActivityLonglineDto> activityLonglineStubByRoute = service.getActivityLonglineByTripLongline(parentId); if (log.isDebugEnabled()) { log.debug("Will use " + activityLonglineStubByRoute.sizeReference() + " activities."); @@ -126,13 +123,4 @@ public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglin return new ArrayList<>(activityLonglineStubByRoute.getReferences()); } - - @Override - 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()); - } } \ No newline at end of file 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 fb4ab20..13ea64c 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 @@ -27,11 +27,9 @@ import fr.ird.observe.db.DataContext; 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.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ProgramDtos; -import fr.ird.observe.services.service.ReferentialService; +import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; @@ -92,15 +90,16 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri @Override protected void finalizeOpenUI() { - String title = getDecoratorService().decorate(getBean()); + ReferentialReference<ProgramDto> programRef = getDataSource().getReferentialReference(ProgramDto.class, getSelectedParentId()); + String title = getDecoratorService().decorate(programRef); getUi().setContentTitle(title); } @Override - protected List<DataReference<TripLonglineDto>> getChilds(ProgramDto bean) { + protected List<DataReference<TripLonglineDto>> getChilds(String parentId) { TripLonglineService service = ObserveSwingApplicationContext.get().newService(TripLonglineService.class); - DataReferenceSet<TripLonglineDto> tripLonglineByProgram = service.getTripLonglineByProgram(bean.getId()); + DataReferenceSet<TripLonglineDto> tripLonglineByProgram = service.getTripLonglineByProgram( parentId); if (log.isDebugEnabled()) { log.debug("Will use " + tripLonglineByProgram.sizeReference() + " trips."); @@ -108,14 +107,5 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri return new ArrayList<>(tripLonglineByProgram.getReferences()); } - - @Override - protected void loadParentBean() { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - 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 a4bbf3c..36c54fe 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 @@ -26,12 +26,9 @@ import fr.ird.observe.db.DataContext; 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.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.dto.seine.RouteDtos; import fr.ird.observe.services.service.seine.ActivitySeineService; -import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -112,10 +109,10 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti } @Override - protected List<DataReference<ActivitySeineDto>> getChilds(RouteDto bean) { + protected List<DataReference<ActivitySeineDto>> getChilds(String parentId) { ActivitySeineService service = ObserveSwingApplicationContext.get().newService(ActivitySeineService.class); - DataReferenceSet<ActivitySeineDto> activitySeineByRoute = service.getActivitySeineByRoute(bean.getId()); + DataReferenceSet<ActivitySeineDto> activitySeineByRoute = service.getActivitySeineByRoute(parentId); if (log.isDebugEnabled()) { log.debug("Will use " + activitySeineByRoute.sizeReference() + " activities."); @@ -123,13 +120,4 @@ public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, Acti return new ArrayList<>(activitySeineByRoute.getReferences()); } - - @Override - protected void loadParentBean() { - RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); - 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 f5462e1..f68f479 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 @@ -26,12 +26,9 @@ import fr.ird.observe.db.DataContext; 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.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineDtos; import fr.ird.observe.services.service.seine.RouteService; -import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; import org.apache.commons.logging.Log; @@ -109,10 +106,10 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto } @Override - protected List<DataReference<RouteDto>> getChilds(TripSeineDto bean) { + protected List<DataReference<RouteDto>> getChilds(String parentId) { RouteService service = ObserveSwingApplicationContext.get().newService(RouteService.class); - DataReferenceSet<RouteDto> routeByTripSeine = service.getRouteByTripSeine(bean.getId()); + DataReferenceSet<RouteDto> routeByTripSeine = service.getRouteByTripSeine(parentId); if (log.isDebugEnabled()) { log.debug("Will use " + routeByTripSeine.sizeReference() + " routes."); @@ -121,13 +118,4 @@ public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto return new ArrayList<>(routeByTripSeine.getReferences()); } - - @Override - protected void loadParentBean() { - TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); - 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 85442e6..6ed82dd 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 @@ -26,11 +26,9 @@ import fr.ird.observe.db.DataContext; 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.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ProgramDtos; +import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.list.ContentListUIHandler; @@ -89,15 +87,16 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe @Override protected void finalizeOpenUI() { - String title = getDecoratorService().decorate(getBean()); + ReferentialReference<ProgramDto> programRef = getDataSource().getReferentialReference(ProgramDto.class, getSelectedParentId()); + String title = getDecoratorService().decorate(programRef); getUi().setContentTitle(title); } @Override - protected List<DataReference<TripSeineDto>> getChilds(ProgramDto bean) { + protected List<DataReference<TripSeineDto>> getChilds(String parentId) { TripSeineService service = ObserveSwingApplicationContext.get().newService(TripSeineService.class); - DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(bean.getId()); + DataReferenceSet<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(parentId); if (log.isDebugEnabled()) { log.debug("Will use " + tripSeineByProgram.sizeReference() + " trips."); @@ -106,13 +105,4 @@ public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSe return new ArrayList<>(tripSeineByProgram.getReferences()); } - - @Override - protected void loadParentBean() { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - Form<ProgramDto> form = service.loadForm(ProgramDto.class, getSelectedParentId()); - loadReferentialReferenceSetsInModel(form); - getModel().setForm(form); - ProgramDtos.copyProgramDto(form.getObject(), getBean()); - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.