This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 965a665adb98a31dc7a1dbf4487a21d389172bd9 Merge: dba70c6 9285511 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 26 09:37:40 2015 +0100 fixes #6870: [IMPORT GENERIQUE] Améliorer la gestion du protocole Merge branch 'feature/6870' into develop .../tutti/persistence/TuttiPersistenceImpl.java | 9 ++- .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ .../service/ProtocolPersistenceService.java | 3 +- .../service/ProtocolPersistenceServiceImpl.java | 12 ++++ .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../genericformat/GenericFormatContextSupport.java | 10 +++ .../GenericFormatImportConfiguration.java | 10 +++ .../genericformat/GenericFormatImportRequest.java | 4 ++ .../genericformat/GenericFormatResultSupport.java | 12 +++- .../importactions/ImportProtocolAction.java | 9 ++- .../importactions/RestoreAfterImportAction.java | 36 +++++++++- .../resources/i18n/tutti-service_en_GB.properties | 2 + .../resources/i18n/tutti-service_fr_FR.properties | 4 +- .../actions/GenericFormatImportAction.java | 78 +++++++++++++++++++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 ++ 16 files changed, 201 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.