This is an automated email from the git hooks/post-receive script. New change to branch feature/7589-PSverfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git at 076d2bb - Initialisé les caractéristiques de type Booléen à Faux (et non a null), - charger la liste des caractéristiques dans l'eidteur des caratéristiques à partir du cache, - vider la tableau des caractéristiques a l'annulation des modifications. This branch includes the following new commits: new b425fc2 Ajout de trace dans les appels des services. new 8a29280 Dans la référence d'un caractéristique d'un equipement envoyer l'id de son type et non son libellé. new ec1f52f charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau new 076d2bb - Initialisé les caractéristiques de type Booléen à Faux (et non a null), - charger la liste des caractéristiques dans l'eidteur des caratéristiques à partir du cache, - vider la tableau des caractéristiques a l'annulation des modifications. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 076d2bbaa3b6e4c05b806f85d3173a5d4758271f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 11:12:19 2016 +0100 - Initialisé les caractéristiques de type Booléen à Faux (et non a null), - charger la liste des caractéristiques dans l'eidteur des caratéristiques à partir du cache, - vider la tableau des caractéristiques a l'annulation des modifications. commit ec1f52fd4056fa2f85ab4301f385b72cede0fafc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:49:09 2016 +0100 charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau 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é. commit b425fc29a7d01ef8b0434ff411013075baffb5a9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:42:22 2016 +0100 Ajout de trace dans les appels des services. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 b425fc29a7d01ef8b0434ff411013075baffb5a9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:42:22 2016 +0100 Ajout de trace dans les appels des services. --- .../services/service/seine/TripSeineGearUseServiceTopia.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java index 0fd9082..a7a91f2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java @@ -28,14 +28,21 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements TripSeineGearUseService { + private static final Log log = LogFactory.getLog(TripSeineGearUseServiceTopia.class); + @Override public Form<TripSeineGearUseDto> loadForm(String tripSeineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + tripSeineId + ")"); + } TripSeine tripSeine = loadEntity(TripSeineGearUseDto.class, tripSeineId); @@ -50,6 +57,9 @@ public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements @Override public SaveResultDto save(TripSeineGearUseDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } TripSeine entity = loadOrCreateEntityAndCheckLastUpdate(dto); copyDataDtoToEntity(dto, entity); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 ec1f52fd4056fa2f85ab4301f385b72cede0fafc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:49:09 2016 +0100 charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau --- .../table/impl/seine/GearUseFeaturesSeineTableModel.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java index eaf1a34..a585b3e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.table.impl.seine; * #L% */ +import com.google.common.collect.Sets; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; @@ -77,21 +78,20 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineG @Override public void updateRowFromEditBean() { - super.updateRowFromEditBean(); - GearUseFeaturesSeineUIModel model = getModel(); int editingRow = getSelectedRow(); GearUseFeaturesSeineDto rowBean = getRowBean(); GearUseFeaturesMeasurementSeinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); + List<GearUseFeaturesMeasurementSeineDto> measurements; + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements ReferentialReference<GearDto> gear = rowBean.getGear(); - List<GearUseFeaturesMeasurementSeineDto> measurements = - gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getId()); + measurements = gearUseFeaturesSeineUIHandler.getDefaultGearUseFeaturesMeasurementSeine(gear.getId()); if (log.isInfoEnabled()) { log.info("Create mode, use default measurements: " + measurements.size()); } @@ -106,8 +106,14 @@ public class GearUseFeaturesSeineTableModel extends ContentTableModel<TripSeineG // store current measurements for the selected row measurementsTableModel.storeInCacheForRow(editingRow); + measurements = measurementsTableModel.getData(); } + rowBean.setGearUseFeaturesMeasurement(Sets.newLinkedHashSet(measurements)); + + super.updateRowFromEditBean(); + + } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 076d2bbaa3b6e4c05b806f85d3173a5d4758271f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 11:12:19 2016 +0100 - Initialisé les caractéristiques de type Booléen à Faux (et non a null), - charger la liste des caractéristiques dans l'eidteur des caratéristiques à partir du cache, - vider la tableau des caractéristiques a l'annulation des modifications. --- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index e5ce0b0..aa1162c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -30,6 +30,7 @@ import fr.ird.observe.db.DataContext; import fr.ird.observe.db.constants.DataContextType; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -219,6 +220,10 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei @Override public GearUseFeaturesMeasurementSeineDto apply(ReferentialReference input) { GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); + String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { + measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); + } measurementSeineDto.setGearCaracteristic(input); return measurementSeineDto; } @@ -346,12 +351,9 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei ReferentialReferenceDecorator<GearCaracteristicDto> decorator = getReferentialReferenceDecorator(GearCaracteristicDto.class); - //FIXME Load data on init -// ReferentialService referentialService = ObserveSwingApplicationContext.get().newService(ReferentialService.class); -// Set<ReferentialReference<GearCaracteristicDto>> gearCaracteristicReferences = getModel().getReferentialReferences(GearCaracteristicDto.class, ""); -// List<ReferentialReference<GearCaracteristicDto>> gearCaracteristics = Lists.newArrayList(gearCaracteristicReferences); + List<ReferentialReference<GearCaracteristicDto>> caracteristics = Lists.newArrayList(getDataSource().getReferentialReferences(GearCaracteristicDto.class)); - UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(Collections.<ReferentialReference<GearCaracteristicDto>>emptyList(), decorator)); + UIHelper.setTableColumnEditor(table, 0, ContentUIInitializer.newDataColumnEditor(caracteristics, decorator)); UIHelper.setTableColumnEditor(table, 1, new GearUseFeatureMeasurementCellEditor(0)); GearUseFeaturesMeasurementSeinesTableModel tableModel = getModel().getMeasurementsTableModel(); @@ -404,6 +406,15 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override + public void resetEditUI() { + + getModel().getMeasurementsTableModel().clear(); + + super.resetEditUI(); + + } + + @Override protected ContentMode getContentMode(DataContext dataContext) { // par defaut, on suppose qu'on peut afficher les données -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm