branch develop updated (4e6cbb1 -> 242dea7)
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 4e6cbb1 fixes #6555: [CONFIG] Erreur au chargement de l'ordre des catégorisations dans la config new 242dea7 fixes #6374 Test sur l'import du protocole qui ne fonctionne pas 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 242dea7dd2f7ba1e70dc51e8af137b45a6dfcf2d Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 28 16:09:05 2015 +0100 fixes #6374 Test sur l'import du protocole qui ne fonctionne pas Summary of changes: .../tutti/service/protocol/ProtocolImportExportService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 242dea7dd2f7ba1e70dc51e8af137b45a6dfcf2d Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 28 16:09:05 2015 +0100 fixes #6374 Test sur l'import du protocole qui ne fonctionne pas --- .../tutti/service/protocol/ProtocolImportExportService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java index 73486af..4734919 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java @@ -57,6 +57,7 @@ import java.io.IOException; import java.io.Reader; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -140,17 +141,18 @@ public class ProtocolImportExportService extends AbstractTuttiService { caracteristicMapping = new ArrayList<CaracteristicMappingRow>(); } Map<String, CaracteristicMappingRow> rowsByCaracteristicId = - Maps.uniqueIndex(caracteristicMapping, + new HashMap<>(Maps.uniqueIndex(caracteristicMapping, new Function<CaracteristicMappingRow, String>() { @Override public String apply(CaracteristicMappingRow caracteristicMappingRow) { return caracteristicMappingRow.getPmfmId(); } - }); + })); mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.GEAR_USE_FEATURE); mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.VESSEL_USE_FEATURE); + protocol.setCaracteristicMapping(new ArrayList<>(rowsByCaracteristicId.values())); } public void exportAllCaracteristic(File file, @@ -526,6 +528,7 @@ public class ProtocolImportExportService extends AbstractTuttiService { if (row == null) { row = new CaracteristicMappingRowBean(); row.setPmfmId(id); + rowsByCaracteristicId.put(id, row); } row.setTab(type.name()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm