Author: bleny Date: 2012-04-06 16:35:04 +0200 (Fri, 06 Apr 2012) New Revision: 1596 Url: http://forge.codelutin.com/repositories/revision/wao/1596 Log: fixes #1088 OBSMER : carte ne s'affiche pas Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-04-03 13:28:44 UTC (rev 1595) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SimpleSelector.java 2012-04-06 14:35:04 UTC (rev 1596) @@ -139,8 +139,8 @@ List<String> selectedValues = getSelectedValues(); if (selectedValues != null) { for (String sv : selectedValues) { - if (!values.contains(sv)) { - values.add(selectedValue); + if (sv != null && !values.contains(sv)) { + values.add(sv); } } } @@ -151,7 +151,7 @@ @Override public int compare(String o1, String o2) { - return o1 == null ? -1 : o1.compareTo(o2); + return (o1 == null ? "" : o1).compareTo((o2 == null ? "" : o2)); } }); }