Author: fdesbois Date: 2010-02-09 01:17:29 +0000 (Tue, 09 Feb 2010) New Revision: 338 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo Log: Clean old throw TopiaException Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-02-09 01:04:19 UTC (rev 337) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/ContactFilterImpl.java 2010-02-09 01:17:29 UTC (rev 338) @@ -42,25 +42,21 @@ public class ContactFilterImpl extends ContactFilter { @Override - public TopiaQuery prepareQueryForContact(TopiaQuery query) throws TopiaException { + public TopiaQuery prepareQueryForContact(TopiaQuery query) { String contact = query.getMainAlias(); if (getObserver() != null) { query.add(contact + "." + Contact.OBSERVER, getObserver()); } - // Company filter is managed by SamplingFilter cause the company is linked with the sampleRow instead of contact user -// else if (getCompany() != null) { -// query.add(contact + "." + Contact.USER + "." + User.COMPANY, getCompany()); -// } + // Company filter is managed by SamplingFilter because the company is + // linked with the sampleRow instead of contact user if (isSamplingFiltered() || getFromDate() != null || getCompany() != null) { // Seems to be necessary to have distinct on sampleRows in case of // fishingZone join. Otherwise multiple contacts for sames sampleRow // will be returned (Bad count). -// TopiaQuery<SampleRow> subquery = TopiaQuery.createQuery(SampleRow.class, "S").setSelect("S").addDistinct(); query = prepareQueryForSampling(query, contact + "." + Contact.SAMPLE_ROW); -// query.add(contact + "." + Contact.SAMPLE_ROW + " IN (" + subquery.fullQuery() + ")").addParams(subquery.getParams()); } query = prepareQueryForBoat(query, contact + "." + Contact.BOAT); Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-02-09 01:04:19 UTC (rev 337) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/bean/SamplingFilterImpl.java 2010-02-09 01:17:29 UTC (rev 338) @@ -45,8 +45,7 @@ public class SamplingFilterImpl extends SamplingFilter { @Override - public TopiaQuery prepareQueryForSampling(TopiaQuery query, String main) - throws TopiaException { + public TopiaQuery prepareQueryForSampling(TopiaQuery query, String main) { // SampleRow filter depends on SampleRow or sectorName or facadeName if (getSampleRow() != null) { Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ)