- Wao-commits - mailman.cloud.codelutin.com

Jenkins build is back to normal : wao-nightly » Wao #37
by admin+ci-codelutin.com＠codelutin.com 17 Apr '14

17 Apr '14

See <http://ci.codelutin.com/jenkins/job/wao-nightly/fr.ifremer$wao/37/>

1 0

r1896 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: bleny Date: 2014-04-17 15:02:44 +0200 (Thu, 17 Apr 2014) New Revision: 1896 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1896 Log: still trying to find a way to prevent user to view others company sample rows in boat filter values Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-16 12:08:40 UTC (rev 1895) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/SampleRowsFilter.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -177,7 +177,6 @@ @Override public boolean isFilled() { - // volontairement, on ne considère pas ObsProgram car ce n'est pas un critère de sélection en lui-même boolean filled = obsProgram != null || periodFrom != null || periodTo != null Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-16 12:08:40 UTC (rev 1895) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -80,7 +80,7 @@ query.setAlias("b"); - if (filter.getElligibleForSampleRowsFilter().isFilled()) { + if (isFilled(filter)) { SampleRowTopiaDao sampleRowTopiaDao = topiaDaoSupplier.getDao(SampleRow.class, SampleRowTopiaDao.class); HqlAndParametersBuilder<SampleRow> sampleRowsQuery = @@ -133,4 +133,21 @@ return query; } + + protected boolean isFilled(BoatsFilter filter) { + // volontairement, on ne considère pas ObsProgram car ce n'est pas un critère de sélection en lui-même + boolean filled = filter.getElligibleForSampleRowsFilter().getPeriodFrom() != null + || filter.getElligibleForSampleRowsFilter().getPeriodTo() != null + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getSampleRowIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getFishingZoneFacadeNames()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getFishingZoneSectorNames()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getSampleRowCodes()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getProgramNames()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getFishingGearDcfIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getTargetSpeciesDcfIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getSamplingStrategies()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getTerrestrialDistrictIds()) + || CollectionUtils.isNotEmpty(filter.getElligibleForSampleRowsFilter().getCompanyIds()); + return filled; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-16 12:08:40 UTC (rev 1895) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -23,7 +23,6 @@ import com.google.common.base.Charsets; import com.google.common.base.Optional; -import com.google.common.collect.ImmutableSet; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; @@ -48,7 +47,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Set; /** * Created on 4/1/14. @@ -66,15 +64,15 @@ BoatTopiaDao dao = getBoatDao(); // XXX brendan 07/04/14 ne pas inclure les lignes qui ne sont pas associées à un autre société que celle du coordinateur - Set<String> companyIds = null; - if (authenticatedWaoUser.isCoordinatorOrObserver()) { - companyIds = filter.getElligibleForSampleRowsFilter().getCompanyIds(); - filter.getElligibleForSampleRowsFilter().setCompanyIds(ImmutableSet.of(authenticatedWaoUser.getCompany().getTopiaId())); - } +// Set<String> companyIds = null; +// if (authenticatedWaoUser.isCoordinatorOrObserver()) { +// companyIds = filter.getElligibleForSampleRowsFilter().getCompanyIds(); +// filter.getElligibleForSampleRowsFilter().setCompanyIds(ImmutableSet.of(authenticatedWaoUser.getCompany().getTopiaId())); +// } List<Boat> boats = dao.findAll(filter); - if (authenticatedWaoUser.isCoordinatorOrObserver()) { - filter.getElligibleForSampleRowsFilter().setCompanyIds(companyIds); - } +// if (authenticatedWaoUser.isCoordinatorOrObserver()) { +// filter.getElligibleForSampleRowsFilter().setCompanyIds(companyIds); +// } BoatsFilterValues boatsFilterValues = new BoatsFilterValues(serviceContext.getLocale(), filter.getObsProgram()); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-04-16 12:08:40 UTC (rev 1895) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-04-17 13:02:44 UTC (rev 1896) @@ -74,7 +74,8 @@ fishingZoneFacadeNames.add(FilterOption.forString(fishingZone.getFacadeName())); fishingZoneSectorNames.add(FilterOption.forString(fishingZone.getSectorName())); } - sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); + //sampleRowCodes.add(FilterOption.forString(sampleRow.getCode())); + sampleRowCodes.add(FilterOption.forValueAndLabel(sampleRow.getCode(), sampleRow.getCode() + " " + (sampleRow.getCompany() == null ? "" : sampleRow.getCompany().getName()))); programNames.add(FilterOption.forString(sampleRow.getProgramName())); Company company = sampleRow.getCompany();

1 0

r1895 - trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: bleny Date: 2014-04-16 14:08:40 +0200 (Wed, 16 Apr 2014) New Revision: 1895 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1895 Log: refs #4490 make boatName filter case-incensitive Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-16 11:46:49 UTC (rev 1894) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-04-16 12:08:40 UTC (rev 1895) @@ -96,7 +96,7 @@ } if (StringUtils.isNotEmpty(filter.getBoatName())) { - query.addLike(Boat.PROPERTY_NAME, filter.getBoatName() + "%"); + query.addWhereClause("lower(b." + Boat.PROPERTY_NAME + ") like :boatName", ImmutableMap.of("boatName", (Object) (filter.getBoatName().toLowerCase() + "%"))); } if (StringUtils.isNotEmpty(filter.getRegistrationCode())) {

1 0

r1894 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: bleny Date: 2014-04-16 13:46:49 +0200 (Wed, 16 Apr 2014) New Revision: 1894 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1894 Log: remove padding-left: 5px for form-horizontal Modified: trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-16 11:38:40 UTC (rev 1893) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-16 11:46:49 UTC (rev 1894) @@ -144,6 +144,9 @@ margin-top: 0px; border: none; background-color: inherit; +} + +form.filters-form .form-actions { padding-left: 5px; }

