This is an automated email from the git hooks/post-receive script. New commit to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git commit 098b663940cb314765a5be5a4469be2b2fa909cc Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 2 15:54:09 2016 +0100 utilisation de fromEntity et toEntity au lieu de fromBean et toBean --- .../ui/swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../swing/content/cruise/actions/SaveCruiseAction.java | 4 ++-- .../catches/accidental/AccidentalBatchUIHandler.java | 2 +- .../operation/catches/benthos/BenthosBatchUIHandler.java | 4 ++-- .../IndividualObservationBatchUIHandler.java | 2 +- .../catches/marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUIHandler.java | 4 ++-- .../fishing/actions/EditFishingOperationAction.java | 4 ++-- .../fishing/actions/SaveFishingOperationAction.java | 2 +- .../ui/swing/content/program/EditProgramUIHandler.java | 2 +- .../swing/content/program/actions/SaveProgramAction.java | 2 +- .../protocol/actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../protocol/actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 4 ++-- .../protocol/actions/ImportProtocolSpeciesAction.java | 2 +- .../content/protocol/actions/SaveProtocolAction.java | 16 +++------------- .../content/report/actions/GenerateReportAction.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 4 ++-- 21 files changed, 29 insertions(+), 39 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java index 96d9bfa..4a50ced 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java @@ -111,7 +111,7 @@ public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIMode // load existing cruise Cruise cruise = getDataContext().getCruise(); - model.fromBean(cruise); + model.fromEntity(cruise); if (!model.isGearEmpty()) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java index 0ae2a53..96aab10 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java @@ -68,7 +68,7 @@ public class SaveCruiseAction extends LongActionSupport<EditCruiseUIModel, EditC public boolean prepareAction() throws Exception { boolean result = super.prepareAction(); - Cruise bean = getModel().toBean(); + Cruise bean = getModel().toEntity(); if (!TuttiEntities.isNew(bean)) { Cruise oldCruise = persistenceService.getCruise(bean.getId()); @@ -150,7 +150,7 @@ public class SaveCruiseAction extends LongActionSupport<EditCruiseUIModel, EditC TuttiUIContext context = getContext(); EditCruiseUIModel model = getModel(); - Cruise bean = model.toBean(); + Cruise bean = model.toEntity(); Cruise saved; boolean createCruise = TuttiEntities.isNew(bean); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java index 266016f..feebb58 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java @@ -172,7 +172,7 @@ public class AccidentalBatchUIHandler @Override protected boolean isRowValid(AccidentalBatchRowModel row) { - AccidentalBatch batch = row.toBean(); + AccidentalBatch batch = row.toEntity(); NuitonValidatorResult validator = getValidationService().validateEditAccidentalBatch(batch); boolean result = !validator.hasErrorMessagess(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 76ec945..c0fa132 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -1263,7 +1263,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent BenthosBatchRowModel parent = row.getParentBatch(); if (parent != null) { //FIXME Check no need to convert parent weight ? :( - entityToSave.setParentBatch(parent.toBean()); + entityToSave.setParentBatch(parent.toEntity()); } if (TuttiEntities.isNew(entityToSave)) { @@ -1431,7 +1431,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Preconditions.checkNotNull(sampleCategory.getCategoryId()); Preconditions.checkNotNull(sampleCategory.getCategoryValue()); - BenthosBatch catchBean = row.toBean(); + BenthosBatch catchBean = row.toEntity(); // convert weight Float weight = catchBean.getWeight(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java index e692476..7b7a96b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java @@ -193,7 +193,7 @@ public class IndividualObservationBatchUIHandler @Override protected boolean isRowValid(IndividualObservationBatchRowModel row) { - IndividualObservationBatch batch = row.toBean(); + IndividualObservationBatch batch = row.toEntity(); NuitonValidatorResult validator = getValidationService().validateEditIndividualObservationBatch(batch); boolean result = !validator.hasErrorMessagess(); return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java index 954c6b4..c825ed0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java @@ -142,7 +142,7 @@ public class MarineLitterBatchUIHandler extends AbstractTuttiBatchTableUIHandler @Override protected boolean isRowValid(MarineLitterBatchRowModel row) { - MarineLitterBatch batch = row.toBean(); + MarineLitterBatch batch = row.toEntity(); NuitonValidatorResult validator = getValidationService().validateEditMarineLitterBatch(batch); boolean result = !validator.hasErrorMessagess(); return result; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 01475e0..17d0779 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -1267,7 +1267,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Preconditions.checkNotNull(sampleCategory.getCategoryId()); Preconditions.checkNotNull(sampleCategory.getCategoryValue()); - SpeciesBatch catchBean = row.toBean(); + SpeciesBatch catchBean = row.toEntity(); // convert weight Float weight = catchBean.getWeight(); @@ -1278,7 +1278,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec SpeciesBatchRowModel parent = row.getParentBatch(); if (parent != null) { //FIXME Check no need to convert parent weight ? :( - catchBean.setParentBatch(parent.toBean()); + catchBean.setParentBatch(parent.toEntity()); } // apply sample category diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java index bc0190d..0d9fb66 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java @@ -475,7 +475,7 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati if (bean == null) { - editFishingOperationUIModel.fromBean( + editFishingOperationUIModel.fromEntity( FishingOperations.newFishingOperation()); editFishingOperationUIModel.setFishingOperation(bean); @@ -519,7 +519,7 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati ui.getGearComboBox().setData(gears); } - editFishingOperationUIModel.fromBean(bean); + editFishingOperationUIModel.fromEntity(bean); // to be sure combo list will be reloaded editFishingOperationUIModel.setStrata(null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/SaveFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/SaveFishingOperationAction.java index 2029d9e..e5c4d87 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/SaveFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/SaveFishingOperationAction.java @@ -95,7 +95,7 @@ public class SaveFishingOperationAction extends LongActionSupport<EditFishingOpe beanToSave.convertGearShootingCoordinatesToDD(); // save modified fishing operation - FishingOperation toSave = beanToSave.toBean(); + FishingOperation toSave = beanToSave.toEntity(); AbstractCaracteristicTabUIModel[] subModels = handler.getSubModels(); for (AbstractCaracteristicTabUIModel subModel : subModels) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java index 83d9a80..7f8c0ec 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java @@ -80,7 +80,7 @@ public class EditProgramUIHandler extends AbstractTuttiUIHandler<EditProgramUIMo // load existing program Program program = getPersistenceService().getProgram(programId); - model.fromBean(program); + model.fromEntity(program); } listModelIsModify(model); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/actions/SaveProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/actions/SaveProgramAction.java index ee4df00..139765b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/actions/SaveProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/actions/SaveProgramAction.java @@ -52,7 +52,7 @@ public class SaveProgramAction extends LongActionSupport<EditProgramUIModel, Edi EditProgramUIModel model = getModel(); - Program bean = model.toBean(); + Program bean = model.toEntity(); Program saved; if (TuttiEntities.isNew(bean)) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java index 3a21cca..37af49c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java @@ -97,7 +97,7 @@ public class ExportProtocolBenthosAction extends LongActionSupport<EditProtocolU List<SpeciesProtocol> protocols = Lists.newArrayList(); for (EditProtocolSpeciesRowModel row : model.getBenthosRow()) { if (row.isValid()) { - protocols.add(row.toBean()); + protocols.add(row.toEntity()); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java index bae4cab..cc77055 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java @@ -88,7 +88,7 @@ public class ExportProtocolCaracteristicAction extends LongActionSupport<EditPro } // bind to a protocol - TuttiProtocol protocol = getModel().toBean(); + TuttiProtocol protocol = getModel().toEntity(); // export protocol caracteristics ProtocolImportExportService service = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java index d1ecea2..09050c3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java @@ -97,7 +97,7 @@ public class ExportProtocolSpeciesAction extends LongActionSupport<EditProtocolU List<SpeciesProtocol> protocols = Lists.newArrayList(); for (EditProtocolSpeciesRowModel row : model.getSpeciesRow()) { if (row.isValid()) { - protocols.add(row.toBean()); + protocols.add(row.toEntity()); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java index 8755f90..082fa96 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java @@ -94,7 +94,7 @@ public class ImportProtocolBenthosAction extends LongActionSupport<EditProtocolU EditProtocolUIModel model = getModel(); // bind to a protocol - TuttiProtocol protocol = model.toBean(); + TuttiProtocol protocol = model.toEntity(); // import ProtocolImportExportService service = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java index 7e46c87..1282984 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolCaracteristicAction.java @@ -89,7 +89,7 @@ public class ImportProtocolCaracteristicAction extends LongActionSupport<EditPro EditProtocolUIModel model = getModel(); // bind to a protocol - TuttiProtocol protocol = model.toBean(); + TuttiProtocol protocol = model.toEntity(); ProtocolImportExportService service = getContext().getTuttiProtocolImportExportService(); @@ -102,7 +102,7 @@ public class ImportProtocolCaracteristicAction extends LongActionSupport<EditPro try { // rebind to model - model.fromBean(protocol); + model.fromEntity(protocol); } finally { handler.removeDoubleListListeners(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java index 516633f..63f914e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java @@ -94,7 +94,7 @@ public class ImportProtocolSpeciesAction extends LongActionSupport<EditProtocolU EditProtocolUIModel model = getModel(); // bind to a protocol - TuttiProtocol protocol = model.toBean(); + TuttiProtocol protocol = model.toEntity(); // import ProtocolImportExportService service = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/SaveProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/SaveProtocolAction.java index a4cb330..6f45997 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/SaveProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/SaveProtocolAction.java @@ -28,7 +28,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.persistence.entities.protocol.Zone; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolCaracteristicsRowModel; @@ -37,7 +36,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; -import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.ZoneUIModel; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -75,7 +73,7 @@ public class SaveProtocolAction extends LongActionSupport<EditProtocolUIModel, E PersistenceService persistenceService = context.getPersistenceService(); - TuttiProtocol bean = model.toBean(); + TuttiProtocol bean = model.toEntity(); Collection<EditProtocolCaracteristicsRowModel> protocolCaracteristicMappingRows = getUI().getModel().getCaracteristicMappingRows(); List<CaracteristicMappingRow> caracteristicMappingRows = new ArrayList<CaracteristicMappingRow>(); @@ -101,7 +99,7 @@ public class SaveProtocolAction extends LongActionSupport<EditProtocolUIModel, E for (EditProtocolSpeciesRowModel row : model.getSpeciesRow()) { if (row.isValid()) { - SpeciesProtocol protocol = row.toBean(); + SpeciesProtocol protocol = row.toEntity(); speciesProtocols.add(protocol); } } @@ -111,20 +109,12 @@ public class SaveProtocolAction extends LongActionSupport<EditProtocolUIModel, E for (EditProtocolSpeciesRowModel row : model.getBenthosRow()) { if (row.isValid()) { - SpeciesProtocol protocol = row.toBean(); + SpeciesProtocol protocol = row.toEntity(); benthosProtocols.add(protocol); } } bean.setBenthos(benthosProtocols); - List<Zone> zones = Lists.newArrayList(); - - for (Zone zone : model.getZone()) { - Zone z = ((ZoneUIModel) zone).toEntity(); - zones.add(z); - } - bean.setZone(zones); - if (log.isDebugEnabled()) { log.debug("protocol id to save: " + bean.getId()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/GenerateReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/GenerateReportAction.java index 53f4b21..e5e0b8a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/GenerateReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/GenerateReportAction.java @@ -71,7 +71,7 @@ public class GenerateReportAction extends LongActionSupport<ReportUIModel, Repor progressionModel.increments(t("tutti.generateReport.action.computeNbSteps")); - ReportGenerationRequest reportGenerationRequest = getModel().toBean(); + ReportGenerationRequest reportGenerationRequest = getModel().toEntity(); ReportGenerationService reportGenerationService = getContext().getReportGenerationService(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditCruiseInValidationUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditCruiseInValidationUIAction.java index 08ba57f..edfa12a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditCruiseInValidationUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditCruiseInValidationUIAction.java @@ -83,7 +83,7 @@ public class EditCruiseInValidationUIAction extends LongActionSupport<ValidateCr } else if (!propertiesToIgnore.contains(evt.getPropertyName())) { - Cruise cruise = model.toBean(); + Cruise cruise = model.toEntity(); NuitonValidatorResult validationResult = validationService.validateCruiseCruise(cruise); ValidateCruiseUIModel uiModel = getModel(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditFishingOperationInValidationUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditFishingOperationInValidationUIAction.java index 3ed5596..473d689 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditFishingOperationInValidationUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/EditFishingOperationInValidationUIAction.java @@ -88,7 +88,7 @@ public class EditFishingOperationInValidationUIAction extends LongActionSupport< } else if (!propertiesToIgnore.contains(evt.getPropertyName())) { model.convertGearShootingCoordinatesToDD(); - FishingOperation operation = model.toBean(); + FishingOperation operation = model.toEntity(); NuitonValidatorResult validationResult = validationService.validateCruiseOperation(operation); ValidateCruiseUIModel uiModel = getModel(); @@ -138,7 +138,7 @@ public class EditFishingOperationInValidationUIAction extends LongActionSupport< } } else if (!propertiesToIgnore.contains(evt.getPropertyName())) { - CatchBatch catchBatch = model.toBean(); + CatchBatch catchBatch = model.toEntity(); NuitonValidatorResult validationResult = validationService.validateCruiseOperation(catchBatch); ValidateCruiseUIModel uiModel = getModel(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.