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 accaf10 Use nuiton-version and snapshots on nuiton adds d5c74b5 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) adds 772a8ea Fix javadoc new 55d4672 Fixes #6592 Merge branch 'feature/6592' into develop The 1 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 55d46720b023e5229ecfbea7455b7ce1a3fa53bb Merge: accaf10 772a8ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 12:07:55 2016 +0100 Fixes #6592 Merge branch 'feature/6592' into develop Summary of changes: .../tutti/service/pupitri/PupitriImportResult.java | 4 ++ .../service/pupitri/PupitriImportService.java | 40 +++++++++-- .../pupitri/PupitriImportServiceEvo6149Test.java | 4 +- ...t.java => PupitriImportServiceEvo6592Test.java} | 39 ++++++----- .../pupitri/{evo-6149.car => evo-6592.car} | 0 .../pupitri/{evo-6149.tnk => evo-6592.tnk} | 0 ...o-6149.tuttiProtocol => evo-6592.tuttiProtocol} | 0 .../species/ImportPupitriMelagWeightPopupUI.css} | 43 ++++++------ ...I.jaxx => ImportPupitriMelagWeightPopupUI.jaxx} | 37 +++++----- .../ImportPupitriMelagWeightPopupUIHandler.java | 79 ++++++++++++++++++++++ .../ImportPupitriMelagWeightPopupUIModel.java | 35 ++++++++++ .../species/actions/ImportPupitriAction.java | 55 +++++++++++---- ...mportPupitriMelagWeightPopupValidateAction.java | 20 ++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 15 files changed, 284 insertions(+), 81 deletions(-) copy tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportServiceEvo6149Test.java => PupitriImportServiceEvo6592Test.java} (86%) copy tutti-service/src/test/resources/pupitri/{evo-6149.car => evo-6592.car} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tnk => evo-6592.tnk} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tuttiProtocol => evo-6592.tuttiProtocol} (100%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.css => content/operation/catches/species/ImportPupitriMelagWeightPopupUI.css} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriPopupUI.jaxx => ImportPupitriMelagWeightPopupUI.jaxx} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriMelagWeightPopupValidateAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.