1 0

r1893 - in trunk/wao-web/src/main: resources/i18n webapp webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: bleny Date: 2014-04-16 13:38:40 +0200 (Wed, 16 Apr 2014) New Revision: 1893 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1893 Log: change label for filter action and show button as btn-primary Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-16 11:38:40 UTC (rev 1893) @@ -57,7 +57,7 @@ wao.ui.action.editOrDeleteSampleRow=Edit or delete sample row wao.ui.action.enlargeView=Enlarge view wao.ui.action.exportBoats=Export boats with private infos -wao.ui.action.filter=Filter +wao.ui.action.filter=Apply filters wao.ui.action.goBackToSamplingPlan=Back to sampling plan wao.ui.action.hideFilters=Hide filters wao.ui.action.login=Connection Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-16 11:38:40 UTC (rev 1893) @@ -57,7 +57,7 @@ wao.ui.action.editOrDeleteSampleRow=Modifier ou supprimer la ligne wao.ui.action.enlargeView=Agrandir la vue wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations privées -wao.ui.action.filter=Filtrer +wao.ui.action.filter=Appliquer les filtres wao.ui.action.goBackToSamplingPlan=Retourner au plan d'échantillonnage wao.ui.action.hideFilters=Masquer les filtres wao.ui.action.login=Connexion Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-16 11:38:40 UTC (rev 1893) @@ -152,14 +152,14 @@ <div class="form-actions"> + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> + </s:submit> + <s:submit action="reset-boats-filter" type="button" cssClass="btn"> <i class="icon-reset"></i> <s:text name="wao.ui.action.reset" /> </s:submit> - <s:submit type="button" cssClass="btn"> - <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> - </s:submit> - <s:submit action="export-boats" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> </s:submit> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-04-16 11:38:40 UTC (rev 1893) @@ -250,14 +250,14 @@ <div class="form-actions"> + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> + </s:submit> + <s:submit action="reset-contacts-filter" type="button" cssClass="btn"> <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit type="button" cssClass="btn"> - <i class="icon-filter"></i> <s:text name="wao.ui.action.filter"/> - </s:submit> - <s:submit action="export-contacts" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> </s:submit> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-16 11:38:40 UTC (rev 1893) @@ -141,14 +141,14 @@ <div class="form-actions"> + <s:submit type="button" cssClass="btn btn-primary"> + <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> + </s:submit> + <s:submit action="reset-sample-rows-filter" type="button" cssClass="btn"> <i class="icon-reset"></i> <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit type="button" cssClass="btn"> - <i class="icon-filter"></i> <s:text name="wao.ui.action.filter" /> - </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> </s:submit> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-16 10:23:07 UTC (rev 1892) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-16 11:38:40 UTC (rev 1893) @@ -126,10 +126,7 @@ } main.large { - width: 100%; max-width: 100%; - margin-left: 10px; - margin-right: 10px; } /** @@ -147,6 +144,7 @@ margin-top: 0px; border: none; background-color: inherit; + padding-left: 5px; } textarea {

