This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f83390ab503eb29c8292e3b10c65535521eebf6d Merge: c4b0e75 0e8bc21 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 11:52:14 2015 +0200 Utiliser un moteur de template pour générer le rendu des résumés d'action (Termine #7547) Merge branch 'feature/7547' into develop observe-application-swing/pom.xml | 6 + .../java/fr/ird/observe/ObserveServiceHelper.java | 13 + .../observe/ObserveSwingApplicationContext.java | 18 ++ .../java/fr/ird/observe/ObserveTextGenerator.java | 104 ++++++ .../observe/ui/actions/ShowStorageInfoAction.java | 15 +- .../ird/observe/ui/storage/StorageUIHandler.java | 352 +-------------------- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 5 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 3 +- .../ui/storage/tabs/StorageTabUIHandler.java | 41 +-- .../main/resources/ftl/connexionTestResult_fr.ftl | 20 ++ .../ftl/dataSourceConnectionReport_fr.ftl | 348 ++++++++++++++++++++ .../resources/ftl/dataSourceInformation_fr.ftl | 54 ++++ .../ftl/dataSourceSelectModeResume_fr.ftl | 40 +++ .../ftl/storageModelDataSourceConfiguration_fr.ftl | 18 ++ .../observe-application-swing_en_GB.properties | 1 + .../observe-application-swing_es_ES.properties | 1 + .../observe-application-swing_fr_FR.properties | 1 + pom.xml | 7 + 18 files changed, 660 insertions(+), 387 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.