Author: bleny Date: 2011-05-24 17:10:03 +0000 (Tue, 24 May 2011) New Revision: 1295 Log: fix filters on facade and zone Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-24 17:09:35 UTC (rev 1294) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-24 17:10:03 UTC (rev 1295) @@ -23,9 +23,11 @@ */ package fr.ifremer.wao.bean; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingGearDCF; +import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.entity.TerrestrialDivision; @@ -37,6 +39,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; public class SamplingFilterValuesImpl extends SamplingFilterValues { @@ -141,8 +144,10 @@ } } else { // for both ObsMer and ObsVente - addFacadeNames(sampleRow.getFacade()); - addSectorsNames(sampleRow.getSectors()); + for (FishingZone fishingZone : sampleRow.getFishingZone()) { + addFacadeNames(fishingZone.getFacadeName()); + addSectorsNames(fishingZone.getSectorName()); + } addPrograms(sampleRow.getProgramName()); Collection<DCF5Code> dcf5Codes = sampleRow.getDCF5Code(); if (dcf5Codes != null) {