Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5c69590b by tchemit at 2020-04-18T10:37:12+02:00 Do not clean temporary files if root directory does not exist - - - - - c3409a74 by tchemit at 2020-04-18T10:37:14+02:00 Suppression de l'onglet résumé sur les assistants (Report v8 → v7) - Closes #1468 - - - - - 17 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java-enumeration.getter - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeModel.java - − client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUI.jaxx - − client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUI.jcss - − client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - services/src/main/java/fr/ird/observe/services/service/CleanTemporaryFilesTask.java Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -368,7 +368,7 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre } public File newBackupDataFile() { - return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, getBuildVersion(), new Date())); + return new File(getBackupDirectory(), String.format(BACKUP_DB_PATTERN, getBuildVersion().toString().replaceAll("\\.", "_"), new Date())); } public void saveForUser() { ===================================== client-core/src/main/i18n/getters/java-enumeration.getter ===================================== @@ -14,8 +14,6 @@ observe.constant.AdminStep.SAVE_LOCAL observe.constant.AdminStep.SAVE_LOCAL.description observe.constant.AdminStep.SELECT_DATA observe.constant.AdminStep.SELECT_DATA.description -observe.constant.AdminStep.SHOW_RESUME -observe.constant.AdminStep.SHOW_RESUME.description observe.constant.AdminStep.SYNCHRONIZE observe.constant.AdminStep.SYNCHRONIZE.description observe.constant.AdminStep.VALIDATE ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -247,13 +247,6 @@ observe.actions.validate.validator.message.header observe.actions.validate.validator.message.header.tip observe.actions.validate.validator.scope.header observe.actions.validate.validator.scope.header.tip -observe.admin.resume.no.operation.done -observe.admin.resume.operation.canceled -observe.admin.resume.operation.done -observe.admin.resume.operation.failed -observe.admin.resume.operation.need.fix -observe.admin.resume.operation.not.started -observe.admin.resume.operation.running observe.backup.done observe.backup.start observe.choice.cancel ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -724,7 +724,6 @@ observe.common.directory observe.common.file observe.common.global.progression.description observe.common.ocean -observe.common.operation.resume observe.common.resume observe.common.sizeMeasureType observe.common.species ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java ===================================== @@ -30,7 +30,6 @@ import fr.ird.observe.client.ui.admin.export.ExportModel; import fr.ird.observe.client.ui.admin.export.ExportUI; import fr.ird.observe.client.ui.admin.report.ReportModel; import fr.ird.observe.client.ui.admin.report.ReportUI; -import fr.ird.observe.client.ui.admin.resume.ShowResumeUI; import fr.ird.observe.client.ui.admin.save.SaveLocalModel; import fr.ird.observe.client.ui.admin.save.SaveLocalUI; import fr.ird.observe.client.ui.admin.synchronize.data.DataSynchroModel; @@ -218,13 +217,6 @@ public enum AdminStep implements WizardExtStep { DbMode.USE_LOCAL, DbMode.USE_REMOTE, DbMode.USE_SERVER - ), - - /** pour afficher après les opération un ecran de résumé */ - SHOW_RESUME( - null, - ShowResumeUI.class, - false ); private final String iconName; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.client.ui.admin; import fr.ird.observe.client.ObserveRunner; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.db.ObserveSwingDataSource; -import fr.ird.observe.client.ui.admin.resume.ShowResumeUI; import fr.ird.observe.client.ui.content.ref.usage.UsageForDisplayUI; import fr.ird.observe.client.ui.util.ProgressModel; import fr.ird.observe.client.ui.util.UIHelper; @@ -161,13 +160,8 @@ public class AdminTabUIHandler<U extends AdminTabUI> { } public void sendMessage(String message) { - AdminStep step = ui.getStep(); ui.addMessage(step, message); - ShowResumeUI resumeUI = (ShowResumeUI) parentUI.getStepUI(AdminStep.SHOW_RESUME); - if (resumeUI != null) { - resumeUI.addMessage(step, message); - } } public String getProgressString(int currentStep, int nbStep) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.client.ui.admin.config.ConfigUI; import fr.ird.observe.client.ui.admin.config.SelectDataUI; import fr.ird.observe.client.ui.admin.consolidate.ConsolidateUI; import fr.ird.observe.client.ui.admin.export.ExportUI; -import fr.ird.observe.client.ui.admin.resume.ShowResumeUI; import fr.ird.observe.client.ui.admin.save.SaveLocalUI; import fr.ird.observe.client.ui.admin.synchronize.data.DataSynchroUI; import fr.ird.observe.client.ui.admin.synchronize.referential.legacy.SynchronizeUI; @@ -36,8 +35,8 @@ import fr.ird.observe.client.ui.admin.synchronize.referential.ng.ReferentialSync import fr.ird.observe.client.ui.admin.validate.ValidateUI; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.I18nEnumHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUtil; @@ -302,12 +301,6 @@ public class AdminUIHandler implements UIHandler<AdminUI> { SaveLocalUI tabUI = (SaveLocalUI) ui.getStepUI(AdminStep.SAVE_LOCAL); tabUI.getHandler().updateText(); } - if (c != null && c.getStep() == AdminStep.SHOW_RESUME) { - - // on met a jour le resumé des opérations - ShowResumeUI showResumeUI = (ShowResumeUI) ui.getStepUI(AdminStep.SHOW_RESUME); - showResumeUI.getHandler().updateText(); - } // selection du nouvel onglet int index = ui.tabs.indexOfComponent(c); @@ -386,14 +379,6 @@ public class AdminUIHandler implements UIHandler<AdminUI> { itr = UIHelper.newTabbedPaneIterator(ui.getTabs()); } - if (selected != null && selected.getStep() == AdminStep.SHOW_RESUME) { - - // rien a faire sur le dernier onglet - if (log.isDebugEnabled()) { - log.debug("We are on last step (resume), nothing to do."); - } - return; - } boolean[] accessibleSteps = ui.getModel().getAccessibleSteps(); if (log.isDebugEnabled()) { log.debug("Accessibles step : " + Arrays.toString(accessibleSteps)); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java ===================================== @@ -27,14 +27,13 @@ import fr.ird.observe.client.ui.admin.config.SelectDataModel; import fr.ird.observe.client.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.client.ui.admin.export.ExportModel; import fr.ird.observe.client.ui.admin.report.ReportModel; -import fr.ird.observe.client.ui.admin.resume.ShowResumeModel; import fr.ird.observe.client.ui.admin.save.SaveLocalModel; import fr.ird.observe.client.ui.admin.synchronize.data.DataSynchroModel; import fr.ird.observe.client.ui.admin.synchronize.referential.legacy.SynchronizeModel; import fr.ird.observe.client.ui.admin.synchronize.referential.ng.ReferentialSynchroModel; import fr.ird.observe.client.ui.admin.validate.ValidateModel; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtModel; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; @@ -68,8 +67,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { protected final SelectDataModel selectDataModel = new SelectDataModel(); - protected final ShowResumeModel showResumeModel = new ShowResumeModel(); - /** la liste des modes disponibles en entrée */ protected final EnumSet<DbMode> availableIncomingModes; @@ -158,10 +155,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { return configModel; } - public ShowResumeModel getShowResumeModel() { - return showResumeModel; - } - public SelectDataModel getSelectDataModel() { return selectDataModel; } @@ -402,8 +395,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { return getSynchronizeReferentielModel().validate(this, step); case SAVE_LOCAL: return getSaveLocalModel().validate(this, step); - case SHOW_RESUME: - return getShowResumeModel().validate(this); } return true; } @@ -416,8 +407,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { // toujours l'onglet de configuration des opérations universe.add(AdminStep.CONFIG); - // pour savoir si on doit ajouter l'onglet de résumé (cas par défaut) - boolean needResume = true; if (!operations.isEmpty()) { if (needSelect()) { @@ -457,9 +446,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (containsOperation(AdminStep.REPORT)) { universe.add(AdminStep.REPORT); - - // pas de page de resume - needResume = false; } updateSaveLocalOperation(); @@ -475,12 +461,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { // ajout de l'onglet de sauvegarde de la base distante universe.add(AdminStep.EXPORT_DATA); } - - if (needResume) { - - // ajout d'un onglet de resume - universe.add(AdminStep.SHOW_RESUME); - } } return universe.toArray(new AdminStep[0]); } @@ -490,6 +470,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { for (AdminStep s : operations) { if (s.isNeedSave()) { shouldAdd = true; + break; } } if (shouldAdd) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeModel.java deleted ===================================== @@ -1,43 +0,0 @@ -package fr.ird.observe.client.ui.admin.resume; - -/*- - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.client.ui.admin.AdminActionModel; -import fr.ird.observe.client.ui.admin.AdminStep; -import fr.ird.observe.client.ui.admin.AdminUIModel; - -/** - * Created on 28/11/16. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 6.0 - */ -public class ShowResumeModel extends AdminActionModel { - public ShowResumeModel() { - super(AdminStep.SHOW_RESUME); - } - - public boolean validate(AdminUIModel uiModel) { - return true; - } -} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUI.jaxx deleted ===================================== @@ -1,84 +0,0 @@ -<!-- - #%L - ObServe :: Client core - %% - Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> - -<!-- **************************************** --> -<!-- L'écran de résumé des opérations passées --> -<!-- **************************************** --> - -<fr.ird.observe.client.ui.admin.AdminTabUI> - - <import> - fr.ird.observe.client.ui.util.UIHelper - fr.ird.observe.client.ui.admin.AdminActionModel - fr.ird.observe.client.ui.admin.AdminUI - fr.ird.observe.client.ui.admin.AdminStep - fr.ird.observe.client.ui.admin.AdminTabUI - - java.awt.Dimension - </import> - - <ShowResumeModel id='stepModel' initializer='getModel().getShowResumeModel()'/> - - <script><![CDATA[ - -@Override -public void destroy() { - super.destroy(); - globalProgression.setText(""); - resume.setText(""); -} - -@Override -public void addMessage(AdminStep step, String text) { - getHandler().addMessage(step, text); -} -]]> - </script> - - <JPanel id='PENDING_content'> - <Table constraints='BorderLayout.CENTER' fill='both' weightx='1' - weighty='1'> - <row> - <cell> - <JScrollPane id='resumePane'> - <JTextArea id='resume'/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JScrollPane id='globalProgressionPane' columnHeaderView='{globalProgressionTop}'> - <JTextArea id='globalProgression'/> - <JToolBar id='globalProgressionTop'> - <JLabel id='globalProgressionTopLabel'/> - <javax.swing.Box.Filler - constructorParams='UIHelper.newMinDimension(), UIHelper.newMinDimension(), UIHelper.newMaxXDimension()'/> - <JButton id="globalProgressionCopyToClipBoard" - onActionPerformed='UIHelper.copyToClipBoard(globalProgression.getText())'/> - </JToolBar> - </JScrollPane> - </cell> - </row> - </Table> - </JPanel> - -</fr.ird.observe.client.ui.admin.AdminTabUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUI.jcss deleted ===================================== @@ -1,64 +0,0 @@ -/* - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -#PENDING_content { - layout:{new BorderLayout()}; -} - -#resumePane { - minimumSize:{new Dimension(0,0)}; - horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}; - columnHeaderView:{UIHelper.newLabel(t("observe.common.operation.resume") ,"wizard-message", 10)}; -} - -#resume { - editable:false; - focusable:true; -} - -#globalProgressionPane { - minimumSize:{new Dimension(0,0)}; - horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED}; -} - -#globalProgression { - font-size:10; - focusable:true; - lineWrap:false; - editable:false; -} - -#globalProgressionTop { - floatable:false; -} - -#globalProgressionTopLabel { - text:"observe.common.global.progression.description"; - actionIcon:"wizard-message"; -} - -#globalProgressionCopyToClipBoard { - toolTipText:"observe.action.copy.to.clipBoard"; - actionIcon:"report-copy"; - mnemonic:C; -} - ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUIHandler.java deleted ===================================== @@ -1,91 +0,0 @@ -/* - * #%L - * ObServe :: Client core - * %% - * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.client.ui.admin.resume; - -import fr.ird.observe.client.ui.admin.AdminStep; -import fr.ird.observe.client.ui.admin.AdminTabUIHandler; -import fr.ird.observe.client.ui.admin.AdminUIModel; -import fr.ird.observe.client.ui.util.UIHelper; -import fr.ird.observe.dto.I18nEnumHelper; -import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Le controleur des onglets. - * - * @author Tony Chemit - dev@tchemit.fr - * @since 1.4 - */ -public class ShowResumeUIHandler extends AdminTabUIHandler<ShowResumeUI> implements UIHandler<ShowResumeUI> { - - @Override - public void afterInit(ShowResumeUI ui) { - super.afterInit(ui); - UIHelper.setLayerUI(ui.getContent(), null); - } - - public void updateText() { - AdminUIModel model = ui.getModel(); - StringBuilder buffer = new StringBuilder(); - if (!model.isWasStarted()) { - buffer.append(t("observe.admin.resume.no.operation.done")); - } else { - for (AdminStep s : model.getOperations()) { - WizardState state = model.getStepState(s); - String stateStr = ""; - switch (state) { - case CANCELED: - stateStr = t("observe.admin.resume.operation.canceled"); - break; - case FAILED: - stateStr = t("observe.admin.resume.operation.failed"); - break; - case NEED_FIX: - stateStr = t("observe.admin.resume.operation.need.fix"); - break; - case PENDING: - stateStr = t("observe.admin.resume.operation.not.started"); - break; - case RUNNING: - stateStr = t("observe.admin.resume.operation.running"); - break; - case SUCCESSED: - stateStr = t("observe.admin.resume.operation.done"); - break; - } - buffer.append("\n\n"); - buffer.append(I18nEnumHelper.getLabel(s)); - buffer.append(" : "); - buffer.append(stateStr); - buffer.append("."); - } - buffer.append("\n\n"); - } - getUi().getResume().setText(buffer.toString()); - } - - public void addMessage(AdminStep step, String text) { - getUi().getGlobalProgression().append(I18nEnumHelper.getLabel(step) + " - " + text + "\n"); - } -} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java ===================================== @@ -475,16 +475,10 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements private void generateReportFile(ValidateModel validationModel) throws IOException { File reportFile = validationModel.getReportFile(); - if (log.isInfoEnabled()) { - log.info("save report in " + reportFile); - } - + log.info(String.format("save report in %s", reportFile)); validationModel.setDecoratorService(getDecoratorService()); - String content = ObserveSwingApplicationContext.get().getTextGenerator().getValidationReport(validationModel); - log.debug(content); - addMessage(AdminStep.SHOW_RESUME, content); FileUtils.write(reportFile, content, Charsets.UTF_8.name()); } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -319,13 +319,6 @@ observe.actions.validate.validator.message.header=Message observe.actions.validate.validator.message.header.tip=Message observe.actions.validate.validator.scope.header=... observe.actions.validate.validator.scope.header.tip=Type of message -observe.admin.resume.no.operation.done=No operation done. -observe.admin.resume.operation.canceled=operation canceled -observe.admin.resume.operation.done=operation done -observe.admin.resume.operation.failed=operation failed -observe.admin.resume.operation.need.fix=operation need fix -observe.admin.resume.operation.not.started=operation not started -observe.admin.resume.operation.running=operation is running... observe.backup.done=[%s] Auto backup done (in %s) observe.backup.start=[%s] Start auto backup observe.choice.cancel=Cancel @@ -1688,7 +1681,6 @@ observe.common.no.unit=No unit observe.common.nocode=Nocode observe.common.none=None observe.common.ocean=Ocean -observe.common.operation.resume=Summary of operations observe.common.resume=Summary observe.common.saveFile.overwrite=file alreayd exists, would you like to overwrite it? observe.common.saveFile.overwrite.cancel=Cancel @@ -1829,8 +1821,6 @@ observe.constant.AdminStep.SAVE_LOCAL=Save local database observe.constant.AdminStep.SAVE_LOCAL.description=Save modifcations on local database observe.constant.AdminStep.SELECT_DATA=Select data observe.constant.AdminStep.SELECT_DATA.description=Select data for operations -observe.constant.AdminStep.SHOW_RESUME=Summary -observe.constant.AdminStep.SHOW_RESUME.description=Summary of operations observe.constant.AdminStep.SYNCHRONIZE=Update referential observe.constant.AdminStep.SYNCHRONIZE.description=Update referential observe.constant.AdminStep.VALIDATE=Validation ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -319,13 +319,6 @@ observe.actions.validate.validator.message.header=Mensaje observe.actions.validate.validator.message.header.tip=Texto del mensaje observe.actions.validate.validator.scope.header=... observe.actions.validate.validator.scope.header.tip=Tipo de mensaje -observe.admin.resume.no.operation.done=Ninguna operación realizada -observe.admin.resume.operation.canceled=Operación cancelada -observe.admin.resume.operation.done=Operación realizada -observe.admin.resume.operation.failed=Operación no realizada -observe.admin.resume.operation.need.fix=La operación necesita correcciones -observe.admin.resume.operation.not.started=Operación no iniciada -observe.admin.resume.operation.running=Operación en curso... observe.backup.done=[%s] Copia de seguridad automática realizada (en %s) observe.backup.start=[%s] Inicio de copia de seguridad automática observe.choice.cancel=Cancelar @@ -1688,7 +1681,6 @@ observe.common.no.unit=Sin registros observe.common.nocode=Código ausente observe.common.none=Ninguno observe.common.ocean=Océano -observe.common.operation.resume=Resumen de operaciones observe.common.resume=Resumen de la configuración observe.common.saveFile.overwrite=El archivo ya existe ¿Quiere reemplazarlo? observe.common.saveFile.overwrite.cancel=Cancelar @@ -1829,8 +1821,6 @@ observe.constant.AdminStep.SAVE_LOCAL=Copia local de seguridad observe.constant.AdminStep.SAVE_LOCAL.description=Guardar las modificaciones realizadas en la base original observe.constant.AdminStep.SELECT_DATA=Selección de datos observe.constant.AdminStep.SELECT_DATA.description=Selección de los datos para la realización de los operaciones -observe.constant.AdminStep.SHOW_RESUME=Resumen -observe.constant.AdminStep.SHOW_RESUME.description=Ver un resumen de los operaciones realizadas observe.constant.AdminStep.SYNCHRONIZE=Actualización del referencial observe.constant.AdminStep.SYNCHRONIZE.description=Actualizar el referencial con una base central observe.constant.AdminStep.VALIDATE=Validación ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -319,13 +319,6 @@ observe.actions.validate.validator.message.header=Message observe.actions.validate.validator.message.header.tip=Le texte du message observe.actions.validate.validator.scope.header=... observe.actions.validate.validator.scope.header.tip=Le type de message -observe.admin.resume.no.operation.done=Aucune opération réalisée. -observe.admin.resume.operation.canceled=opération annulée -observe.admin.resume.operation.done=opération réussie -observe.admin.resume.operation.failed=opération échouée -observe.admin.resume.operation.need.fix=opération nécessitant des corrections -observe.admin.resume.operation.not.started=opération non démarrée -observe.admin.resume.operation.running=opération en cours... observe.backup.done=[%s] Fin de la sauvegarde automatique (en %s) observe.backup.start=[%s] Début de la sauvegarde automatique observe.choice.cancel=Annuler @@ -1688,7 +1681,6 @@ observe.common.no.unit=Pas d'unité observe.common.nocode=code absent observe.common.none=Aucun observe.common.ocean=Océan -observe.common.operation.resume=Résumé des opérations observe.common.resume=Résumé de la configuration observe.common.saveFile.overwrite=Le fichier existe déjà. Voulez-vous le remplacer ? observe.common.saveFile.overwrite.cancel=Annuler @@ -1829,8 +1821,6 @@ observe.constant.AdminStep.SAVE_LOCAL=Sauvegarde locale observe.constant.AdminStep.SAVE_LOCAL.description=Sauver les modifications sur votre base source observe.constant.AdminStep.SELECT_DATA=Sélection des données observe.constant.AdminStep.SELECT_DATA.description=Sélection des données pour effectuer les opérations -observe.constant.AdminStep.SHOW_RESUME=Résumé -observe.constant.AdminStep.SHOW_RESUME.description=Voir un résumé des opérations effectuées observe.constant.AdminStep.SYNCHRONIZE=Mise à jour du référentiel observe.constant.AdminStep.SYNCHRONIZE.description=Mettre à jour le référentiel depuis une base centrale observe.constant.AdminStep.VALIDATE=Validation ===================================== services/src/main/java/fr/ird/observe/services/service/CleanTemporaryFilesTask.java ===================================== @@ -63,6 +63,9 @@ public class CleanTemporaryFilesTask extends TimerTask { public void run() { Path temporaryDirectory = configuration.getTemporaryDirectory().toPath(); + if (Files.notExists(temporaryDirectory)) { + return; + } Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); calendar.add(Calendar.HOUR_OF_DAY, -configuration.getTemporaryFilesTimeout()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ab3339953f66c20f7944721b4... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ab3339953f66c20f7944721b4... You're receiving this email because of your account on gitlab.com.