branch feature/7590-verfiEcranDesEquipementsDUneMarée created (now 8c23f95)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7590-verfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git at 8c23f95 - 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 70331b2 Ajout de trace dans les appels des services. new a0ac5c2 Dans la référence d'un caractéristique d'un equipement envoyer l'id de son type et non son libellé. new ac6c1e3 charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau new 8c23f95 - 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 8c23f957e56db9b133f3bc90070380337113b240 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:28:49 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 ac6c1e3ec5041585f0f820d0df398b5e08f13bed Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:23:16 2016 +0100 charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau commit a0ac5c2ec63bcaffc8cc31f96d32f9a3ace0859a 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 70331b2c3904b254cdeba08e5f2c1f7703c10840 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 09:22:46 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/7590-verfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit 70331b2c3904b254cdeba08e5f2c1f7703c10840 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 09:22:46 2016 +0100 Ajout de trace dans les appels des services. --- .../service/longline/TripLonglineGearUseServiceTopia.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java index cb7770c..bd16a1b 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java @@ -28,14 +28,21 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia implements TripLonglineGearUseService { + private static final Log log = LogFactory.getLog(TripLonglineGearUseServiceTopia.class); + @Override public Form<TripLonglineGearUseDto> loadForm(String tripLonglineId) { + if (log.isTraceEnabled()) { + log.trace("loadForm(" + tripLonglineId + ")"); + } TripLongline tripLongline = loadEntity(TripLonglineGearUseDto.class, tripLonglineId); @@ -50,6 +57,9 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme @Override public SaveResultDto save(TripLonglineGearUseDto dto) { + if (log.isTraceEnabled()) { + log.trace("save(" + dto.getId() + ")"); + } TripLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); -- 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/7590-verfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit a0ac5c2ec63bcaffc8cc31f96d32f9a3ace0859a 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/7590-verfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit ac6c1e3ec5041585f0f820d0df398b5e08f13bed Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:23:16 2016 +0100 charger les caractéristique dans le bean d'edition avant la mis a jour du bean du tableau --- .../impl/longline/GearUseFeaturesLonglineTableModel.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java index 571789c..bc2c615 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.content.table.impl.longline; * #L% */ +import com.google.common.collect.Sets; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDtos; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; @@ -77,21 +78,20 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon @Override public void updateRowFromEditBean() { - super.updateRowFromEditBean(); - GearUseFeaturesLonglineUIModel model = getModel(); int editingRow = getSelectedRow(); GearUseFeaturesLonglineDto rowBean = getRowBean(); GearUseFeaturesMeasurementLonglinesTableModel measurementsTableModel = model.getMeasurementsTableModel(); + List<GearUseFeaturesMeasurementLonglineDto> measurements; + if (rowBean.getId() == null && CollectionUtils.isEmpty(measurementsTableModel.getCacheForRow(editingRow))) { // new gear usage, add default measurements ReferentialReference<GearDto> gear = rowBean.getGear(); - List<GearUseFeaturesMeasurementLonglineDto> measurements = - gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getId()); + measurements = gearUseFeaturesLonglineUIHandler.getDefaultGearUseFeaturesMeasurementLongline(gear.getId()); if (log.isInfoEnabled()) { log.info("Create mode, use default measurements: " + measurements.size()); } @@ -105,9 +105,13 @@ public class GearUseFeaturesLonglineTableModel extends ContentTableModel<TripLon // 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/7590-verfiEcranDesEquipementsDUneMarée in repository tutti. See http://git.codelutin.com/tutti.git commit 8c23f957e56db9b133f3bc90070380337113b240 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Mar 3 10:28:49 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. --- .../longline/GearUseFeaturesLonglineUIHandler.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/longline/GearUseFeaturesLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 449c96a..f8e0c70 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDt import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDtos; 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; @@ -222,6 +223,10 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip public GearUseFeaturesMeasurementLonglineDto apply(ReferentialReference input) { GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto(); measurementLonglineDto.setGearCaracteristic(input); + String gearCaracterisiticTypeId = (String) input.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + if (GearCaracteristicTypeDtos.isBoolean(gearCaracterisiticTypeId)) { + measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); + } return measurementLonglineDto; } })); @@ -349,12 +354,9 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip 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)); GearUseFeaturesMeasurementLonglinesTableModel tableModel = getModel().getMeasurementsTableModel(); @@ -407,6 +409,15 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } @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