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 4213fb5e8b2b068f1c712ed2fe318b1785829b31 Merge: aae410e 08e721b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 4 05:44:04 2015 +0200 fixes #6895: [IMPORT GENERIQUE] Revoir la cinématique d'écrasement des données Merge branch 'feature/6895' into develop .../genericformat/GenericFormatContextSupport.java | 4 - .../GenericFormatImportConfiguration.java | 13 --- .../genericformat/GenericFormatImportRequest.java | 4 - .../genericformat/GenericFormatResultSupport.java | 4 - .../consumer/CsvConsumerForSurvey.java | 6 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 2 - .../GenericFormatImportServiceTest.java | 96 ---------------------- .../genericformat/GenericFormatImportUI.css | 7 -- .../genericformat/GenericFormatImportUI.jaxx | 9 -- .../GenericFormatImportUIHandler.java | 2 +- .../genericformat/GenericFormatImportUIModel.java | 20 +---- .../actions/GenericFormatImportAction.java | 40 ++++++++- .../genericformat/tree/CruiseSelectTreeNode.java | 9 ++ .../genericformat/tree/ProgramSelectTreeNode.java | 12 +++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 16 files changed, 71 insertions(+), 163 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.