This is an automated email from the git hooks/post-receive script. New commit to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit 29a3a9d3fb567b480f7d4434298cf893ce29c562 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 29 14:44:12 2015 +0200 modif d'une mauvais classe de DTO (refs #7531) --- .../ui/content/open/ContentOpenableUIHandler.java | 18 +++--------------- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 11 +++++------ .../impl/longline/BaitsCompositionUIHandler.java | 22 +++++++++++----------- .../impl/longline/BaitsCompositionUIModel.java | 9 ++++----- .../impl/longline/BranchlinesCompositionUI.jaxx | 11 +++++------ .../longline/BranchlinesCompositionUIHandler.java | 19 ++++++++++--------- .../longline/BranchlinesCompositionUIModel.java | 8 ++++---- ...LonglineGlobalCompositionServiceController.java | 4 ++-- .../SetLonglineGlobalCompositionService.java | 2 +- .../SetLonglineGlobalCompositionServiceTopia.java | 4 +--- 11 files changed, 47 insertions(+), 63 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java index 3ccdb75..e16f02d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/ContentOpenableUIHandler.java @@ -76,7 +76,7 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co public final void openDataUI() { boolean ok = false; try { - doOpenData(); + getBean().setOpen(true); ok = true; } catch (Exception e) { ErrorDialogUI.showError(e); @@ -91,12 +91,6 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public final void doOpenData() throws Exception { - String id = getBean().getId(); - //FIXME -// getDataService().updateOpenProperty(getDataSource(), id, true); - } - public final void afterOpenData() { ContentOpenableUI<E> ui = getUi(); @@ -131,14 +125,8 @@ public abstract class ContentOpenableUIHandler<E extends OpenableDto> extends Co } } - public boolean doCloseData() throws Exception { - - return doCloseData(getBean().getId()); - } - - public final boolean doCloseData(String id) throws Exception { - //FIXME -// getDataService().updateOpenProperty(getDataSource(), id, false); + public boolean doCloseData() { + getBean().setOpen(false); return true; } 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 9fec73c..32b78e2 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 @@ -336,7 +336,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // } @Override - public boolean doCloseData() throws Exception { + public boolean doCloseData() { RouteDto route = getBean(); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx index 9964763..02be4d3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLonglineDto, BaitsCompositionDto' + superGenericType='SetLonglineGlobalCompositionDto, BaitsCompositionDto' contentTitle='{n("observe.baitsComposition.title")}' saveNewEntryText='{n("observe.baitsComposition.action.create")}' saveNewEntryTip='{n("observe.baitsComposition.action.create.tip")}' @@ -32,7 +32,7 @@ <import> fr.ird.observe.services.dto.ReferenceDto - fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.BaitsCompositionDto fr.ird.observe.services.dto.referential.longline.BaitTypeDto fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto @@ -52,7 +52,7 @@ <BaitsCompositionUIModel id='model'/> <!-- edit bean --> - <SetLonglineDto id='bean'/> + <SetLonglineGlobalCompositionDto id='bean'/> <!-- table edit bean --> <BaitsCompositionDto id='tableEditBean'/> @@ -62,10 +62,9 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-baitsComposition' - beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> - <!--FIXME--> - <!--<field name="baitsComposition" component="editorPanel"/>--> + <field name="baitsComposition" component="editorPanel"/> </BeanValidator> <!-- 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/BaitsCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index 6f535f5..df4d179 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIHandler.java @@ -26,17 +26,17 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDto; -import fr.ird.observe.services.dto.longline.SetLonglineDtos; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDtos; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; @@ -49,7 +49,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BaitsCompositionDto> { +public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BaitsCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BaitsCompositionUIHandler.class); @@ -117,15 +117,15 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline } @Override - protected void doPersist(SetLonglineDto bean) { - getSetLonglineService().save(getSelectedParentId(), bean); + protected void doPersist(SetLonglineGlobalCompositionDto bean) { + getSetLonglineGlobalCompositionService().save(bean); } @Override protected void loadEditBean(String beanId) { - FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + FormDto<SetLonglineGlobalCompositionDto> formDto = getSetLonglineGlobalCompositionService().loadToEdit(beanId); getModel().setFormDto(formDto); - SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(formDto.getForm(), getBean()); } //FIXME @@ -139,7 +139,7 @@ public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLongline super.afterSave(refresh); } - protected SetLonglineService getSetLonglineService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + protected SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineGlobalCompositionService.class); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java index 9667d33..5e30b0f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BaitsCompositionUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,16 +37,15 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineDto, BaitsCompositionDto> { +public class BaitsCompositionUIModel extends ContentTableUIModel<SetLonglineGlobalCompositionDto, BaitsCompositionDto> { private static final long serialVersionUID = 1L; public BaitsCompositionUIModel(BaitsCompositionUI ui) { - super(SetLonglineDto.class, + super(SetLonglineGlobalCompositionDto.class, BaitsCompositionDto.class, new String[]{ - //FIXME -// SetLonglineDto.PROPERTY_BAITS_COMPOSITION + SetLonglineGlobalCompositionDto.PROPERTY_BAITS_COMPOSITION }, new String[]{BaitsCompositionDto.PROPERTY_BAIT_TYPE, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx index 6624b7f..348c309 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx @@ -21,7 +21,7 @@ --> <fr.ird.observe.ui.content.table.ContentTableUI - superGenericType='SetLonglineDto, BranchlinesCompositionDto' + superGenericType='SetLonglineGlobalCompositionDto, BranchlinesCompositionDto' contentTitle='{n("observe.branchlinesComposition.title")}' saveNewEntryText='{n("observe.branchlinesComposition.action.create")}' saveNewEntryTip='{n("observe.branchlinesComposition.action.create.tip")}' @@ -32,7 +32,7 @@ <import> fr.ird.observe.services.dto.ReferenceDto - fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.BranchlinesCompositionDto fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.ui.content.table.* @@ -51,7 +51,7 @@ <BranchlinesCompositionUIModel id='model'/> <!-- edit bean --> - <SetLonglineDto id='bean'/> + <SetLonglineGlobalCompositionDto id='bean'/> <!-- table edit bean --> <BranchlinesCompositionDto id='tableEditBean'/> @@ -61,10 +61,9 @@ <!-- le validateur de l'écran --> <BeanValidator id='validator' autoField='true' context='n1-update-branchlinesComposition' - beanClass='fr.ird.observe.services.dto.longline.SetLonglineDto' + beanClass='fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> - <!--FIXME--> - <!--<field name="branchlinesComposition" component="editorPanel"/>--> + <field name="branchlinesComposition" component="editorPanel"/> </BeanValidator> <!-- 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/BranchlinesCompositionUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index d84e7d5..b21c9e4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -26,10 +26,11 @@ import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; -import fr.ird.observe.services.dto.longline.SetLonglineDto; -import fr.ird.observe.services.dto.longline.SetLonglineDtos; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDtos; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.service.longline.SetLonglineGlobalCompositionService; import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.table.ContentTableUIHandler; @@ -47,7 +48,7 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineDto, BranchlinesCompositionDto> { +public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BranchlinesCompositionDto> { /** Logger */ static private Log log = LogFactory.getLog(BranchlinesCompositionUIHandler.class); @@ -123,19 +124,19 @@ public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLo } @Override - protected void doPersist(SetLonglineDto bean) { - getSetLonglineService().save(getSelectedParentId(), bean); + protected void doPersist(SetLonglineGlobalCompositionDto bean) { + getSetLonglineGlobalCompositionService().save(bean); } @Override protected void loadEditBean(String beanId) { - FormDto<SetLonglineDto> formDto = getSetLonglineService().loadToEdit(beanId); + FormDto<SetLonglineGlobalCompositionDto> formDto = getSetLonglineGlobalCompositionService().loadToEdit(beanId); getModel().setFormDto(formDto); - SetLonglineDtos.copySetLonglineDto(formDto.getForm(), getBean()); + SetLonglineGlobalCompositionDtos.copySetLonglineGlobalCompositionDto(formDto.getForm(), getBean()); } - protected SetLonglineService getSetLonglineService() { - return ObserveSwingApplicationContext.get().newService(SetLonglineService.class); + protected SetLonglineGlobalCompositionService getSetLonglineGlobalCompositionService() { + return ObserveSwingApplicationContext.get().newService(SetLonglineGlobalCompositionService.class); } } \ No newline at end of file diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java index bc3109c..9262147 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/BranchlinesCompositionUIModel.java @@ -25,6 +25,7 @@ package fr.ird.observe.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.ui.content.table.ContentTableMeta; import fr.ird.observe.ui.content.table.ContentTableModel; import fr.ird.observe.ui.content.table.ContentTableUIModel; @@ -37,16 +38,15 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLonglineDto, BranchlinesCompositionDto> { +public class BranchlinesCompositionUIModel extends ContentTableUIModel<SetLonglineGlobalCompositionDto, BranchlinesCompositionDto> { private static final long serialVersionUID = 1L; public BranchlinesCompositionUIModel(BranchlinesCompositionUI ui) { - super(SetLonglineDto.class, + super(SetLonglineGlobalCompositionDto.class, BranchlinesCompositionDto.class, new String[]{ - //FIXME -// SetLonglineDto.PROPERTY_BRANCHLINES_COMPOSITION + SetLonglineGlobalCompositionDto.PROPERTY_BRANCHLINES_COMPOSITION }, new String[]{BranchlinesCompositionDto.PROPERTY_TOP_TYPE, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE, diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java index ccde45d..8af13a2 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineGlobalCompositionServiceController.java @@ -47,7 +47,7 @@ public class SetLonglineGlobalCompositionServiceController extends ObserveAuthen } @Override - public String save(FormDto<SetLonglineGlobalCompositionDto> form) { - return service.save(form); + public String save(SetLonglineGlobalCompositionDto dto) { + return service.save(dto); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java index 6d2cee8..fbac7ec 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java @@ -44,6 +44,6 @@ public interface SetLonglineGlobalCompositionService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(FormDto<SetLonglineGlobalCompositionDto> form); + String save(SetLonglineGlobalCompositionDto dto); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java index 4cf189e..8e423bf 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -71,9 +71,7 @@ public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopi } @Override - public String save(FormDto<SetLonglineGlobalCompositionDto> form) { - - SetLonglineGlobalCompositionDto setLonglineGlobalCompositionDto = form.getForm(); + public String save(SetLonglineGlobalCompositionDto setLonglineGlobalCompositionDto) { SetLongline setLongline = dtoToEntity(SetLonglineGlobalCompositionDto.class, SetLongline.class, setLonglineGlobalCompositionDto); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.