This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 26cc892d33c31d67ff3f1da2c2cbe3f7e571abc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:47:10 2016 +0200 Bien conserver l'ordre sur les caractéristiques (see #8233) --- .../tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index ef00278..45de970 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -177,8 +177,8 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, */ protected final LinkedHashMap<String, MaturityCaracteristic> maturityCaracteristicsById = new LinkedHashMap<>(); - protected Map<Caracteristic, EditProtocolCaracteristicsRowModel> caracteristicMappingRows = - new HashMap<>(); + protected LinkedHashMap<Caracteristic, EditProtocolCaracteristicsRowModel> caracteristicMappingRows = + new LinkedHashMap<>(); protected List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows = new ArrayList<>(); @@ -372,7 +372,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } public void setCaracteristicMappingRows(List<EditProtocolCaracteristicsRowModel> caracteristicMappingRows) { - this.caracteristicMappingRows = new HashMap<>( + this.caracteristicMappingRows = new LinkedHashMap<>( Maps.uniqueIndex(caracteristicMappingRows, EditProtocolCaracteristicsRowModel::getPsfm) ); firePropertyChange(PROPERTY_CARACTERISTIC_MAPPING_ROWS, null, caracteristicMappingRows); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.