branch develop updated (2c797de -> 26e222c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 2c797de [jgitflow-maven-plugin]Updating develop poms back to pre merge state new bfebe5a Utilisation d'un Set plutot que d'utiliser une collection new 2185b33 Augmentation de la taille des fichiers qu'on peut uploader lors d'un import (See #7865) new 26e222c Correction du format de cellvolume (c'est un float et non pas un integer) (See #7865) The 3 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 26e222c6141c9e02b947e128a644ab79f9ee4c1b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:18:13 2016 +0100 Correction du format de cellvolume (c'est un float et non pas un integer) (See #7865) commit 2185b33f2d2b9c8528f4abf84d540d5e88131c13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:17:41 2016 +0100 Augmentation de la taille des fichiers qu'on peut uploader lors d'un import (See #7865) commit bfebe5aaac2e30b0795881fdcf27bca1e6b1b5e3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:17:09 2016 +0100 Utilisation d'un Set plutot que d'utiliser une collection Summary of changes: .../main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java | 7 ++++--- .../services/service/importdata/csv/AcousticImportModel.java | 2 +- echobase-ui/src/main/resources/struts.xml | 2 +- 3 files changed, 6 insertions(+), 5 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 echobase. See http://git.codelutin.com/echobase.git commit bfebe5aaac2e30b0795881fdcf27bca1e6b1b5e3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:17:09 2016 +0100 Utilisation d'un Set plutot que d'utiliser une collection --- .../main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java index bd82774..6c984b9 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java @@ -22,6 +22,7 @@ package fr.ifremer.echobase.entities.data; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.echobase.entities.references.Vessel; @@ -97,10 +98,10 @@ public class VoyageImpl extends VoyageAbstract { if (!isTransitEmpty()) { for (Transit transit : getTransit()) { - Collection<Vessel> vesselsOfTransit = - Collections2.transform( + Set<Vessel> vesselsOfTransit = + Sets.newLinkedHashSet(Iterables.transform( transit.getTransect(), - Transects.TRANSECT_BY_VESSEL); + Transects.TRANSECT_BY_VESSEL)); result.addAll(vesselsOfTransit); } } -- 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 echobase. See http://git.codelutin.com/echobase.git commit 2185b33f2d2b9c8528f4abf84d540d5e88131c13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:17:41 2016 +0100 Augmentation de la taille des fichiers qu'on peut uploader lors d'un import (See #7865) --- echobase-ui/src/main/resources/struts.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-ui/src/main/resources/struts.xml b/echobase-ui/src/main/resources/struts.xml index b2e38fe..9b6be41 100644 --- a/echobase-ui/src/main/resources/struts.xml +++ b/echobase-ui/src/main/resources/struts.xml @@ -53,7 +53,7 @@ <!--<constant name="struts.i18n.reload" value="false"/>--> <!--<constant name="struts.configuration.xml.reload" value="false"/>--> <constant name="struts.ui.theme" value="css_xhtml"/> - <constant name="struts.multipart.maxSize" value="209715200"/> + <constant name="struts.multipart.maxSize" value="419430400"/> <!--Performance tuning--> <!--see http://struts.apache.org/2.2.3/docs/performance-tuning.html--> -- 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 echobase. See http://git.codelutin.com/echobase.git commit 26e222c6141c9e02b947e128a644ab79f9ee4c1b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:18:13 2016 +0100 Correction du format de cellvolume (c'est un float et non pas un integer) (See #7865) --- .../echobase/services/service/importdata/csv/AcousticImportModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java index 115a10d..943a35e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java @@ -107,7 +107,7 @@ public class AcousticImportModel extends AbstractImportModel<AcousticImportRow> newMandatoryColumn("MOVIES_EILayer\\cellset\\lat", AcousticImportRow.PROPERTY_CELL_LATITUDE, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//BF newMandatoryColumn("MOVIES_EILayer\\cellset\\long", AcousticImportRow.PROPERTY_CELL_LONGITUDE, EchoBaseCsvUtil.PRIMITIVE_FLOAT);//BG - newMandatoryColumn("MOVIES_EILayer\\cellset\\volume", AcousticImportRow.PROPERTY_CELL_VOLUME, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER);//BH + newMandatoryColumn("MOVIES_EILayer\\cellset\\volume", AcousticImportRow.PROPERTY_CELL_VOLUME, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER);//BH newMandatoryColumn("MOVIES_EILayer\\cellset\\area", AcousticImportRow.PROPERTY_CELL_SURFACE, EchoBaseCsvUtil.PRIMITIVE_INTEGER);//BI newIgnoredColumn("MOVIES_EILayer\\cellset\\diststart");//BJ newIgnoredColumn("MOVIES_EILayer\\cellset\\distend");//BK -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm