This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 150c7e63c7def9b070ac7344cbe07b38cae1049d Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Jun 28 16:48:31 2016 +0200 Fix delete import for mooring --- .../removedata/strategy/AcousticRemoveDataStrategy.java | 4 +++- .../strategy/MooringAcousticRemoveDataStrategy.java | 6 +++--- .../echobase/ui/actions/removeData/ConfirmDelete.java | 15 ++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java index 4288f31..98710e2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/AcousticRemoveDataStrategy.java @@ -111,7 +111,9 @@ public class AcousticRemoveDataStrategy extends AbstractRemoveDataStrategy<Voyag } // remove it from the dataAcquisition DataProcessing dataProcessing = persistenceService.getDataProcessingContainsCell(cell); - dataProcessing.removeCell(cell); + if (dataProcessing != null) { + dataProcessing.removeCell(cell); + } // remove cell persistenceService.deleteCell(cell); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java index 8befac9..155f0b4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringAcousticRemoveDataStrategy.java @@ -28,8 +28,6 @@ import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.DataAcquisition; import fr.ifremer.echobase.entities.data.DataProcessing; import fr.ifremer.echobase.entities.data.Mooring; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.Voyage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; @@ -106,7 +104,9 @@ public class MooringAcousticRemoveDataStrategy extends AbstractRemoveDataStrateg } // remove it from the dataAcquisition DataProcessing dataProcessing = persistenceService.getDataProcessingContainsCell(cell); - dataProcessing.removeCell(cell); + if (dataProcessing != null) { + dataProcessing.removeCell(cell); + } // remove cell persistenceService.deleteCell(cell); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java index 5cc6d86..8d75a31 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java @@ -77,11 +77,8 @@ public class ConfirmDelete extends AbstractConfigureAction<RemoveDataConfigurati protected void prepareInputAction(RemoveDataConfiguration model) { importTypes = decoratorService.decorateEnums(ImportType.values()); - importLogs = Lists.newArrayList(); - Decorator<Voyage> decorator = decoratorService.getDecorator(Voyage.class, null); - for (String id : model.getImportLogIds()) { if (log.isInfoEnabled()) { log.info("Load import log " + id); @@ -89,14 +86,18 @@ public class ConfirmDelete extends AbstractConfigureAction<RemoveDataConfigurati Optional<ImportLog> optionalImportLog = userDbPersistenceService.getOptionalImportLog(id); if (optionalImportLog.isPresent()) { - ImportLog importLog = optionalImportLog.get(); - TopiaEntity entity = userDbPersistenceService.getEntity(importLog.getEntityId()); - String voyage = decorator.toString(entity); + String entityDecorated = ""; + String entityId = importLog.getEntityId(); + if (entityId != null) { + TopiaEntity entity = userDbPersistenceService.getEntity(entityId); + entityDecorated = decoratorService.decorate(entity, null); + } + String importType = importTypes.get(importLog.getImportType().name()); String result = t("echobase.common.importLogToDelete", - voyage, + entityDecorated, importType, importLog.getImportDate()); importLogs.add(result); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.