This is an automated email from the git hooks/post-receive script. New commit to branch feature/7619 in repository observe. See http://git.codelutin.com/observe.git commit 4bbd9ebec65925be085ee7fadf4e14870d18e861 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 10:27:14 2015 +0200 migration des écrans des capteurs pour les palangre (refs #7619) --- .../content/table/impl/longline/SensorUsedUI.jaxx | 12 +++---- .../table/impl/longline/SensorUsedUIHandler.java | 39 +++++++++------------- .../table/impl/longline/SensorUsedUIModel.java | 35 ++++++++++++++----- ...ctivityLongLineSensorUsedServiceController.java | 5 +-- .../ActivityLongLineSensorUsedService.java | 3 +- .../ActivityLongLineSensorUsedServiceTopia.java | 8 +++-- 6 files changed, 58 insertions(+), 44 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx index 2cf644c..92599e3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUI.jaxx @@ -21,19 +21,17 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='ActivityLonglineDto, SensorUsedDto' + superGenericType='ActivityLonglineSensorUsedDto, SensorUsedDto' contentTitle='{n("observe.sensorUsed.title")}' saveNewEntryText='{n("observe.sensorUsed.action.create")}' - saveNewEntryTip='{n("observe.sensorUsed.action.create.tip")}' - - > + saveNewEntryTip='{n("observe.sensorUsed.action.create.tip")}'> <style source="../../CommonTable.css"/> <import> fr.ird.observe.services.dto.ReferenceDto fr.ird.observe.services.dto.CommentableDto - fr.ird.observe.services.dto.longline.ActivityLonglineDto + fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto fr.ird.observe.services.dto.longline.SensorUsedDto fr.ird.observe.services.dto.referential.longline.SensorTypeDto fr.ird.observe.services.dto.referential.longline.SensorBrandDto @@ -55,7 +53,7 @@ <SensorUsedUIModel id='model'/> <!-- edit bean --> - <ActivityLonglineDto id='bean'/> + <ActivityLonglineSensorUsedDto id='bean'/> <!-- table edit bean --> <SensorUsedDto id='tableEditBean'/> @@ -65,7 +63,7 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-sensorUsed' - beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineDto' + beanClass='fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto' errorTableModel='{getErrorTableModel()}'/> <!-- le validateur d'une entrée de tableau --> 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 71e7cfd..3f4b5ab 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 @@ -29,13 +29,14 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.longline.ActivityLonglineDtos; +import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDtos; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; -import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; import fr.ird.observe.ui.ObserveMainUI; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -65,7 +66,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineDto, SensorUsedDto> { +public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineSensorUsedDto, SensorUsedDto> { /** Logger */ static private Log log = LogFactory.getLog(SensorUsedUIHandler.class); @@ -107,9 +108,9 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD n("observe.sensorUsed.table.dataLocation"), n("observe.sensorUsed.table.dataLocation.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, SensorTypeDto.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, SensorBrandDto.class)); - UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, SensorDataFormatDto.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, SensorTypeDto.class.getSimpleName())); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, SensorBrandDto.class.getSimpleName())); + UIHelper.setTableColumnRenderer(table, 2, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, SensorDataFormatDto.class.getSimpleName())); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newStringTableCellRenderer(renderer, 10, true)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newBooleanTableCellRenderer(renderer, new Predicate<Object>() { @Override @@ -183,22 +184,14 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD public void exportData() { - //FIXME -// String filename; -// try { -// filename = getDataService().getSensorUsedDataFilename(getDataSource(), getTableEditBean()); -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Could not obtain sensorUser data export filename", e); -// } + String filename = getTableEditBean().getDataFilename(); File file = JaxxFileChooser .forSaving() .setParent(getUi()) .setTitle(t("observe.title.choose.sensorUsed.exportData")) .setApprovalText(t("observe.action.choose.sensorUsed.exportData")) - //FIXME -// .setFilename(filename) - .setFilename(null) + .setFilename(filename) .setUseAcceptAllFileFilter(true) .choose(); @@ -235,19 +228,19 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD } @Override - protected void doPersist(ActivityLonglineDto bean) { - getActivityLonglineService().save(getSelectedParentId(), bean); + protected void doPersist(ActivityLonglineSensorUsedDto bean) { + getActivityLonglineSensorUsedService().save(bean); } @Override protected void loadEditBean(String beanId) { - FormDto<ActivityLonglineDto> formDto = getActivityLonglineService().loadToEdit(beanId); + FormDto<ActivityLonglineSensorUsedDto> formDto = getActivityLonglineSensorUsedService().loadToEdit(beanId); getModel().setFormDto(formDto); - ActivityLonglineDtos.copyActivityLonglineDto(formDto.getForm(), getBean()); + ActivityLonglineSensorUsedDtos.copyActivityLonglineSensorUsedDto(formDto.getForm(), getBean()); } - protected ActivityLonglineService getActivityLonglineService() { - return ObserveSwingApplicationContext.get().newService(ActivityLonglineService.class); + protected ActivityLongLineSensorUsedService getActivityLonglineSensorUsedService() { + return ObserveSwingApplicationContext.get().newService(ActivityLongLineSensorUsedService.class); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java index 0516c35..48127fc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIModel.java @@ -24,12 +24,15 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; +import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; +import fr.ird.observe.services.dto.longline.SensorUsedDtos; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; import fr.ird.observe.ui.content.table.ObserveContentTableUI; +import java.util.Collection; import java.util.List; /** @@ -38,18 +41,17 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SensorUsedUIModel extends ContentTableUIModel<ActivityLonglineDto, SensorUsedDto> { +public class SensorUsedUIModel extends ContentTableUIModel<ActivityLonglineSensorUsedDto, SensorUsedDto> { private static final long serialVersionUID = 1L; public SensorUsedUIModel(SensorUsedUI ui) { - super(ActivityLonglineDto.class, + super(ActivityLonglineSensorUsedDto.class, SensorUsedDto.class, new String[]{ - //FIXME -// ActivityLonglineDto.PROPERTY_SENSOR_USED, - ActivityLonglineDto.PROPERTY_COMMENT}, + ActivityLonglineSensorUsedDto.PROPERTY_SENSOR_USED, + ActivityLonglineSensorUsedDto.PROPERTY_COMMENT}, new String[]{SensorUsedDto.PROPERTY_DATA, SensorUsedDto.PROPERTY_DATA_FILENAME, SensorUsedDto.PROPERTY_DATA_LOCATION, @@ -71,8 +73,25 @@ public class SensorUsedUIModel extends ContentTableUIModel<ActivityLonglineDto, } @Override - protected ContentTableModel<ActivityLonglineDto, SensorUsedDto> createTableModel(ObserveContentTableUI<ActivityLonglineDto, SensorUsedDto> ui, List<ContentTableMeta<SensorUsedDto>> contentTableMetas) { - // FIXME - return null; + protected ContentTableModel<ActivityLonglineSensorUsedDto, SensorUsedDto> createTableModel( + ObserveContentTableUI<ActivityLonglineSensorUsedDto, SensorUsedDto> ui, + List<ContentTableMeta<SensorUsedDto>> contentTableMetas) { + + return new ContentTableModel<ActivityLonglineSensorUsedDto, SensorUsedDto>(ui, contentTableMetas) { + @Override + protected Collection<SensorUsedDto> getChilds(ActivityLonglineSensorUsedDto bean) { + return bean.getSensorUsed(); + } + + @Override + protected void load(SensorUsedDto source, SensorUsedDto target) { + SensorUsedDtos.copySensorUsedDto(source, target); + } + + @Override + protected void setChilds(ActivityLonglineSensorUsedDto parent, List<SensorUsedDto> childs) { + parent.setSensorUsed(childs); + } + }; } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java index d357d02..9ac9b71 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLongLineSensorUsedServiceController.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.web.controller.v1.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.ActivityLongLineSensorUsedService; /** @@ -47,7 +48,7 @@ public class ActivityLongLineSensorUsedServiceController extends ObserveAuthenti } @Override - public String save(FormDto<ActivityLonglineSensorUsedDto> form) { - return service.save(form); + public SaveResultDto save(ActivityLonglineSensorUsedDto dto) { + return service.save(dto); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java index 83200f8..643754b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; @@ -44,6 +45,6 @@ public interface ActivityLongLineSensorUsedService extends ObserveService { @WriteDataPermission @Write @PostRequest - String save(FormDto<ActivityLonglineSensorUsedDto> form); + SaveResultDto save(ActivityLonglineSensorUsedDto dto); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java index d44984a..b4c6a88 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java @@ -31,6 +31,8 @@ import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.result.SaveResultDtos; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -66,13 +68,13 @@ public class ActivityLongLineSensorUsedServiceTopia extends ObserveServiceTopia } @Override - public String save(FormDto<ActivityLonglineSensorUsedDto> form) { + public SaveResultDto save(ActivityLonglineSensorUsedDto dto) { - ActivityLongline activityLongline = dtoToEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, form.getForm()); + ActivityLongline activityLongline = dtoToEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, dto); activityLongline = saveEntity(ActivityLongline.class, activityLongline); - return activityLongline.getTopiaId(); + return SaveResultDtos.newSaveResult(activityLongline.getTopiaId(), activityLongline.getLastUpdate()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.