1 0

Build failed in Jenkins: wao-ci #143
by admin+ci-codelutin.com＠codelutin.com 16 Apr '14

16 Apr '14

1 2

Build failed in Jenkins: wao-ci » Wao :: Persistence #143
by admin+ci-codelutin.com＠codelutin.com 16 Apr '14

16 Apr '14

See <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/143/> ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Wao :: Persistence 4.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 12.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… (2 KB at 12.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (4 KB at 128.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… (4 KB at 128.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/3.0… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/3.0… (803 B at 27.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (803 B at 24.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (15 KB at 506.6 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/nuiton-ut… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/nui… (2 KB at 51.3 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/nuiton-ut… (2 KB at 31.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (202 KB at 3534.8 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ wao-persistence --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ wao-persistence --- [INFO] [INFO] --- eugene-maven-plugin:2.7.3:generate (generate-entities) @ wao-persistence --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (2 KB at 40.5 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… (2 KB at 40.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (5 KB at 147.4 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/wao-group/org/nuiton/topia/top… (5 KB at 182.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/top… (94 KB at 2526.9 KB/sec) [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/sr…> [INFO] Will generate <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> [INFO] Copy file <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/sr…> to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> [INFO] Generate one file in 14.405ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> for 1 file(s). [INFO] Will generate <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> [INFO] Copy file <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> to <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> [INFO] Generate one file in 1.307s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:577) getObjectElements - Invalid tagvalue [fr.ifremer.wao.entity.Boat.attribute.boatDistrict.tagValue.lazy] : Element 'boatDistrict' of type 'attribute' on classifier 'fr.ifremer.wao.entity.Boat' is null. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:577) getObjectElements - Invalid tagvalue [fr.ifremer.wao.entity.WaoUser.attribute.SampleRow.tagValue.inverse] : Element 'SampleRow' of type 'attribute' on classifier 'fr.ifremer.wao.entity.WaoUser' is null. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:459) loadTagValue - Invalid tag value [fr.ifremer.wao.entity.WaoUser.attribute.allegroWallet.tagValue.unique] : this tagvalue 'unique' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.copyright] : the tagvalue 'copyright' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.exceptionClass] : the tagvalue 'exceptionClass' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:294) loadModelTagValue - Invalid model tag value [model.tagValue.java.lang.String] : the tagvalue 'java.lang.String' is unkown. WARN [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:303) loadModelTagValue - Invalid model tag value [model.tagValue.useEnumerationName] : this tagvalue 'useEnumerationName' can not be apply on the model. INFO [pool-1-thread-1 for channel] (AbstractObjectModelReader.java:270) loadModelProperties - 32 tag values were succesfull imported from <http://ci.codelutin.com/jenkins/job/wao-ci/fr.ifremer$wao-persistence/ws/ta…> [INFO] No file generated. [INFO] Apply generator TopiaMetaTransformer WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getUserProfile([fr.ifremer.wao.entity.ObsProgram obsProgram<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name getUserProfile is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setDCF5Code([java.lang.String codes<<[]>> tagvalue: {}, java.lang.String separatorRegex<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setDCF5Code is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [getSampleMonth([java.util.Date date<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name getSampleMonth is already reserved for a getter/setter of an entity attribute WARN [pool-1-thread-1 for channel] (TopiaMetaTransformer.java:110) validateModel - [VALIDATION] [setLogText([fr.ifremer.wao.entity.SampleRow oldSampleRow<<[]>> tagvalue: {}, fr.ifremer.wao.entity.SampleRow newSampleRow<<[]>> tagvalue: {}])<<[]>> throws [] tagvalue: {}] Operation name setLogText is already reserved for a getter/setter of an entity attribute INFO [pool-1-thread-1 for channel] (ObjectModelTransformerToJava.java:998) isInClassPath - Will not generate [fr.ifremer.wao.entity.WaoUserImpl], already found in class-path. [JENKINS] Archiving disabled

1 2

r1892 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 16 Apr '14

16 Apr '14

Author: bleny Date: 2014-04-16 12:23:07 +0200 (Wed, 16 Apr 2014) New Revision: 1892 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1892 Log: refs #4490 add a link to contacts for boat Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-04-15 15:19:39 UTC (rev 1891) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-04-16 10:23:07 UTC (rev 1892) @@ -217,4 +217,11 @@ return query.findFirstOrNull(); } + public long countContacts(ObsProgram obsProgram, String boatId, String companyId) { + TopiaQueryBuilderAddCriteriaOrRunQueryStep<Contact> query = newQueryBuilder(); + query.addTopiaIdEquals(Contact.PROPERTY_BOAT, boatId); + query.addTopiaIdEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_COMPANY, companyId); + query.addEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, obsProgram.ordinal()); + return query.count(); + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java 2014-04-15 15:19:39 UTC (rev 1891) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatDetails.java 2014-04-16 10:23:07 UTC (rev 1892) @@ -41,10 +41,13 @@ protected Contact mostRecentContact; - public BoatDetails(ObsProgram obsProgram, BoatInfos boatInfos, Contact mostRecentContact) { + protected long contactsCount; + + public BoatDetails(ObsProgram obsProgram, BoatInfos boatInfos, Contact mostRecentContact, long contactsCount) { this.obsProgram = obsProgram; this.boatInfos = boatInfos; this.mostRecentContact = mostRecentContact; + this.contactsCount = contactsCount; } public BoatInfos getBoatInfos() { @@ -73,4 +76,8 @@ } return elligibleForSampleRows; } + + public long getContactsCount() { + return contactsCount; + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-15 15:19:39 UTC (rev 1891) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-16 10:23:07 UTC (rev 1892) @@ -169,9 +169,9 @@ Contact mostRecentContact = getContactDao().findMostRecentContactOrNull(obsProgram, boatId, companyId); - long count = getContactDao().newQueryBuilder().addTopiaIdEquals(Contact.PROPERTY_BOAT, boatId).count(); + long contactsCount = getContactDao().countContacts(obsProgram, boatId, companyId); - BoatDetails boatDetails = new BoatDetails(obsProgram, boatInfos, mostRecentContact); + BoatDetails boatDetails = new BoatDetails(obsProgram, boatInfos, mostRecentContact, contactsCount); return boatDetails; Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-15 15:19:39 UTC (rev 1891) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-16 10:23:07 UTC (rev 1892) @@ -80,6 +80,7 @@ wao.ui.action.switchToFullView=Switch to full view wao.ui.action.unvalidateContact=Unvalidate contact wao.ui.action.viewAssociatedContacts=View sample row contacts +wao.ui.action.viewAssociatedContactsForBoat=View %s contacts for this boat wao.ui.action.viewBoatsForRow=View the boats for this sample row wao.ui.action.viewCompanyWaoUsers=View users for this company wao.ui.action.viewElligibleBoats=View eligible boats @@ -96,6 +97,9 @@ wao.ui.boats.boatLength=Length wao.ui.boats.boatName=Name wao.ui.boats.buildYear=Build year +wao.ui.boats.contacts=Contacts +wao.ui.boats.contacts.existing=Existing contacts +wao.ui.boats.contacts.none=No contacts wao.ui.boats.district=District wao.ui.boats.info=Details wao.ui.boats.interlocutor=Interlocutor Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-15 15:19:39 UTC (rev 1891) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-16 10:23:07 UTC (rev 1892) @@ -80,6 +80,7 @@ wao.ui.action.switchToFullView=Étendre la vue wao.ui.action.unvalidateContact=Invalider le contact wao.ui.action.viewAssociatedContacts=Voir les contacts associés à cette ligne +wao.ui.action.viewAssociatedContactsForBoat=Voir les %s contacts pour ce navire wao.ui.action.viewBoatsForRow=Voir les navires présentis pour cette ligne wao.ui.action.viewCompanyWaoUsers=Voir les utilisateurs associés à cette société wao.ui.action.viewElligibleBoats=Consulter les navires éligibles @@ -96,6 +97,9 @@ wao.ui.boats.boatLength=Longueur wao.ui.boats.boatName=Nom wao.ui.boats.buildYear=Année de construction +wao.ui.boats.contacts=Contacts +wao.ui.boats.contacts.existing=Contacts existants +wao.ui.boats.contacts.none=Aucun contact wao.ui.boats.district=Quartier maritime wao.ui.boats.info=Autres informations sur ce navire wao.ui.boats.interlocutor=Coordonnées de l'interlocuteur Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-15 15:19:39 UTC (rev 1891) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-16 10:23:07 UTC (rev 1892) @@ -131,9 +131,16 @@ </tbody> </table> +<h2> + <s:text name="wao.ui.boats.contacts"/> +</h2> -<s:if test="boatDetails.mostRecentContact != null"> +<h3> + <s:text name="wao.ui.boats.contacts.existing"/> +</h3> +<s:if test="boatDetails.contactsCount > 0"> + <h3> <s:text name="wao.ui.contact.lastContact"/> </h3> @@ -174,11 +181,27 @@ </tr> </tbody> </table> + + <s:url action="contacts" id="viewAssociatedContactsForBoatUrl"> + <s:param name="filter.boatFilter.registrationCode" value="boatDetails.boatInfos.boat.immatriculation"/> + <s:param name="filter.periodFrom"/> + <s:param name="filter.periodTo"/> + </s:url> + <s:a href="%{viewAssociatedContactsForBoatUrl}"> + <s:text name="wao.ui.action.viewAssociatedContactsForBoat"> + <s:param value="boatDetails.contactsCount"/> + </s:text> + </s:a> + </s:if> +<s:else> + <s:text name="wao.ui.boats.contacts.none"/> +</s:else> <h3> <s:text name="wao.ui.contact.creation"/> </h3> + <s:if test="boatDetails.boatInfos.boat.active"> <s:if test="startBoatSelectionForSampleRow == null"> <s:if test="boatDetails.elligibleForSampleRows.empty"> @@ -237,4 +260,4 @@ <div class="alert"> <s:text name="wao.ui.tip.inactiveBoat"/> </div> -</s:else> \ No newline at end of file +</s:else>

1 0

r1891 - trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: bleny Date: 2014-04-15 17:19:39 +0200 (Tue, 15 Apr 2014) New Revision: 1891 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1891 Log: input type phone is not HTML5 compliant Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-15 15:19:03 UTC (rev 1890) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-15 15:19:39 UTC (rev 1891) @@ -73,7 +73,7 @@ <s:textfield name="boatInfos.contactFirstName" value="%{boatDetails.boatInfos.contactFirstName}" label="%{getText('wao.ui.field.BoatInfos.contactFirstName')}" readonly="true" cssClass="input-large" /> <s:textfield name="boatInfos.contactLastName" value="%{boatDetails.boatInfos.contactLastName}" label="%{getText('wao.ui.field.BoatInfos.contactLastName')}" readonly="true" cssClass="input-large" /> <s:textfield type="email" name="boatInfos.contactEmail" value="%{boatDetails.boatInfos.contactEmail}" label="%{getText('wao.ui.field.BoatInfos.contactEmail')}" readonly="true" cssClass="input-large" /> - <s:textfield type="phone" name="boatInfos.contactPhoneNumber" value="%{boatDetails.boatInfos.contactPhoneNumber}" label="%{getText('wao.ui.field.BoatInfos.contactPhoneNumber')}" readonly="true" cssClass="input-large" /> + <s:textfield type="tel" name="boatInfos.contactPhoneNumber" value="%{boatDetails.boatInfos.contactPhoneNumber}" label="%{getText('wao.ui.field.BoatInfos.contactPhoneNumber')}" readonly="true" cssClass="input-large" /> <s:textfield type="number" name="boatInfos.dup" value="%{boatDetails.boatInfos.dup}" label="%{getText('wao.ui.field.BoatInfos.dup')}" readonly="true" cssClass="input-small" /> <s:textfield name="boatInfos.contactAddress1" value="%{boatDetails.boatInfos.contactAddress1}" label="%{getText('wao.ui.field.BoatInfos.contactAddress1')}" readonly="true" cssClass="input-xxlarge" /> <s:textfield name="boatInfos.contactAddress2" value="%{boatDetails.boatInfos.contactAddress2}" label="%{getText('wao.ui.field.BoatInfos.contactAddress2')}" readonly="true" cssClass="input-xxlarge" />

1 0

r1890 - in trunk: . wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/xmi wao-persistence/src/test/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations
by bleny＠users.forge.codelutin.com 15 Apr '14

15 Apr '14

Author: bleny Date: 2014-04-15 17:19:03 +0200 (Tue, 15 Apr 2014) New Revision: 1890 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1890 Log: change model to add 'unique' where necessary Modified: trunk/pom.xml trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/pom.xml 2014-04-15 15:19:03 UTC (rev 1890) @@ -116,7 +116,7 @@ <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> - <eugeneVersion>2.7.3</eugeneVersion> + <eugeneVersion>2.8-SNAPSHOT</eugeneVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion>  Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -24,10 +24,10 @@ package fr.ifremer.wao.entity; -import java.util.Collection; import java.util.Date; import java.util.LinkedList; import java.util.List; +import java.util.Set; /** * ContactImpl @@ -120,13 +120,13 @@ } @Override - public void addAllSecondaryObservers(Collection<WaoUser> secondaryObservers) { + public void addAllSecondaryObservers(Set<WaoUser> secondaryObservers) { super.addAllSecondaryObservers(secondaryObservers); updateNbObservers(); } @Override - public void setSecondaryObservers(Collection<WaoUser> secondaryObservers) { + public void setSecondaryObservers(Set<WaoUser> secondaryObservers) { super.setSecondaryObservers(secondaryObservers); updateNbObservers(); } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -29,9 +29,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import java.util.ArrayList; -import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; @@ -73,10 +72,12 @@ */ @Override public String getFacade() { - if (getFishingZone().size() > 0) { - return getFishingZone().get(0).getFacadeName(); + FishingZone firstFishingZone = Iterables.getFirst(getFishingZone(), null); + String facade = null; + if (firstFishingZone != null) { + facade = firstFishingZone.getFacadeName(); } - return null; + return facade; } /** @@ -176,7 +177,7 @@ setdCF5Code(null); } else { String[] splitCodes = codes.split(separatorRegex); - List<DCF5Code> dcfFives = new ArrayList<>(splitCodes.length); + Set<DCF5Code> dcfFives = new HashSet<>(splitCodes.length); for (String code : splitCodes) { String[] codeParts = code.split("_"); DCF5Code dcfFive = new DCF5CodeImpl(); Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -39,6 +39,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; /** * SampleRowLogImpl @@ -278,7 +279,7 @@ oldMonths = Maps.uniqueIndex(oldRow.getSampleMonth(), TopiaEntities.getTopiaIdFunction()); } - List<SampleMonth> newMonths = newRow.getSampleMonth(); + Set<SampleMonth> newMonths = newRow.getSampleMonth(); for (SampleMonth oldMonth : oldMonths.values()) { if ( ! newMonths.contains(oldMonth)) { String date = dateFormat.format(oldMonth.getPeriodDate()); @@ -305,13 +306,13 @@ } protected void compareEligibleBoats() { - List<ElligibleBoat> oldEligibleBoats; + Collection<ElligibleBoat> oldEligibleBoats; if (oldRow == null) { oldEligibleBoats = Collections.emptyList(); } else { oldEligibleBoats = oldRow.getElligibleBoat(); } - List<ElligibleBoat> newEligibleBoats = newRow.getElligibleBoat(); + Collection<ElligibleBoat> newEligibleBoats = newRow.getElligibleBoat(); // Lists for boats by status List<Integer> noLongerEligibleBoats = new ArrayList<>(); @@ -350,13 +351,13 @@ } protected void compareFishingZones() { - List<FishingZone> oldFishingZones; + Collection<FishingZone> oldFishingZones; if (oldRow == null) { oldFishingZones = Collections.emptyList(); } else { oldFishingZones = oldRow.getFishingZone(); } - List<FishingZone> newFishingZones = newRow.getFishingZone(); + Collection<FishingZone> newFishingZones = newRow.getFishingZone(); // Lists for boats by status List<String> removedZones = new ArrayList<>(); Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/SampleRowLogImplTest.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -31,8 +31,7 @@ import org.junit.Test; import org.nuiton.util.DateUtil; -import java.util.ArrayList; -import java.util.Collections; +import java.util.HashSet; public class SampleRowLogImplTest { @@ -50,9 +49,9 @@ sampleRow.setPeriodBegin(DateUtil.createDate(1, 3, 2011)); sampleRow.setPeriodEnd(DateUtil.createDate(1, 6, 2011)); sampleRow.setProfession(new ProfessionImpl()); - sampleRow.setSampleMonth(Collections.<SampleMonth>emptyList()); - sampleRow.setElligibleBoat(Collections.<ElligibleBoat>emptyList()); - sampleRow.setFishingZone(new ArrayList<FishingZone>()); + sampleRow.setSampleMonth(new HashSet<SampleMonth>()); + sampleRow.setElligibleBoat(new HashSet<ElligibleBoat>()); + sampleRow.setFishingZone(new HashSet<FishingZone>()); return sampleRow; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlan.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -34,6 +34,7 @@ import java.io.Serializable; import java.text.NumberFormat; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Iterator; @@ -448,7 +449,8 @@ } // compute sampleRowPeriod - List<SampleMonth> sampleMonth = sampleRow.getSampleMonth(); + // TODO brendan 15/04/14 use treeset + List<SampleMonth> sampleMonth = new ArrayList<>(sampleRow.getSampleMonth()); firstSampleMonthDate = sampleMonth.get(0).getPeriodDate(); lastSampleMonthDate = sampleMonth.get(sampleMonth.size() - 1).getPeriodDate(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -87,7 +87,6 @@ import java.io.InputStream; import java.text.ParseException; -import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; import java.util.Date; @@ -148,8 +147,8 @@ newSampleRow.setObsProgram(ObsProgram.OBSMER); newSampleRow.setProfession(new ProfessionImpl()); - newSampleRow.setFishingZone(new ArrayList<FishingZone>()); - newSampleRow.setSampleMonth(new ArrayList<SampleMonth>()); + newSampleRow.setFishingZone(new HashSet<FishingZone>()); + newSampleRow.setSampleMonth(new HashSet<SampleMonth>()); newSampleRow.setSamplingStrategy(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); String newSampleRowCode = getNewSampleRowCode(ObsProgram.OBSMER); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -95,7 +95,6 @@ import java.io.InputStream; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -1031,9 +1030,9 @@ * les instances de {@link fr.ifremer.wao.entity.DCF5Code} correspondantes en ajoutant * les manquantes au référentiel au besoin. */ - public Collection<DCF5Code> getDcf5Codes(String joinedDcf5Codes) throws UnknownFishingGearDcfCodeException, UnknownTargetSpeciesDcfCodeException { + public Set<DCF5Code> getDcf5Codes(String joinedDcf5Codes) throws UnknownFishingGearDcfCodeException, UnknownTargetSpeciesDcfCodeException { - Collection<DCF5Code> dcf5Codes = new HashSet<>(); + Set<DCF5Code> dcf5Codes = new HashSet<>(); DCF5CodeTopiaDao dao = getDCF5CodeDao(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -33,12 +33,10 @@ import org.nuiton.i18n.I18n; import org.nuiton.util.StringUtil; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import java.util.Locale; +import java.util.Set; -public class DCF5CodesParserFormatter implements ValueParserFormatter<List<DCF5Code>> { +public class DCF5CodesParserFormatter implements ValueParserFormatter<Set<DCF5Code>> { protected static final String DCF5_CODES_SEPARATOR = ","; @@ -56,17 +54,16 @@ } @Override - public String format(List<DCF5Code> dcf5Codes) { + public String format(Set<DCF5Code> dcf5Codes) { String join = StringUtil.join(Iterables.transform(dcf5Codes, DCF5Codes.getCode()), DCF5_CODES_SEPARATOR, true); return join; } @Override - public List<DCF5Code> parse(String codes) { + public Set<DCF5Code> parse(String codes) { try { - Collection<DCF5Code> dcf5Codes = referentialService.getDcf5Codes(codes); - List<DCF5Code> value = new ArrayList<>(dcf5Codes); - return value; + Set<DCF5Code> dcf5Codes = referentialService.getDcf5Codes(codes); + return dcf5Codes; } catch (UnknownFishingGearDcfCodeException e) { throw new IllegalArgumentException(I18n.l(locale,"wao.import.sampleRow.failure.unknownFishingGearDcfCode", e.getCode()), e); } catch (UnknownTargetSpeciesDcfCodeException e) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -32,14 +32,16 @@ import org.nuiton.i18n.I18n; import java.text.ParseException; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.util.Set; /** * Consiste en plusieurs codes de zones de pêches séparés par des " / ". */ -public class FishingZonesParserFormatter implements ValueParserFormatter<List<FishingZone>> { +public class FishingZonesParserFormatter implements ValueParserFormatter<Set<FishingZone>> { protected final Locale locale; @@ -53,7 +55,7 @@ } @Override - public String format(List<FishingZone> fishingZones) { + public String format(Set<FishingZone> fishingZones) { List<String> districtCodes = new LinkedList<>(); for (FishingZone fishingZone : fishingZones) { districtCodes.add(fishingZone.getDistrictCode()); @@ -62,11 +64,11 @@ } @Override - public List<FishingZone> parse(String districtCodes) throws ParseException { + public Set<FishingZone> parse(String districtCodes) throws ParseException { if (indexedFishingZones == null) { indexedFishingZones = Maps.uniqueIndex(fishingZones, FishingZones.getDistrictCode()); } - List<FishingZone> fishingZones = new LinkedList<>(); + Set<FishingZone> fishingZones = new HashSet<>(); if (StringUtils.isBlank(districtCodes)) { throw new IllegalArgumentException(I18n.l(locale, "wao.import.sampleRow.failure.fishingZoneMissing")); } else { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-04-15 13:41:07 UTC (rev 1889) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-04-15 15:19:03 UTC (rev 1890) @@ -33,11 +33,12 @@ import org.nuiton.i18n.I18n; import java.text.ParseException; -import java.util.LinkedList; +import java.util.HashSet; import java.util.List; import java.util.Locale; +import java.util.Set; -public class UsersParserFormatter implements ValueParserFormatter<List<WaoUser>> { +public class UsersParserFormatter implements ValueParserFormatter<Set<WaoUser>> { protected static final String SEPARATOR = ","; @@ -52,16 +53,16 @@ } @Override - public String format(List<WaoUser> value) { + public String format(Set<WaoUser> value) { Iterable<String> usersLogin = Iterables.transform(value, WaoUsers.getLogin()); String commaSeparatedLogins = StringUtils.join(usersLogin, ", "); return commaSeparatedLogins; } @Override - public List<WaoUser> parse(String value) throws ParseException { + public Set<WaoUser> parse(String value) throws ParseException { String[] logins = StringUtils.split(value, SEPARATOR); - List<WaoUser> users = new LinkedList<>(); + Set<WaoUser> users = new HashSet<>(); for (String login : logins) { String trimmedLogin = login.trim(); WaoUser user = indexedWaoUsers.get(trimmedLogin);

1 0