This is an automated email from the git hooks/post-receive script. New change to branch feature/5954 in repository tutti. See http://git.codelutin.com/tutti.git from ed561ae refs #6129 import du fichier avec les colonnes new 7fb8216 refs #6129 mapping des champs du trait avec les colonnes + début import dans le trait 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 7fb821629b08b74af5b2fa675fab14fbd00d288c Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 2 19:09:14 2014 +0100 refs #6129 mapping des champs du trait avec les colonnes + début import dans le trait Summary of changes: .../entities/protocol/TuttiProtocols.java | 4 + .../src/main/xmi/tutti-persistence.zargo | Bin 57440 -> 57963 bytes .../src/main/xmi/tutti-persistence.zargo~ | Bin 57378 -> 57440 bytes .../filtered-resources/tutti-help-fr.properties | 3 +- .../swing/action/ImportFromColumnFileAction.java | 187 +++++++++++++++++++ .../action/LoadProtocolImportColumnsAction.java | 13 +- .../tutti/ui/swing/action/SaveProtocolAction.java | 5 + .../content/operation/EditFishingOperationUI.css | 9 + .../content/operation/EditFishingOperationUI.jaxx | 1 + .../content/protocol/CaracteristicMappingUI.css | 13 ++ .../content/protocol/CaracteristicMappingUI.jaxx | 12 +- .../protocol/CaracteristicMappingUIHandler.java | 203 +++++++++++++++++---- .../protocol/CaracteristicMappingUIModel.java | 21 +++ .../EditProtocolOperationFieldsRowModel.java | 66 +++++++ .../EditProtocolOperationFieldsTableModel.java | 37 ++++ .../content/protocol/EditProtocolUIHandler.java | 4 + .../content/protocol/EditProtocolUIModel.java | 63 +++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 11 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 11 ++ 19 files changed, 614 insertions(+), 49 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.