[tutti] branch develop updated (1f6edaa -> 33a8059)
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 1f6edaa [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 33a8059 fixes #5938: [EXPORT GENERIQUE] Regresion sur l'export des caractéristiques 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 33a805994ad5128eb885f9cd0aa1456656f2cebd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 7 11:19:06 2014 +0200 fixes #5938: [EXPORT GENERIQUE] Regresion sur l'export des caractéristiques Summary of changes: .../src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java | 6 +----- 1 file changed, 1 insertion(+), 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 tutti. See http://git.codelutin.com/tutti.git commit 33a805994ad5128eb885f9cd0aa1456656f2cebd Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 7 11:19:06 2014 +0200 fixes #5938: [EXPORT GENERIQUE] Regresion sur l'export des caractéristiques --- .../src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java index 58f5556..919db0d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java @@ -26,7 +26,6 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.TuttiEntity; @@ -748,10 +747,7 @@ public class TuttiCsvUtil extends Common { } // qualitive value CaracteristicQualitativeValue qv = (CaracteristicQualitativeValue) value; - String result = qv.getName(); - if (!result.equals(qv.getDescription())) { - result += " - " + qv.getDescription(); - } + String result = qv.getDescription(); // description contaisn name - description from db return result; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm