This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 7d67baefbf677f36475f2b3160c46fbbee59b8db Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 28 16:47:50 2015 +0100 correction des tableau de poids et de tailles (refs #7616) --- .../content/table/impl/longline/CatchLonglineUIHandler.java | 2 +- .../content/table/impl/longline/SizeMeasuresTableModel.java | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) 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 9960ce1..2da0324 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 @@ -396,7 +396,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat n("observe.catchlongline.table.weight"), n("observe.catchlongline.table.weight.tip")); - UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, WeightMeasureTypeDto.class)); + UIHelper.setTableColumnRenderer(table, 0, UIHelper.newDecorateTableCellRenderer(renderer, ReferenceDto.class, WeightMeasureTypeDto.class.getSimpleName())); UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); Decorator<ReferenceDto> decorator = ObserveSwingApplicationContext.get().getDecorator(ReferenceDto.class, WeightMeasureTypeDto.class.getSimpleName()); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java index a510d69..0ef1a90 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SizeMeasuresTableModel.java @@ -23,6 +23,8 @@ package fr.ird.observe.ui.content.table.impl.longline; */ import fr.ird.observe.services.dto.longline.SizeMeasureDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; import fr.ird.observe.ui.util.table.EditableTableWithCacheTableModelSupport; /** @@ -36,9 +38,6 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp private static final long serialVersionUID = 1L; public SizeMeasuresTableModel() { - - //FIXME -// super(ObserveServiceHelper.get().getBinderService().getSimpleTopiaBinder(SizeMeasureDto.class)); super(); } @@ -82,12 +81,10 @@ public class SizeMeasuresTableModel extends EditableTableWithCacheTableModelSupp SizeMeasureDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - - //FIXME -// measure.setSizeMeasureType((SizeMeasureTypeDto) aValue); + measure.setSizeMeasureType((ReferentialReferenceDto<SizeMeasureTypeDto>) aValue); break; - case 1: + case 1: measure.setSize((Float) aValue); break; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.