This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from bd6f2ef can override cruise + test for it new a1b9ead make Serializable some objects (to include them in a ui model) + add a valid result state new d64ac8d make serializable configuration new c2188a8 change rank order to short for gear + only check gear on operation if there is one new 573a659 review howto validate the layout of an archive new 7bf0b6e add report file in configuration new 5cfc0ce be able to adapt progression total new 3f35fa2 fix archive api (to be serializable) new b7d0d75 add validate import file methods in service new de1b81b ajout d'une option de configuration pour le répertoire de sauvegarde des rapports lors de l'import générique new 63d7e08 update TODO in doc new cb8517a mise en place des rapports de validation new ae34247 fix css new 11bdb67 ecran d'import au format generique The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 11bdb672f87547e4b2691267c573a3e638cd4fe6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 10:03:11 2015 +0100 ecran d'import au format generique commit ae34247d99ecde69c37a542dcfe81efef74f6f2d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 10:02:51 2015 +0100 fix css commit cb8517a863ef2c67c84a575f34c862683203e79e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 10:02:36 2015 +0100 mise en place des rapports de validation commit 63d7e0852e5fc1dd58808af623dde1a904b36af3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 09:27:40 2015 +0100 update TODO in doc commit de1b81bac986d4103be7d53d82344f9a278458ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 25 08:48:53 2015 +0100 ajout d'une option de configuration pour le répertoire de sauvegarde des rapports lors de l'import générique commit b7d0d751d22d70053468ee59488c44191bcb560d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:45:07 2015 +0100 add validate import file methods in service commit 3f35fa24e4e2c4129d42262b7b9fd1c3ce1be9e0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:44:38 2015 +0100 fix archive api (to be serializable) commit 5cfc0ce3b94f575f3eaf28275ccdac801091395d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:44:09 2015 +0100 be able to adapt progression total commit 7bf0b6e62cd1bab860c0013923f79b3f0d87cd73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:43:28 2015 +0100 add report file in configuration commit 573a659a2d577d4ad823b97e8fb00e9a1021e8be Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:43:01 2015 +0100 review howto validate the layout of an archive commit c2188a87d50574e5352f20240b412f2febd5c7a8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:41:05 2015 +0100 change rank order to short for gear + only check gear on operation if there is one commit d64ac8d6afaae3cc4432c955d491ac5351cec7cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 16:44:09 2015 +0100 make serializable configuration commit a1b9ead8ba749834576b3e75172e23d2f99f31be Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 08:42:46 2015 +0100 make Serializable some objects (to include them in a ui model) + add a valid result state Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 7 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../genericformat/GenericFormatArchive.java | 129 +++---- ...GenericFormatArchiveInvalidLayoutException.java | 19 ++ .../genericformat/GenericFormatExportService.java | 2 +- .../GenericFormatImportConfiguration.java | 15 +- .../genericformat/GenericFormatImportContext.java | 10 +- .../GenericFormatImportCruiseResult.java | 5 +- .../GenericFormatImportOperationResult.java | 5 +- .../genericformat/GenericFormatImportRequest.java | 19 +- .../genericformat/GenericFormatImportResult.java | 61 +++- .../genericformat/GenericFormatImportService.java | 370 ++++++++++++++++++--- .../GenericFormatImportValidationHelper.java | 6 +- .../GenericFormatReferentialImportResult.java | 5 +- .../GenericFormatValidateFileContext.java | 72 ++++ .../GenericFormatValidateFileResult.java | 89 +++++ .../consumer/CsvConsumerForGearCaracteristic.java | 2 +- .../consumer/CsvConsumerForOperation.java | 12 +- .../consumer/GearNotFoundInCruiseException.java | 6 +- ...t_fr.ftl => genericFormatValidateReport_fr.ftl} | 214 +++--------- .../resources/i18n/tutti-service_en_GB.properties | 10 + .../resources/i18n/tutti-service_fr_FR.properties | 11 +- .../GenericFormatImportServiceTest.java | 24 ++ .../filtered-resources/tutti-help-fr.properties | 97 +++--- .../fr/{genericExport.html => genericFormat.html} | 20 +- tutti-ui-swing/src/main/help/fr/index.html | 2 +- .../main/help/fr/manageTemporaryReferential.html | 2 + tutti-ui-swing/src/main/help/fr/menu.html | 2 + tutti-ui-swing/src/main/help/fr/navbar.js | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 8 +- .../action/OpenGenericFormatImportScreen.java | 18 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 10 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 1 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../swing/content/config/TuttiConfigUIHandler.java | 3 + .../genericformat/GenericFormatImportUI.css | 154 +++++++++ .../genericformat/GenericFormatImportUI.jaxx | 156 +++++++++ .../GenericFormatImportUIHandler.java | 135 ++++++++ .../genericformat/GenericFormatImportUIModel.java | 234 +++++++++++++ .../actions/GenericFormatImportAction.java | 186 +++++++++++ .../actions/GenericFormatValidateAction.java | 138 ++++++++ .../OpenGenericFormatImportReportAction.java | 55 +++ .../OpenGenericFormatValidateReportAction.java | 55 +++ .../SaveGenericFormatImportReportAction.java | 78 +++++ .../SaveGenericFormatValidateReportAction.java | 78 +++++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 2 +- .../ui/swing/content/protocol/EditProtocolUI.css | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 86 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 81 ++++- 51 files changed, 2340 insertions(+), 375 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveInvalidLayoutException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileResult.java copy tutti-service/src/main/resources/ftl/{pupitriReport_fr.ftl => genericFormatValidateReport_fr.ftl} (55%) rename tutti-ui-swing/src/main/help/fr/{genericExport.html => genericFormat.html} (98%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenGenericFormatImportScreen.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatImportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatValidateAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatImportReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatValidateReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SaveGenericFormatImportReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SaveGenericFormatValidateReportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.