Author: tchemit Date: 2013-07-03 16:26:04 +0200 (Wed, 03 Jul 2013) New Revision: 1114 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1114 Log: fix build + add condition when importing bad caracteristic in protocol Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.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/export/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-07-03 12:52:32 UTC (rev 1113) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/TuttiExportService.java 2013-07-03 14:26:04 UTC (rev 1114) @@ -706,7 +706,8 @@ marineLitterModel = new MarineLitterExportModel(csvSeparator); catchModel = new CatchExportModel(csvSeparator, samplingOrder, - samplingToCaracteristic); + samplingToCaracteristic, + decoratorService); accidentalCatchModel = new AccidentalCatchExportModel( csvSeparator, deadOrAliveCaracteristic, 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-07-03 12:52:32 UTC (rev 1113) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-07-03 14:26:04 UTC (rev 1114) @@ -698,7 +698,9 @@ List<Caracteristic> selection = Lists.newArrayList(); if (CollectionUtils.isNotEmpty(selectedIds)) { for (String selectedId : selectedIds) { - selection.add(caracteristicMap.get(selectedId)); + Caracteristic e = caracteristicMap.get(selectedId); + Preconditions.checkNotNull(e,"Could not find caracteristic with id: "+selectedId); + selection.add(e); } } model.setSelected(selection);