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 76255ee Fixes #7854 Merge branch 'feature/7854' into develop adds c22d2df pouvoir ordonner les caractéristiques du trait dans le protocole (fixes #7025) adds fcdeafb Mise à jour de mapping de l'aide adds 1e88649 Reformatag, ajout serialVersionUID + bonne javadoc de création new 256ba74 Fixes #7025 Merge branch 'feature/7025' 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 256ba74cb4bffe00af30a4efb0eb32125b4330d6 Merge: 76255ee 1e88649 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 23 11:41:49 2015 +0100 Fixes #7025 Merge branch 'feature/7025' into develop Summary of changes: .../filtered-resources/tutti-help-fr.properties | 22 +++++++------- .../EditSampleCategoryModelTableModel.java | 14 ++------- .../catches/benthos/BenthosBatchUIHandler.java | 34 +++++++++++++++++---- .../catches/species/SpeciesBatchUIHandler.java | 34 +++++++++++++++++---- .../EditProtocolCaracteristicsRowModel.java | 7 +++++ .../EditProtocolCaracteristicsTableModel.java | 8 +++-- .../EditProtocolOperationFieldsRowModel.java | 4 +++ .../EditProtocolOperationFieldsTableModel.java | 2 ++ .../protocol/EditProtocolSpeciesTableModel.java | 4 +-- .../ui/swing/content/protocol/EditProtocolUI.css | 21 +++++++++++++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 2 ++ .../content/protocol/EditProtocolUIHandler.java | 35 ++++++++++++++++++++-- .../content/protocol/EditProtocolUIModel.java | 27 +++++++++++++++++ .../MoveDownCaracteristicMappingAction.java} | 22 +++++++------- .../actions/MoveUpCaracteristicMappingAction.java} | 22 +++++++------- .../swing/util/table/AbstractTuttiTableModel.java | 30 +++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 ++++ 18 files changed, 240 insertions(+), 60 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveDownSampleCategoryRowAction.java => protocol/actions/MoveDownCaracteristicMappingAction.java} (61%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{category/actions/MoveUpSampleCategoryRowAction.java => protocol/actions/MoveUpCaracteristicMappingAction.java} (61%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.