This is an automated email from the git hooks/post-receive script. New commit to branch feature/7589-PSverfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit 8a29280ddcd81dbdea2724eca18837d89ad0a456 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:19:06 2016 +0100 Dans la référence d'un caractéristique d'un equipement envoyer l'id de son type et non son libellé. --- .../seine/GearUseFeatureMeasurementCellEditor.java | 40 ++++++++++++++++++---- .../GearUseFeatureMeasurementCellRenderer.java | 7 +--- .../referential/GearCaracteristicBinder.java | 4 +-- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java index 437e109..a6c2c72 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellEditor.java @@ -23,18 +23,18 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; import fr.ird.observe.services.dto.referential.ReferentialReference; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; -import javax.swing.AbstractCellEditor; import javax.swing.JTable; import javax.swing.border.LineBorder; +import javax.swing.event.CellEditorListener; import javax.swing.table.TableCellEditor; import java.awt.Color; import java.awt.Component; +import java.util.EventObject; import java.util.Map; import java.util.TreeMap; @@ -44,7 +44,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeatureMeasurementCellEditor extends AbstractCellEditor implements TableCellEditor { +public class GearUseFeatureMeasurementCellEditor implements TableCellEditor { private static final long serialVersionUID = 1L; @@ -66,6 +66,36 @@ public class GearUseFeatureMeasurementCellEditor extends AbstractCellEditor impl return editor.getCellEditorValue(); } + @Override + public boolean isCellEditable(EventObject anEvent) { + return true; + } + + @Override + public boolean shouldSelectCell(EventObject anEvent) { + return editor.shouldSelectCell(anEvent); + } + + @Override + public boolean stopCellEditing() { + return editor.stopCellEditing(); + } + + @Override + public void cancelCellEditing() { + editor.cancelCellEditing(); + } + + @Override + public void addCellEditorListener(CellEditorListener l) { + editor.addCellEditorListener(l); + } + + @Override + public void removeCellEditorListener(CellEditorListener l) { + editor.removeCellEditorListener(l); + } + public Map<String, TableCellEditor> getEditorsByGearCaracteristicId(JTable table) { if (editorsByGearCaracteristicId == null) { editorsByGearCaracteristicId = new TreeMap<String, TableCellEditor>(); @@ -127,10 +157,8 @@ public class GearUseFeatureMeasurementCellEditor extends AbstractCellEditor impl editor = table.getDefaultEditor(Object.class); } else { - ReferentialReference<GearCaracteristicTypeDto> gearCaracteristicTypeRef = - (ReferentialReference<GearCaracteristicTypeDto>) caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - String gearCaracteristicTypeId = gearCaracteristicTypeRef.getId(); + String gearCaracteristicTypeId = (String) caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); Map<String, TableCellEditor> editors = getEditorsByGearCaracteristicId(table); editor = editors.get(gearCaracteristicTypeId); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java index 370b970..5fd78dd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeatureMeasurementCellRenderer.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.table.impl.seine; */ import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.ui.UIHelper; @@ -96,11 +95,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = table.getDefaultRenderer(Object.class); } else { - ReferentialReference<GearCaracteristicTypeDto> gearCaracteristicTypeRef = - (ReferentialReference<GearCaracteristicTypeDto>)caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); - - - String gearCaracteristicTypeId = gearCaracteristicTypeRef.getId(); + String gearCaracteristicTypeId = (String) caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java index 7e85469..03bc09c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/GearCaracteristicBinder.java @@ -44,7 +44,7 @@ public class GearCaracteristicBinder extends ReferentialBinderSupport<GearCaract return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), - getLabel(referentialLocale, entity.getGearCaracteristicType())); + entity.getGearCaracteristicType().getTopiaId()); } @@ -54,7 +54,7 @@ public class GearCaracteristicBinder extends ReferentialBinderSupport<GearCaract return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), - getLabel(referentialLocale, dto.getGearCaracteristicType())); + dto.getGearCaracteristicType().getId()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.