This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from dad5aa1 Faire fonctionner la migration 3.905 sous pg (See #8171) new 3225ca9 Use java 8 new 38c71a4 passage méthode en publique new 6072d69 Ajout de l'import des mises en œuvre des engins (See #8181) new f5bb858 Livrable #8181 Merge branch 'feature/8181' into develop The 4 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 f5bb858406547c39c947a324aa6f6ca780d5c601 Merge: dad5aa1 6072d69 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:38:46 2016 +0200 Livrable #8181 Merge branch 'feature/8181' into develop commit 6072d6954a5209c992d8aa3a3c403345a6d1b5a3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:38:43 2016 +0200 Ajout de l'import des mises en œuvre des engins (See #8181) commit 38c71a4b7034e5bb3acd1b287bdefef41558df59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:29:53 2016 +0200 passage méthode en publique commit 3225ca9b1088e0a526d914ed76b10dbfe5efe31c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:19:29 2016 +0200 Use java 8 Summary of changes: .../echobase/entities/references/Gears.java | 41 ------------ .../echobase/services/service/DbEditorService.java | 10 +-- .../contexts/ImportDataContextSupport.java | 3 +- .../GearCharacteristicValuesImportModel.java | 39 +++++++++++ .../GearCharacteristicValuesImportRow.java | 47 +++++++++++++ .../services/service/importdb/ImportService.java | 76 ++++++++++++++++++++++ ...rtTable.java => ImportGearCharacteristics.java} | 53 +++------------ .../src/main/resources/config/struts-dbeditor.xml | 9 +++ .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 +++++ 11 files changed, 202 insertions(+), 93 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/{ImportTable.java => ImportGearCharacteristics.java} (62%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.