Author: sletellier Date: 2011-04-12 14:28:32 +0000 (Tue, 12 Apr 2011) New Revision: 1190 Log: Fix npe and fix doublons Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java 2011-04-12 14:17:58 UTC (rev 1189) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/TopiaEntitySelector.java 2011-04-12 14:28:32 UTC (rev 1190) @@ -180,7 +180,7 @@ if (selectedValues != null) { for (E sv : selectedValues) { if (!values.contains(sv)) { - values.add(selectedValue); + values.add(sv); } } } @@ -274,8 +274,14 @@ @Override public int compare(E o1, E o2) { - String compare1 = (String)propertyAdapter.get(o1); - String compare2 = (String)propertyAdapter.get(o2); + String compare1 = null; + if (o1 != null) { + compare1 = (String)propertyAdapter.get(o1); + } + String compare2 = null; + if (o2 != null) { + compare2 = (String)propertyAdapter.get(o2); + } return compare1 == null ? -1 : compare1.compareTo(compare2); }