branch develop updated (a3951f8 -> 86c4618)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git from a3951f8 Update version new 8eb32a9 fixes #9086: Valeurs absentes lors de l'appel de la page d'acceuil / new cf39e61 fixes #9087: Tri des listes par ordre alphabetique new 86c4618 fixes #9088: Fixer la taille de la carte de repartition par station 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 86c4618ea3c6a9e2465a2adbf651d6c13a56e114 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 2 11:20:18 2017 +0100 fixes #9088: Fixer la taille de la carte de repartition par station commit cf39e615acca0a580ca16f73758195a989fac49b Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 2 11:04:32 2017 +0100 fixes #9087: Tri des listes par ordre alphabetique commit 8eb32a9a02d0567cf7896ecdb40275875f73b621 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 2 10:26:02 2017 +0100 fixes #9086: Valeurs absentes lors de l'appel de la page d'acceuil / Summary of changes: .../ifremer/coser/result/CoserRequestExecutor.java | 21 ++++++++++++++++++++- .../content/{index.jsp => index-success.jsp} | 0 .../src/main/webapp/WEB-INF/content/map/species.jsp | 2 +- pom.xml | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) rename coser-web/src/main/webapp/WEB-INF/content/{index.jsp => index-success.jsp} (100%) -- 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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 8eb32a9a02d0567cf7896ecdb40275875f73b621 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 2 10:26:02 2017 +0100 fixes #9086: Valeurs absentes lors de l'appel de la page d'acceuil / --- .../src/main/webapp/WEB-INF/content/{index.jsp => index-success.jsp} | 0 pom.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/coser-web/src/main/webapp/WEB-INF/content/index.jsp b/coser-web/src/main/webapp/WEB-INF/content/index-success.jsp similarity index 100% rename from coser-web/src/main/webapp/WEB-INF/content/index.jsp rename to coser-web/src/main/webapp/WEB-INF/content/index-success.jsp diff --git a/pom.xml b/pom.xml index 4c07b93..bec5d2d 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ <jaxxVersion>2.8.6</jaxxVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> <nuitonMatrixVersion>2.3.3</nuitonMatrixVersion> - <strutsVersion>2.3.16.1</strutsVersion> + <strutsVersion>2.3.16.3</strutsVersion> <nuitonReportPluginVersion>3.0</nuitonReportPluginVersion> <!-- Site configuration --> -- 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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit cf39e615acca0a580ca16f73758195a989fac49b Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 2 11:04:32 2017 +0100 fixes #9087: Tri des listes par ordre alphabetique --- .../ifremer/coser/result/CoserRequestExecutor.java | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/coser-business/src/main/java/fr/ifremer/coser/result/CoserRequestExecutor.java b/coser-business/src/main/java/fr/ifremer/coser/result/CoserRequestExecutor.java index 5611a15..bc1194e 100644 --- a/coser-business/src/main/java/fr/ifremer/coser/result/CoserRequestExecutor.java +++ b/coser-business/src/main/java/fr/ifremer/coser/result/CoserRequestExecutor.java @@ -39,6 +39,10 @@ import org.apache.commons.io.FileUtils; import java.io.File; import java.io.IOException; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -281,7 +285,22 @@ public class CoserRequestExecutor { for (MapResult map : mapResults) { resultAsMap.putAll(map.getResult()); } - return resultAsMap; + return sortByValue(resultAsMap); + } + + protected static <K, V extends Comparable<? super V>> Map<K, V> sortByValue( Map<K, V> map ) { + List<Map.Entry<K, V>> list = new LinkedList<Map.Entry<K, V>>( map.entrySet() ); + Collections.sort( list, new Comparator<Map.Entry<K, V>>() { + public int compare( Map.Entry<K, V> o1, Map.Entry<K, V> o2 ) { + return (o1.getValue()).compareTo( o2.getValue() ); + } + } ); + + Map<K, V> result = new LinkedHashMap<K, V>(); + for (Map.Entry<K, V> entry : list) { + result.put( entry.getKey(), entry.getValue() ); + } + return result; } public List<ResultRepository> getMatchingRepositories() { -- 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 coser. See https://gitlab.nuiton.org/codelutin/coser.git commit 86c4618ea3c6a9e2465a2adbf651d6c13a56e114 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Mar 2 11:20:18 2017 +0100 fixes #9088: Fixer la taille de la carte de repartition par station --- coser-web/src/main/webapp/WEB-INF/content/map/species.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp b/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp index a21a033..eed96b6 100644 --- a/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp +++ b/coser-web/src/main/webapp/WEB-INF/content/map/species.jsp @@ -63,7 +63,7 @@ <img src="<s:url action='map-data'> <s:param name="facade" value="%{facade}" /> <s:param name="zone" value="%{zone}" /> - </s:url>" style="float:right;margin-left:10px;" /> + </s:url>" style="float:right;margin-left:10px;" width="230" height="230"/> <s:if test="%{species.isEmpty()}"> <s:text name="message.common.noresults"></s:text> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm