Author: bleny Date: 2011-03-17 18:11:32 +0000 (Thu, 17 Mar 2011) New Revision: 1072 Log: add method in service for filtering purpose Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-17 17:14:22 UTC (rev 1071) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-17 18:11:32 UTC (rev 1072) @@ -40,6 +40,7 @@ import fr.ifremer.wao.bean.FacadeRowImpl; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; +import fr.ifremer.wao.bean.SamplingFilterValues; import fr.ifremer.wao.bean.SamplingStrategy; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.entity.Boat; @@ -1447,4 +1448,9 @@ List<TargetSpeciesDCF> dcfSpecies = transaction.findByQuery(query); return dcfSpecies; } + + @Override + protected SamplingFilterValues executeGetPossibleValuesForFilter(TopiaContext transaction, SamplingFilter filter) throws Exception { + throw new UnsupportedOperationException("not yet implemented"); + } } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-17 17:14:22 UTC (rev 1071) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-03-17 18:11:32 UTC (rev 1072) @@ -193,6 +193,7 @@ wao.error.serviceSampling.getNewSampleRow= wao.error.serviceSampling.getNewSampleRowCode= wao.error.serviceSampling.getNewSampleRowLog= +wao.error.serviceSampling.getPossibleValuesForFilter= wao.error.serviceSampling.getPrograms= wao.error.serviceSampling.getSampleRow= wao.error.serviceSampling.getSampleRowByCode= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-17 17:14:22 UTC (rev 1071) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-03-17 18:11:32 UTC (rev 1072) @@ -193,6 +193,7 @@ wao.error.serviceSampling.getNewSampleRow= wao.error.serviceSampling.getNewSampleRowCode=Impossible de r\u00E9cup\u00E9rer un nouveau code pour une ligne d'\u00E9chantillonnage wao.error.serviceSampling.getNewSampleRowLog= +wao.error.serviceSampling.getPossibleValuesForFilter= wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'\u00E9chantillon ayant pour identifiant \: %1$s wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'\u00E9chantillon ayant pour code %1$s Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)