Author: sletellier Date: 2011-03-18 11:28:54 +0000 (Fri, 18 Mar 2011) New Revision: 1074 Log: - Pass to eugene 2.3.3-SNAPSHOT to have addAll and removeAll methods - Override add and addAll method to check id added is already in - Creating get*AsList to get collections as list for Tapestry GenericSelectModel Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java Modified: trunk/pom.xml trunk/wao-business/src/main/xmi/wao.zargo Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-18 09:46:30 UTC (rev 1073) +++ trunk/pom.xml 2011-03-18 11:28:54 UTC (rev 1074) @@ -315,7 +315,7 @@ <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>1.0</nuitonWebVersion> <topiaVersion>2.5.2</topiaVersion> - <eugeneVersion>2.3.1</eugeneVersion> + <eugeneVersion>2.3.3-SNAPSHOT</eugeneVersion> <tapestryVersion>5.2.4</tapestryVersion> <hibernateVersion>3.3.2.GA</hibernateVersion> <jfreeVersion>1.0.12</jfreeVersion> Added: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-03-18 11:28:54 UTC (rev 1074) @@ -0,0 +1,217 @@ +package fr.ifremer.wao.bean; + + +import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.FishingGearDCF; +import fr.ifremer.wao.entity.TargetSpeciesDCF; +import fr.ifremer.wao.entity.TerrestrialLocation; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class SamplingFilterValuesImpl extends SamplingFilterValues { + + @Override + public void addCompanies(Company companies) { + if (companies == null) { + return; + } + if (this.companies != null && !this.companies.contains(companies)) { + super.addCompanies(companies); + } + } + + @Override + public void addAllCompanies(Collection<Company> companies) { + if (companies == null) { + return; + } + if (this.companies != null && !this.companies.containsAll(companies)) { + super.addAllCompanies(companies); + } else { + for (Company company : companies) { + addCompanies(company); + } + } + } + + @Override + public void addPrograms(String programs) { + if (programs == null) { + return; + } + if (this.programs != null && !this.programs.contains(programs)) { + super.addPrograms(programs); + } + } + + @Override + public void addAllPrograms(Collection<String> programs) { + if (programs == null) { + return; + } + if (this.programs!= null && !this.programs.containsAll(programs)) { + super.addAllPrograms(programs); + } else { + for (String program : programs) { + addPrograms(program); + } + } + } + + @Override + public void addFacadeNames(String facadeNames) { + if (facadeNames == null) { + return; + } + if (this.facadeNames != null && !this.facadeNames.contains(facadeNames)) { + super.addFacadeNames(facadeNames); + } + } + + @Override + public void addAllFacadeNames(Collection<String> facadeNames) { + if (facadeNames == null) { + return; + } + if (this.facadeNames != null && !this.facadeNames.containsAll(facadeNames)) { + super.addAllFacadeNames(facadeNames); + } else { + for (String facadeName : facadeNames) { + addFacadeNames(facadeName); + } + } + } + + @Override + public void addSectorsNames(String sectorsNames) { + if (sectorsNames == null) { + return; + } + if (this.sectorsNames != null && !this.sectorsNames.contains(sectorsNames)) { + super.addSectorsNames(sectorsNames); + } + } + + @Override + public void addAllSectorsNames(Collection<String> sectorsNames) { + if (sectorsNames == null) { + return; + } + if (this.sectorsNames != null && !this.sectorsNames.containsAll(sectorsNames)) { + super.addAllSectorsNames(sectorsNames); + } else { + for (String sectorsName : sectorsNames) { + addSectorsNames(sectorsName); + } + } + } + + @Override + public void addFishingGearDCFCodes(FishingGearDCF fishingGearDCFCodes) { + if (fishingGearDCFCodes == null) { + return; + } + if (this.fishingGearDCFCodes != null && !this.fishingGearDCFCodes.contains(fishingGearDCFCodes)) { + super.addFishingGearDCFCodes(fishingGearDCFCodes); + } + } + + @Override + public void addAllFishingGearDCFCodes(Collection<FishingGearDCF> fishingGearDCFCodes) { + if (fishingGearDCFCodes == null) { + return; + } + if (this.fishingGearDCFCodes != null && !this.fishingGearDCFCodes.containsAll(fishingGearDCFCodes)) { + super.addAllFishingGearDCFCodes(fishingGearDCFCodes); + } else { + for (FishingGearDCF fishingGearDCFCode : fishingGearDCFCodes) { + addFishingGearDCFCodes(fishingGearDCFCode); + } + } + } + + @Override + public void addTargetSpeciesDCFCodes(TargetSpeciesDCF targetSpeciesDCFCodes) { + if (targetSpeciesDCFCodes == null) { + return; + } + if (this.targetSpeciesDCFCodes != null && !this.targetSpeciesDCFCodes.contains(targetSpeciesDCFCodes)) { + super.addTargetSpeciesDCFCodes(targetSpeciesDCFCodes); + } + } + + @Override + public void addAllTargetSpeciesDCFCodes(Collection<TargetSpeciesDCF> targetSpeciesDCFCodes) { + if (targetSpeciesDCFCodes == null) { + return; + } + if (this.targetSpeciesDCFCodes != null && !this.targetSpeciesDCFCodes.containsAll(targetSpeciesDCFCodes)) { + super.addAllTargetSpeciesDCFCodes(targetSpeciesDCFCodes); + } else { + for (TargetSpeciesDCF targetSpeciesDCFCode : targetSpeciesDCFCodes) { + addTargetSpeciesDCFCodes(targetSpeciesDCFCode); + } + } + } + + @Override + public void addTerrestrialDistricts(TerrestrialLocation terrestrialDistricts) { + if (terrestrialDistricts == null) { + return; + } + if (this.terrestrialDistricts != null && !this.terrestrialDistricts.contains(terrestrialDistricts)) { + super.addTerrestrialDistricts(terrestrialDistricts); + } + } + + @Override + public void addAllTerrestrialDistricts(Collection<TerrestrialLocation> terrestrialDistricts) { + if (terrestrialDistricts == null) { + return; + } + if (this.terrestrialDistricts != null && !this.terrestrialDistricts.containsAll(terrestrialDistricts)) { + super.addAllTerrestrialDistricts(terrestrialDistricts); + } else { + for (TerrestrialLocation terrestrialDistrict : terrestrialDistricts) { + addTerrestrialDistricts(terrestrialDistrict); + } + } + } + + @Override + public List<Company> getCompaniesAsList() { + return new ArrayList<Company>(getCompanies()); + } + + @Override + public List<String> getProgramsAsList() { + return new ArrayList<String>(getPrograms()); + } + + @Override + public List<String> getFacadeNamesAsList() { + return new ArrayList<String>(getFacadeNames()); + } + + @Override + public List<String> getSectorsNamesAsList() { + return new ArrayList<String>(getSectorsNames()); + } + + @Override + public List<FishingGearDCF> getFishingGearDCFCodesAsList() { + return new ArrayList<FishingGearDCF>(getFishingGearDCFCodes()); + } + + @Override + public List<TargetSpeciesDCF> getTargetSpeciesDCFCodesAsList() { + return new ArrayList<TargetSpeciesDCF>(getTargetSpeciesDCFCodes()); + } + + @Override + public List<TerrestrialLocation> getTerrestrialDistrictsAsList() { + return new ArrayList<TerrestrialLocation>(getTerrestrialDistricts()); + } +} //SamplingFilterValuesImpl Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ)