This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from d4d4bac fixes #6882: [IMPORT GENERIQUE] On ne peut pas ouvrir les rapports d'import new 29dd28c introduction d'une configuration pour l'export et utilisation dans les exports existants new 057b4a8 introduce DataModel API in persistence module new 80c5987 improve CSVProducer API new c5240d3 can now export partial data new 148837e impact Export API in Report service new a95fae1 impact Export API in legacy export actions new bf8a93c add new export screen new c4d6063 generic format import action only from menu + improve select popup open (add a timer for this) The 8 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 c4d6063d677074ff2885e35357909766f5d64fd1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 16:02:00 2015 +0200 generic format import action only from menu + improve select popup open (add a timer for this) commit bf8a93c34480c6529baf9c75591bac53274f0665 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 16:00:01 2015 +0200 add new export screen commit a95fae176fdaafcfad2d248bee0f6d2ebe503d92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 15:59:08 2015 +0200 impact Export API in legacy export actions commit 148837e7b87a045a9be17dec2e747f95e60f5f93 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 15:58:27 2015 +0200 impact Export API in Report service commit c5240d364bb3b772a72a5db55ba31f5aa207138a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 15:57:29 2015 +0200 can now export partial data commit 80c598757d13db246fbc89423907fb24f0db23ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 15:56:32 2015 +0200 improve CSVProducer API commit 057b4a84db2f8602ffbad0c10f8610729fd08185 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 15:55:47 2015 +0200 introduce DataModel API in persistence module commit 29dd28c4a8c7deec091479d471bd85de87229768 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 28 19:07:49 2015 +0100 introduction d'une configuration pour l'export et utilisation dans les exports existants Summary of changes: .../tutti/persistence/TuttiPersistence.java | 33 ++ .../tutti/persistence/TuttiPersistenceImpl.java | 78 +++- .../persistence/TuttiPersistenceNoDbImpl.java | 16 + .../tutti/persistence/model/CruiseDataModel.java | 39 ++ .../tutti/persistence/model/DataModelSupport.java | 47 +++ .../persistence/model/OperationDataModel.java | 33 ++ .../tutti/persistence/model/ProgramDataModel.java | 39 ++ .../ifremer/tutti/service/PersistenceService.java | 18 +- .../fr/ifremer/tutti/service/csv/CsvProducer.java | 37 +- ...ort.java => GenericFormatCheckDataService.java} | 122 ++++--- .../GenericFormatExportActionEngine.java | 52 ++- .../GenericFormatExportConfiguration.java | 122 +++++++ .../genericformat/GenericFormatExportContext.java | 207 +++++++---- .../GenericFormatExportCruiseContext.java | 44 +++ .../genericformat/GenericFormatExportRequest.java | 77 ++++ .../genericformat/GenericFormatExportResult.java | 45 +++ .../genericformat/GenericFormatExportService.java | 392 ++++++--------------- .../genericformat/GenericFormatImportService.java | 50 ++- .../service/genericformat/csv/CatchModel.java | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 6 +- .../service/genericformat/csv/OperationRow.java | 186 +++++++--- .../exportactions/CheckDataAction.java | 45 +++ .../CreateAccidentalCatchRowsAction.java | 13 +- .../exportactions/CreateCatchBatchRowsAction.java | 86 ++++- .../CreateIndividualObservationRowsAction.java | 15 +- .../CreateMarineLitterRowsAction.java | 13 +- .../exportactions/CreateOperationRowsAction.java | 21 +- .../exportactions/CreateParameterRowsAction.java | 5 + .../ExportFishingOperationActionSupport.java | 3 + .../exportactions/ExportProtocolAction.java | 2 +- .../exportactions/ExportSurveyAction.java | 28 +- .../exportactions/FinalizeExportAction.java | 44 +-- .../exportactions/FlushOperationAction.java | 5 + .../exportactions/GenerateExportArchiveAction.java | 26 ++ .../exportactions/LoadDataAction.java | 52 +++ .../importactions/DoCheckWeightAction.java | 10 +- .../producer/CsvProducerForCatch.java | 32 ++ .../producer/CsvProducerForOperation.java | 1 - .../service/report/ReportGenerationRequest.java | 13 + .../service/report/ReportGenerationService.java | 24 +- .../resources/i18n/tutti-service_en_GB.properties | 3 + .../resources/i18n/tutti-service_fr_FR.properties | 3 + .../GenericFormatExportServiceAno5804Test.java | 11 +- .../GenericFormatExportServiceTest.java | 378 ++++++++++---------- .../filtered-resources/tutti-help-fr.properties | 39 +- .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 6 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 13 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 2 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../actions/OpenGenericFormatExportScreen.java | 41 +++ .../actions/OpenGenericFormatImportScreen.java | 3 +- .../genericformat/GenericFormatExportUI.css | 169 +++++++++ .../genericformat/GenericFormatExportUI.jaxx | 121 +++++++ .../GenericFormatExportUIHandler.java | 154 ++++++++ .../genericformat/GenericFormatExportUIModel.java | 156 ++++++++ .../genericformat/actions/FoldAllDataAction.java | 41 +++ .../actions/GenericFormatExportAction.java | 113 ++++++ .../genericformat/actions/SelectAllDataAction.java | 35 ++ .../genericformat/actions/UnfoldAllDataAction.java | 39 ++ .../actions/UnselectAllDataAction.java | 35 ++ .../genericformat/tree/CruiseSelectTreeNode.java | 121 +++++++ .../tree/DataSelectTreeCellEditor.java | 65 ++++ .../tree/DataSelectTreeCellRenderer.java | 112 ++++++ .../tree/DataSelectTreeNodeSupport.java | 49 +++ .../tree/OperationSelectTreeNode.java | 51 +++ .../genericformat/tree/ProgramSelectTreeNode.java | 64 ++++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 26 +- .../swing/content/home/SelectCruiseUIHandler.java | 56 +-- .../actions/ExportGenericFormatCruiseAction.java | 41 ++- .../ExportGenericFormatProgramCruisesAction.java | 34 +- .../ImportGenericFormatProgramCruisesAction.java | 138 -------- .../ui/swing/content/report/ReportUIHandler.java | 4 + .../ui/swing/content/report/ReportUIModel.java | 10 + .../report/actions/GenerateReportAction.java | 17 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 33 -- .../resources/i18n/tutti-ui-swing_en_GB.properties | 58 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 63 +++- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 82 files changed, 3396 insertions(+), 1009 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{GenericFormatServiceSupport.java => GenericFormatCheckDataService.java} (63%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportConfiguration.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportCruiseContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportRequest.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CheckDataAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/GenerateExportArchiveAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home => }/actions/OpenGenericFormatImportScreen.java (94%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/FoldAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatExportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SelectAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/UnfoldAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/UnselectAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeCellEditor.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/OperationSelectTreeNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ImportGenericFormatProgramCruisesAction.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-collapse.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-expand.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-select.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-unselect.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.