Author: tchemit Date: 2013-10-01 12:31:41 +0200 (Tue, 01 Oct 2013) New Revision: 1259 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1259 Log: fixes #3402: [PROPTOCOLE] erreur ?\195?\160 l'import des esp?\195?\168ces fixes #3403: [PROPTOCOLE] erreur ?\195?\160 l'import du benthos Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-10-01 09:52:31 UTC (rev 1258) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-10-01 10:31:41 UTC (rev 1259) @@ -537,10 +537,12 @@ @Override public List<Integer> parse(String value) throws ParseException { - String[] split = value.split("\\s*\\|\\s*"); List<Integer> result = Lists.newArrayList(); - for (String string : split) { - result.add(Integer.valueOf(string)); + if (StringUtils.isNotBlank(value)) { + String[] split = value.split("\\s*\\|\\s*"); + for (String string : split) { + result.add(Integer.valueOf(string)); + } } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-10-01 09:52:31 UTC (rev 1258) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-10-01 10:31:41 UTC (rev 1259) @@ -241,6 +241,10 @@ } } + if (model.getLengthClassesPmfmId()==null) { + model.setLengthClassesPmfmId(Lists.<String>newArrayList()); + } + SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); @@ -507,7 +511,9 @@ String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); Caracteristic lengthStepPmfm = allCaracteristic.get(lengthStepPmfmId); - if (lengthStepPmfmId != null && !model.containsLengthClassesPmfmId(lengthStepPmfmId)) { + if (lengthStepPmfmId != null && + !lengthClassesPmfmId.contains(lengthStepPmfm) && + !model.containsLengthClassesPmfmId(lengthStepPmfmId)) { if (log.isInfoEnabled()) { log.info("Found a new lengthStep pmfm: " + lengthStepPmfmId); }