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

r2113 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources/db/migration wao-persistence/src/test/java/fr/ifremer/wao wao-persistence/src/test/java/fr/ifremer/wao/entity wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-services/src/main/java/fr/ifremer/wao/services/service/csv/op
by bleny＠users.forge.codelutin.com June 30, 2014

June 30, 2014

Author: bleny Date: 2014-06-30 12:38:02 +0200 (Mon, 30 Jun 2014) New Revision: 2113 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2113 Log: update file headers Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoFilter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import java.io.Serializable; Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ElligibleBoatImpl.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.lang3.BooleanUtils; public class ElligibleBoatImpl extends ElligibleBoatAbstract { Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,3 +1,23 @@ +--- +-- #%L +-- Wao :: Persistence +-- %% +-- Copyright (C) 2009 - 2014 Ifremer +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- Il y a des doublons dans la table qui stocke les informations sur le lien entre ligne du plan et navires éligibles. -- Un même navire peut être associé en tant qu'éligible plusieurs fois. -- On rectifie le tir en supprimant les doublons et en ajoutant une contrainte d'unicité Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,3 +1,23 @@ +--- +-- #%L +-- Wao :: Persistence +-- %% +-- Copyright (C) 2009 - 2014 Ifremer +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- -- we no longer user topia migration service drop table tms_version; Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/WaoUtilsTest.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; Modified: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactImplTest.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoApplicationContext.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.cache.Cache; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/AbstractFilterValues.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.apache.commons.beanutils.BeanUtilsBean; import java.io.Serializable; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatContactsCounts.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + public class BoatContactsCounts { protected long contactsCount; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/BoatsFilterValuesCacheKey.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Objects; import com.google.common.base.Optional; import fr.ifremer.wao.entity.ObsProgram; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/CompanySynthesis.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.ContactState; import java.io.Serializable; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; import java.util.Date; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; import java.util.Date; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class IllegalAcceptationException extends ContactValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.WaoUser; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.WaoUser; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class MissingContactMammalsInfoException extends ContactValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class MissingContactTerrestrialLocationException extends ContactValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingDcf5CodesException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingFishingZonesException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingPeriodBeginException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingPeriodEndException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingProfessionSpeciesException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingProgramNameException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingSampleRowLogCommentException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlanService.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Optional; import com.google.common.cache.Cache; import fr.ifremer.wao.SampleRowsFilter; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public abstract class SampleRowValidationException extends WaoValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingZone; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanCacheKey.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Objects; import com.google.common.base.Optional; import fr.ifremer.wao.SampleRowsFilter; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.base.Preconditions; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/Synthesis.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Boat; import org.jfree.chart.JFreeChart; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SynthesisService.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.collect.Multimap; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnknownContactIdException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + public class UnknownContactIdException extends Throwable { protected String contactId; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; /** Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.WaoException; public abstract class WaoValidationException extends WaoException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class WrongSampleRowCodeFormatException extends SampleRowValidationException { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.csv; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; import org.nuiton.csv.Common; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/I18nAbleParserFormatter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.csv.operations; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.collect.Sets; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.I18nAble; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.mail; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.WaoUser; Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoApplicationContext.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.services; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.WaoTopiaPersistenceContext; import java.util.Locale; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/CacheInvalidationTopiaEntityListener.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.cache.Cache; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.entity.Boat; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CancelBoatSelectionAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/CreateContactAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.services.service.ContactsService; import fr.ifremer.wao.web.WaoJspActionSupport; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.services.service.BoatContactsCounts; import fr.ifremer.wao.services.service.BoatsService; import fr.ifremer.wao.web.WaoJsonActionSupport; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatElligibilityJsonAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.services.service.BoatsService; import fr.ifremer.wao.web.WaoJsonActionSupport; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/UpdateBoatInfosJsonAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Preconditions; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.entity.BoatInfos; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action.obsmer; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.web.action.AbstractSamplingPlanAction; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action.obsvente; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.wao.services.service.ObsVenteSamplingPlanService; import fr.ifremer.wao.services.service.SamplingPlan; import fr.ifremer.wao.web.action.AbstractSamplingPlanAction; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateConverter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -10,12 +10,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/DateTimeConverter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -10,12 +10,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/JFreeChartToImgTagConverter.java 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.converter; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.io.BaseEncoding; import fr.ifremer.wao.WaoTechnicalException; import org.apache.struts2.util.StrutsTypeConverter; Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/BoatDetails-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### expiredSampleRowIds=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/services/service/Synthesis-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1,2 +1,22 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### expectedVsActualObservationsByMonthsChart=fr.ifremer.wao.web.converter.JFreeChartToImgTagConverter boardingBoatsChart=fr.ifremer.wao.web.converter.JFreeChartToImgTagConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/BoatsAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/ContactsAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/GetBoatContactsCountJsonAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### since=fr.ifremer.wao.web.converter.DateConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/SynthesisAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### filter=org.nuiton.web.struts2.converters.JsonConverter Modified: trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties 2014-06-30 10:30:23 UTC (rev 2112) +++ trunk/wao-web/src/main/resources/fr/ifremer/wao/web/action/obsvente/SamplingPlanAction-conversion.properties 2014-06-30 10:38:02 UTC (rev 2113) @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### filter=org.nuiton.web.struts2.converters.JsonConverter

1 0

r2112 - in trunk/wao-web/src/main/webapp: bootstrap-wysihtml5-0.0.2 css wysihtml5-0.3.0
by bleny＠users.forge.codelutin.com June 30, 2014

June 30, 2014

Author: bleny Date: 2014-06-30 12:30:23 +0200 (Mon, 30 Jun 2014) New Revision: 2112 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2112 Log: add missing ignore license tags Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css trunk/wao-web/src/main/webapp/css/font-awesome.min.css trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.css 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ ul.wysihtml5-toolbar { margin: 0; padding: 0; Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.fr-FR.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ /** * French translation for bootstrap-wysihtml5 */ Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ !function($, wysi) { "use strict"; Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/bootstrap-wysihtml5.min.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1 +1,2 @@ +/* %%Ignore-License */ !function(a,b){"use strict";var c={"font-styles":"<li class='dropdown'><a class='btn dropdown-toggle' data-toggle='dropdown' href='#'><i class='icon-font'></i> <span class='current-font'>Normal text</span> <b class='caret'></b></a><ul class='dropdown-menu'><li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='div'>Normal text</a></li><li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h1'>Heading 1</a></li><li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h2'>Heading 2</a></li></ul></li>",emphasis:"<li><div class='btn-group'><a class='btn' data-wysihtml5-command='bold' title='CTRL+B'>Bold</a><a class='btn' data-wysihtml5-command='italic' title='CTRL+I'>Italic</a></div></li>",lists:"<li><div class='btn-group'><a class='btn' data-wysihtml5-command='insertUnorderedList' title='Unordered List'><i class='icon-list'></i></a><a class='btn' data-wysihtml5-command='insertOrderedList' title='Ordered List'><i class='icon-th-list'></i></a><a class='btn' data-wysihtml5-command='Outdent' title='Outdent'><i class='icon-indent-right'></i></a><a class='btn' data-wysihtml5-command='Indent' title='Indent'><i class='icon-indent-left'></i></a></div></li>",link:"<li><div class='bootstrap-wysihtml5-insert-link-modal modal hide fade'><div class='modal-header'><a class='close' data-dismiss='modal'>×</a><h3>Insert Link</h3></div><div class='modal-body'><input value='http://' class='bootstrap-wysihtml5-insert-link-url input-xlarge'></div><div class='modal-footer'><a href='#' class='btn' data-dismiss='modal'>Cancel</a><a href='#' class='btn btn-primary' data-dismiss='modal'>Insert link</a></div></div><a class='btn' data-wysihtml5-command='createLink' title='Link'><i class='icon-share'></i></a></li>",image:"<li><div class='bootstrap-wysihtml5-insert-image-modal modal hide fade'><div class='modal-header'><a class='close' data-dismiss='modal'>×</a><h3>Insert Image</h3></div><div class='modal-body'><input value='http://' class='bootstrap-wysihtml5-insert-image-url input-xlarge'></div><div class='modal-footer'><a href='#' class='btn' data-dismiss='modal'>Cancel</a><a href='#' class='btn btn-primary' data-dismiss='modal'>Insert image</a></div></div><a class='btn' data-wysihtml5-command='insertImage' title='Insert image'><i class='icon-picture'></i></a></li>",html:"<li><div class='btn-group'><a class='btn' data-wysihtml5-action='change_view' title='Edit HTML'><i class='icon-pencil'></i></a></div></li>"},d={"font-styles":!0,emphasis:!0,lists:!0,html:!1,link:!0,image:!0,events:{},parserRules:{tags:{b:{},i:{},br:{},ol:{},ul:{},li:{},h1:{},h2:{},u:1,img:{check_attributes:{width:"numbers",alt:"alt",src:"url",height:"numbers"}},a:{set_attributes:{target:"_blank",rel:"nofollow"},check_attributes:{href:"url"}}}}},e=function(b,c){this.el=b,this.toolbar=this.createToolbar(b,c||d),this.editor=this.createEditor(c),window.editor=this.editor,a("iframe.wysihtml5-sandbox").each(function(b,c){a(c.contentWindow).off("focus.wysihtml5").on({"focus.wysihtml5":function(){a("li.dropdown").removeClass("open")}})})};e.prototype={constructor:e,createEditor:function(a){var c=d.parserRules;a&&a.parserRules&&(c=a.parserRules);var e=new b.Editor(this.el.attr("id"),{toolbar:this.toolbar.attr("id"),parserRules:c});if(a&&a.events)for(var f in a.events)e.on(f,a.events[f]);return e},createToolbar:function(b,e){var f=this,g=a("<ul/>",{id:b.attr("id")+"-wysihtml5-toolbar","class":"wysihtml5-toolbar",style:"display:none"});for(var h in d){var i=!1;e[h]!=undefined?e[h]==1&&(i=!0):i=d[h],i==1&&(g.append(c[h]),h=="html"&&this.initHtml(g),h=="link"&&this.initInsertLink(g),h=="image"&&this.initInsertImage(g))}var f=this;return g.find("a[data-wysihtml5-command='formatBlock']").click(function(b){var c=a(b.srcElement);f.toolbar.find(".current-font").text(c.html())}),this.el.before(g),g},initHtml:function(a){var b="a[data-wysihtml5-action='change_view']";a.find(b).click(function(c){a.find("a.btn").not(b).toggleClass("disabled")})},initInsertImage:function(a){var b=this,c=a.find(".bootstrap-wysihtml5-insert-image-modal"),d=c.find(".bootstrap-wysihtml5-insert-image-url"),e=c.find("a.btn-primary"),f=d.val(),g=function(){var a=d.val();d.val(f),b.editor.composer.commands.exec("insertImage",a)};d.keypress(function(a){a.which==13&&(g(),c.modal("hide"))}),e.click(g),c.on("shown",function(){d.focus()}),c.on("hide",function(){b.editor.currentView.element.focus()}),a.find("a[data-wysihtml5-command=insertImage]").click(function(){c.modal("show")})},initInsertLink:function(a){var b=this,c=a.find(".bootstrap-wysihtml5-insert-link-modal"),d=c.find(".bootstrap-wysihtml5-insert-link-url"),e=c.find("a.btn-primary"),f=d.val(),g=function(){var a=d.val();d.val(f),b.editor.composer.commands.exec("createLink",{href:a,target:"_blank",rel:"nofollow"})},h=!1;d.keypress(function(a){a.which==13&&(g(),c.modal("hide"))}),e.click(g),c.on("shown",function(){d.focus()}),c.on("hide",function(){b.editor.currentView.element.focus()}),a.find("a[data-wysihtml5-command=createLink]").click(function(){c.modal("show")})}},a.fn.wysihtml5=function(b){return this.each(function(){var c=a(this);c.data("wysihtml5",new e(c,b))})},a.fn.wysihtml5.Constructor=e}(window.jQuery,window.wysihtml5); \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css =================================================================== --- trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/bootstrap-wysihtml5-0.0.2/wysiwyg-color.css 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,7 @@ +/* + * %%Ignore-License + */ + .wysiwyg-color-black { color: black; } Modified: trunk/wao-web/src/main/webapp/css/font-awesome.min.css =================================================================== --- trunk/wao-web/src/main/webapp/css/font-awesome.min.css 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/css/font-awesome.min.css 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,4 +1,4 @@ -/*! +/*! %%Ignore-License * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857142858em;text-align:center}.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0,mirror=1);-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2,mirror=1);-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-reply-all:before{content:"\f122"}.fa-mail-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"} \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js =================================================================== --- trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ /** * @license wysihtml5 v0.3.0 * https://github.com/xing/wysihtml5 Modified: trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js =================================================================== --- trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js 2014-06-30 09:07:09 UTC (rev 2111) +++ trunk/wao-web/src/main/webapp/wysihtml5-0.3.0/wysihtml5.min.js 2014-06-30 10:30:23 UTC (rev 2112) @@ -1,3 +1,4 @@ +/* %%Ignore-License */ /* wysihtml5 v0.3.0 https://github.com/xing/wysihtml5

1 0

r2111 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web/action resources/i18n
by bleny＠users.forge.codelutin.com June 30, 2014

June 30, 2014

Author: bleny Date: 2014-06-30 11:07:09 +0200 (Mon, 30 Jun 2014) New Revision: 2111 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2111 Log: fixes #5349 add validation on filter#periodTo ?\226?\137?\165 filter#periodFrom Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.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 Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -29,6 +29,7 @@ import fr.ifremer.wao.services.service.SamplingPlanService; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.i18n.I18n; import java.text.SimpleDateFormat; import java.util.Date; @@ -64,6 +65,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getSampleRowsFilter(), filter); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -35,6 +35,7 @@ import fr.ifremer.wao.services.service.ObsMerContactsList; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.time.DateUtils; +import org.nuiton.i18n.I18n; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -116,6 +117,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getContactsFilter(), filter); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/SynthesisAction.java 2014-06-30 09:07:09 UTC (rev 2111) @@ -6,6 +6,7 @@ import fr.ifremer.wao.services.service.Synthesis; import fr.ifremer.wao.services.service.SynthesisService; import fr.ifremer.wao.web.WaoJspActionSupport; +import org.nuiton.i18n.I18n; public class SynthesisAction extends WaoJspActionSupport implements Preparable { @@ -36,6 +37,15 @@ } @Override + public void validate() { + + if (filter.getPeriodTo().before(filter.getPeriodFrom())) { + addFieldError("filter.periodTo", I18n.l(getLocale(), "wao.ui.periodToMustBeAfterPeriodFrom")); + } + + } + + @Override public String execute() { filter = Objects.firstNonNull(session.getSynthesisFilter(), filter); 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-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-30 09:07:09 UTC (rev 2111) @@ -492,6 +492,7 @@ wao.ui.page.companies.title=Companies wao.ui.page.waoUsers.title=Users wao.ui.page.waoUsers.titleForCompany=Users for company %s +wao.ui.periodToMustBeAfterPeriodFrom=The end of the period must be after the beginning wao.ui.publishedByProgram=Pusblished by program wao.ui.publishedByYourCompany=Published by company wao.ui.removeBoatEligibility.confirm=Are you sure you want to make this boat ineligible for sample row ? 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-06-26 14:29:44 UTC (rev 2110) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-30 09:07:09 UTC (rev 2111) @@ -492,6 +492,7 @@ wao.ui.page.companies.title=Sociétés wao.ui.page.waoUsers.title=Utilisateurs wao.ui.page.waoUsers.titleForCompany=Utilisateurs de la société %s +wao.ui.periodToMustBeAfterPeriodFrom=La période de temps doit se terminer après avoir commencé wao.ui.publishedByProgram=Publiée par le programme wao.ui.publishedByYourCompany=Publiée par la société wao.ui.removeBoatEligibility.confirm=Êtes-vous sûr de vouloir rendre le navire inéligible pour cette ligne ?

1 0

r2110 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/resources/i18n wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer wao-web/src/main/resources/i18n wao-web/src/main/webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: bleny Date: 2014-06-26 16:29:44 +0200 (Thu, 26 Jun 2014) New Revision: 2110 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2110 Log: fixes #4726 export sampling plan with stats Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.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/SamplingPlan.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/sampling-plan.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -174,4 +174,8 @@ public static int collectionHashcode(Collection<?> a) { return a == null ? 0 : a.size(); } + + public static String getMonthPattern(Locale locale) { + return I18n.l(locale, "wao.month.pattern"); + } } Modified: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-06-26 14:29:44 UTC (rev 2110) @@ -147,4 +147,5 @@ wao.dateyear.formatter=%1$tY wao.month.formatter=%1$tm-%1$tY wao.month.parser=MM-yyyy +wao.month.pattern= wao.time.formatter=%1$tH\:%1$tM Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -194,6 +194,10 @@ return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); } + public boolean isAuthorizedToExportSamplingPlanWithStatistics() { + return userProfile.isAdmin() || userProfile.isCoordinator(); + } + public boolean isAuthorizedToViewContactsComments() { return ! userProfile.isProfessional(); } 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-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanService.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.cache.Cache; import com.google.common.collect.ImmutableSet; @@ -28,6 +29,7 @@ import com.google.common.collect.Sets; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.SampleRowsFilter; +import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactState; @@ -36,13 +38,19 @@ import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import fr.ifremer.wao.services.service.csv.ObsMerSamplingPlanExportModel; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.csv.Export; +import org.nuiton.csv.ExportModel; +import java.io.InputStream; import java.util.Collection; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; public class ObsMerSamplingPlanService extends SamplingPlanService { @@ -214,4 +222,42 @@ return Pair.of(real, estimated); } + + public InputStream exportSamplingPlanWithStatistics(AuthenticatedWaoUser authenticatedWaoUser, SampleRowsFilter filter) { + + ObsMerSamplingPlan samplingPlan = getSamplingPlan(authenticatedWaoUser, filter); + + Collection<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> sampleRows = + new LinkedHashSet<>(); + for (SamplingPlan.SamplingPlanFacadePart facade : samplingPlan) { + for (SamplingPlan.SamplingPlanSectorPart<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> sector : facade) { + for (ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart obsMerSampleRowPart : sector) { + sampleRows.add(obsMerSampleRowPart); + } + } + } + + ExportModel<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> exportModel = + new ObsMerSamplingPlanExportModel( + getLocale(), + filter.getPeriodFrom(), + filter.getPeriodTo()); + + Export<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> export = + Export.newExport(exportModel, sampleRows); + + try { + + String csvContent = export.toString(Charsets.UTF_8); + + InputStream csvInputStream = IOUtils.toInputStream(csvContent, Charsets.UTF_8); + + return csvInputStream; + + } catch (Exception e) { + throw new WaoTechnicalException(e); + } + + } + } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -6,6 +6,7 @@ import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowLog; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.nuiton.util.DateUtil; @@ -281,6 +282,10 @@ */ protected SamplingPlanStatistics totalTides; + protected String facade; + + protected String sectors; + protected String fishingZones; protected String code; @@ -362,6 +367,8 @@ } } totalTides = new SamplingPlanStatistics(totalTidesExpected, totalTidesReal, totalTidesEstimated); + facade = sampleRow.getFacade(); + sectors = sampleRow.getSectors(); fishingZones = ""; for (FishingZone zone : sampleRow.getFishingZone()) { fishingZones += zone.getDistrictCode() + ", "; @@ -434,6 +441,14 @@ return code; } + public String getFacade() { + return facade; + } + + public String getSectors() { + return sectors; + } + public String getFishingZonesInfos() { return fishingZonesInfos; } @@ -545,6 +560,10 @@ public long getSampleRowContactCounts() { return sampleRowContactCounts; } + + public String getDcf5Codes() { + return StringUtils.join(getDcf5CodesAndDescriptions().keySet(), ", "); + } } } Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerSamplingPlanExportModel.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -0,0 +1,102 @@ +package fr.ifremer.wao.services.service.csv; + +import fr.ifremer.wao.WaoUtils; +import fr.ifremer.wao.services.service.ObsMerSamplingPlan; +import org.nuiton.csv.Common; +import org.nuiton.csv.ValueGetter; +import org.nuiton.csv.ext.AbstractExportModel; +import org.nuiton.util.PeriodDates; + +import java.util.Collection; +import java.util.Date; +import java.util.Locale; + +public class ObsMerSamplingPlanExportModel extends AbstractExportModel<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart> { + + public ObsMerSamplingPlanExportModel(Locale locale, Date periodFrom, Date periodTo) { + + super(';'); + + Common.DateValue monthYearFormatter = + new Common.DateValue(WaoUtils.getMonthPattern(locale)); + + modelBuilder.newColumnForExport("PLAN_CODE", "code"); + modelBuilder.newColumnForExport("PROGRAMME_CODE", "programName"); + modelBuilder.newColumnForExport("PROGRAMME_DEBUT", "periodBegin", monthYearFormatter); + modelBuilder.newColumnForExport("PROGRAMME_DEBUT", "periodEnd", monthYearFormatter); + modelBuilder.newColumnForExport("SOCIETE_NOM", "companyName"); + modelBuilder.newColumnForExport("PECHE_FACADE", "facade"); + modelBuilder.newColumnForExport("PECHE_ZONE", "sectors"); + modelBuilder.newColumnForExport("ZONES_PECHE", "fishingZones"); + modelBuilder.newColumnForExport("ZONES_PECHE_INFOS", "fishingZonesInfos"); + modelBuilder.newColumnForExport("ZONES_PECHE_INFOS", "fishingZonesInfos"); + modelBuilder.newColumnForExport("METIER_MAILLAGE", "professionMeshSize"); + modelBuilder.newColumnForExport("METIER_TAILLE", "professionSize"); + modelBuilder.newColumnForExport("METIER_AUTRE", "professionOther"); + modelBuilder.newColumnForExport("METIER_LIBELLE", "professionLibelle"); + modelBuilder.newColumnForExport("METIER_ESPECES", "professionSpecies"); + modelBuilder.newColumnForImportExport("PLAN_DUREE_MOY", "averageTideTime", Common.DOUBLE_PRIMITIVE); + modelBuilder.newColumnForImportExport("PLAN_NB_OBSERV", "nbObservants", Common.PRIMITIVE_INTEGER); + modelBuilder.newColumnForImportExport("TAUX_COUVERTURE_APPLIQUE", "appliedCoverageRate", Common.DOUBLE); + + Collection<Date> months = new PeriodDates(periodFrom, periodTo).getMonths(); + + for (Date month : months) { + String headerName = monthYearFormatter.format(month); + modelBuilder.newColumnForExport(headerName + "_EFFORT", new ExpectedTidesValueGetter(month), Common.INTEGER); + modelBuilder.newColumnForExport(headerName + "_ESTIME", new EstimatedTidesValueGetter(month), Common.INTEGER); + modelBuilder.newColumnForExport(headerName + "_REALISE", new RealTidesValueGetter(month), Common.INTEGER); + } + + modelBuilder.newColumnForExport("TOTAL_EFFORT", "totalTidesExpected", Common.INTEGER); + modelBuilder.newColumnForExport("TOTAL_ESTIME", "totalTidesEstimated", Common.INTEGER); + modelBuilder.newColumnForExport("TOTAL_REALISE", "totalTidesReal", Common.INTEGER); + + modelBuilder.newColumnForExport("TOTAL_EFFORT_JOURS", "observationTimesInDaysExpected", Common.DOUBLE); + modelBuilder.newColumnForExport("TOTAL_ESTIME_JOURS", "observationTimesInDaysEstimated", Common.LONG); + modelBuilder.newColumnForExport("TOTAL_REALISE_JOURS", "observationTimesInDaysReal", Common.LONG); + + } + + protected static class ExpectedTidesValueGetter implements ValueGetter<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart, Integer> { + + protected Date month; + + public ExpectedTidesValueGetter(Date month) { + this.month = month; + } + + @Override + public Integer get(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) { + return sampleRowPart.getNbTidesExpected(month); + } + } + + protected static class EstimatedTidesValueGetter implements ValueGetter<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart, Integer> { + + protected Date month; + + public EstimatedTidesValueGetter(Date month) { + this.month = month; + } + + @Override + public Integer get(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) { + return sampleRowPart.getNbTidesExpected(month); + } + } + + protected static class RealTidesValueGetter implements ValueGetter<ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart, Integer> { + + protected Date month; + + public RealTidesValueGetter(Date month) { + this.month = month; + } + + @Override + public Integer get(ObsMerSamplingPlan.ObsMerSamplingPlanSampleRowPart sampleRowPart) { + return sampleRowPart.getNbTidesReal(month); + } + } +} Copied: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java (from rev 2106, trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ExportSamplingPlanAction.java) =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ExportSamplingPlanWithStatisticsAction.java 2014-06-26 14:29:44 UTC (rev 2110) @@ -0,0 +1,72 @@ +package fr.ifremer.wao.web.action.obsmer; + +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import com.opensymphony.xwork2.Preparable; +import fr.ifremer.wao.SampleRowsFilter; +import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; +import fr.ifremer.wao.web.action.AbstractDownloadCsvAction; + +import java.io.InputStream; +import java.util.Date; + +public class ExportSamplingPlanWithStatisticsAction extends AbstractDownloadCsvAction implements Preparable { + + private static final long serialVersionUID = 1L; + + protected transient ObsMerSamplingPlanService service; + + protected SampleRowsFilter filter; + + public void setService(ObsMerSamplingPlanService service) { + this.service = service; + } + + public SampleRowsFilter getFilter() { + if (filter == null) { + prepare(); + } + return filter; + } + + @Override + public void prepare() { + + filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); + + } + + @Override + public String getFileName() { + + return "plan-stats_" + getObsProgram().name() + "_" + dateFormat.format(new Date()) + ".csv"; + + } + + @Override + public InputStream getInputStream() { + + return service.exportSamplingPlanWithStatistics(getAuthenticatedWaoUser(), filter); + + } + +} 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-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-26 14:29:44 UTC (rev 2110) @@ -61,6 +61,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.exportSamplingPlanCsvWithStatistics=Export the plan and the statistics to CSV wao.ui.action.filter=Apply filters wao.ui.action.goBackToSamplingPlan=Back to sampling plan wao.ui.action.hideFilters=Hide filters 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-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-26 14:29:44 UTC (rev 2110) @@ -61,6 +61,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.exportSamplingPlanCsvWithStatistics=Exporter au format CSV le plan avec le réalisé wao.ui.action.filter=Appliquer les filtres wao.ui.action.goBackToSamplingPlan=Retourner au plan d'échantillonnage wao.ui.action.hideFilters=Masquer les filtres 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-06-26 14:29:00 UTC (rev 2109) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-26 14:29:44 UTC (rev 2110) @@ -147,6 +147,12 @@ </s:submit> </s:if> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlanWithStatistics"> + <s:submit namespace="/obsmer" action="export-sampling-plan-with-statistics" type="button" cssClass="btn"> + <i class="icon-download"></i> <s:text name="wao.ui.action.exportSamplingPlanCsvWithStatistics" /> + </s:submit> + </s:if> + </div> </s:form>

1 0

r2109 - trunk/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: bleny Date: 2014-06-26 16:29:00 +0200 (Thu, 26 Jun 2014) New Revision: 2109 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2109 Log: disable login cheat Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-26 09:20:44 UTC (rev 2108) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-06-26 14:29:00 UTC (rev 2109) @@ -27,12 +27,6 @@ import com.opensymphony.xwork2.interceptor.Interceptor; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaPersistenceContext; -import fr.ifremer.wao.entity.ObsProgram; -import fr.ifremer.wao.entity.UserProfile; -import fr.ifremer.wao.entity.UserProfileImpl; -import fr.ifremer.wao.entity.UserRole; -import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.WaoApplicationContext; import fr.ifremer.wao.services.WaoService; import fr.ifremer.wao.services.WaoServiceContext; @@ -77,26 +71,9 @@ WaoSession waoSession = getWaoSession(invocation); - if (waoSession.getAuthenticatedWaoUser() == null) { + if (waoSession.getAuthenticatedWaoUser() == null && ! ACTIONS_ACCESSIBLE_WITHOUT_LOGIN.contains(waoAction.getClass())) { - boolean loginCheat = getWaoApplicationContext(invocation).getApplicationConfig().isDevMode(); - if (loginCheat) { - // login à l'arrache - WaoUser admin = serviceContext.getPersistenceContext().getWaoUserDao().forLoginEquals("vincent.badts(a)ifremer.fr").findUnique(); - admin.sizeUserProfile(); - admin.sizeCanReadBoats(); - admin.getCompany().getTopiaId(); - UserProfile userProfile = new UserProfileImpl(); - userProfile.setUserRole(UserRole.ADMIN); - userProfile.setObsProgram(ObsProgram.OBSVENTE); - userProfile.setCanWrite(true); - AuthenticatedWaoUser authenticatedWaoUser = new AuthenticatedWaoUser(admin, userProfile); - waoSession.setAuthenticatedWaoUser(authenticatedWaoUser); - } else { - if ( ! ACTIONS_ACCESSIBLE_WITHOUT_LOGIN.contains(waoAction.getClass())) { - return "redirect-to-login"; - } - } + return "redirect-to-login"; }

1 0

r2108 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv
by bleny＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: bleny Date: 2014-06-26 11:20:44 +0200 (Thu, 26 Jun 2014) New Revision: 2108 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2108 Log: remove obsdeb csv model Removed: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java Deleted: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java 2014-06-26 09:14:21 UTC (rev 2107) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java 2014-06-26 09:20:44 UTC (rev 2108) @@ -1,303 +0,0 @@ -/* - * #%L - * Wao :: Business - * %% - * Copyright (C) 2009 - 2011 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.services.service.csv; - - -import fr.ifremer.wao.entity.Boat; -import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.ObsProgram; -import fr.ifremer.wao.entity.ObservationType; -import fr.ifremer.wao.entity.SampleRow; -import fr.ifremer.wao.entity.SampleRowImpl; -import fr.ifremer.wao.entity.TerrestrialDivision; -import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.services.service.csv.operations.BoatParserFormatter; -import fr.ifremer.wao.services.service.csv.operations.CompanyParserFormatter; -import fr.ifremer.wao.services.service.csv.operations.RegionParserFormatter; -import fr.ifremer.wao.services.service.csv.operations.SampleRowCodeParserFormatter; -import fr.ifremer.wao.services.service.csv.operations.UsersParserFormatter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.csv.Common; -import org.nuiton.csv.ExportableColumn; -import org.nuiton.csv.ImportExportModel; -import org.nuiton.csv.ImportableColumn; -import org.nuiton.csv.ModelBuilder; -import org.nuiton.csv.ValueGetterSetter; -import org.nuiton.csv.ValueParserFormatter; - -import java.text.ParseException; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -/** - * For now, this model support only import/export of ObsDeb sampling plans. Both - * field work sampling plan and phoning sampling plan are supported. - */ -public class ObsDebSamplingPlanImportExportModel implements ImportExportModel<SampleRow> { - - private static final Log log = LogFactory.getLog(ObsDebSamplingPlanImportExportModel.class); - - protected static final String BOAT_HEADER_NAME = "NAVIRE_COD"; - - protected static final String OBSERVATION_UNIT_HEADER_NAME = "UNITE_OBSERVATION_COD"; - - protected final Locale locale; - - protected List<TerrestrialDivision> observationUnits; - - protected List<WaoUser> allWaoUsers; - - protected List<Company> allCompanies; - - protected List<Boat> allActiveBoats; - - protected List<TerrestrialLocation> allRegions; - - /** Si le modèle représente un import/export pour l'admin ou pas */ - protected boolean admin; - - protected ModelBuilder<SampleRow> modelBuilder; - - /** Type of observation, may be phone or work field depending of what the user is importing */ - protected ObservationType observationType; - - /** Constructor used for import */ - public ObsDebSamplingPlanImportExportModel(Locale locale, - boolean admin, - List<TerrestrialDivision> observationUnits, - List<WaoUser> allWaoUsers, - List<Company> allCompanies, - List<Boat> allActiveBoats, - List<TerrestrialLocation> allRegions) { - this.locale = locale; - this.admin = admin; - this.allWaoUsers = allWaoUsers; - this.observationUnits = observationUnits; - this.allCompanies = allCompanies; - this.allActiveBoats = allActiveBoats; - this.allRegions = allRegions; - } - - /** Constructor used for export */ - public ObsDebSamplingPlanImportExportModel(Locale locale, boolean admin, ObservationType observationType) { - this.locale = locale; - this.admin = admin; - this.observationType = observationType; - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - // by reading the header, we must determine what kind of sampling plan is it - if (headerNames.contains(OBSERVATION_UNIT_HEADER_NAME)) { - observationType = ObservationType.FIELD_WORK_OBSERVATION; - } else if (headerNames.contains(BOAT_HEADER_NAME)) { - observationType = ObservationType.PHONE_CALL; - } - if (log.isDebugEnabled()) { - log.debug("detected type of sampling plan: " + observationType); - } - } - - @Override - public char getSeparator() { - return ';'; - } - - @Override - public SampleRow newEmptyInstance() { - SampleRow newSampleRow = new SampleRowImpl(); - newSampleRow.setObsProgram(ObsProgram.OBSDEB); - newSampleRow.setObservationType(observationType); - return newSampleRow; - } - - protected void buildModel() { - modelBuilder = new ModelBuilder<>(); - modelBuilder.newColumnForImportExport( - "PLAN_CODE", - SampleRow.PROPERTY_CODE, - new SampleRowCodeParserFormatter(locale, ObsProgram.OBSDEB)); - if (admin) { - modelBuilder.newColumnForImportExport( - "SOCIETE", - SampleRow.PROPERTY_COMPANY, - new CompanyParserFormatter(locale, allCompanies)); - } - modelBuilder.newColumnForImportExport( - "OBSERVATEUR_COD", - SampleRow.PROPERTY_GROUP_NAME); - modelBuilder.newColumnForImportExport( - "OBSERVATEURS", - SampleRow.PROPERTY_OBSERVERS, - new UsersParserFormatter(locale, allWaoUsers)); - if (observationType == ObservationType.FIELD_WORK_OBSERVATION) { - modelBuilder.newColumnForImportExport( - "OBSERVATION_DATE", - SampleRow.PROPERTY_EXPECTED_DATE, - Common.DAY); - ObservationUnitParserFormatter observationUnitParser = - new ObservationUnitParserFormatter(observationUnits); - ValueGetterSetter<SampleRow, String> regionCodeGetterSetter = - new RegionCodeSetter(observationUnitParser); - modelBuilder.newColumnForImportExport( - "REGION_IFREMER_COD", - regionCodeGetterSetter); - modelBuilder.newColumnForImportExport( - OBSERVATION_UNIT_HEADER_NAME, - SampleRow.PROPERTY_OBSERVATION_UNIT, - observationUnitParser); - modelBuilder.newColumnForImportExport( - "LIGNE_SANS_CONTACTS", - SampleRow.PROPERTY_BLANK_ROW, - new Common.BooleanParserFormatter(false, false)); - } else if (observationType == ObservationType.PHONE_CALL) { - modelBuilder.newColumnForImportExport( - "REGION_IFREMER", - "terrestrialLocation", - new RegionParserFormatter(locale, allRegions)); - modelBuilder.newColumnForImportExport( - "OBSERVATION_DATE", - SampleRow.PROPERTY_EXPECTED_DATE, - Common.WEEK); - modelBuilder.newColumnForImportExport( - BOAT_HEADER_NAME, - SampleRow.PROPERTY_BOAT, - new BoatParserFormatter(allActiveBoats, locale)); - } - if (log.isDebugEnabled()) { - log.debug("model built : " + modelBuilder.getColumnsForImport()); - } - } - - @Override - public Iterable<ImportableColumn<SampleRow, Object>> getColumnsForImport() { - if (modelBuilder == null) { - buildModel(); - } - return (Iterable) modelBuilder.getColumnsForImport(); - } - - @Override - public Iterable<ExportableColumn<SampleRow, Object>> getColumnsForExport() { - if (modelBuilder == null) { - buildModel(); - } - return (Iterable) modelBuilder.getColumnsForExport(); - } - - protected static class ObservationUnitParserFormatter implements ValueParserFormatter<TerrestrialDivision> { - - /** Index Region code -> UO Code -> Terrestrial division. */ - protected Map<String, Map<String, TerrestrialDivision>> indexedObservationUnits; - - protected List<TerrestrialDivision> observationUnits; - - protected String currentRegionCode; - - ObservationUnitParserFormatter(List<TerrestrialDivision> observationUnits) { - this.observationUnits = observationUnits; - } - - protected void indexObservationUnits(List<TerrestrialDivision> observationUnits) { - indexedObservationUnits = new HashMap<>(); - for (TerrestrialDivision terrestrialDivision : observationUnits) { - String regionCode = terrestrialDivision.getRegionIfremer().getRegionIfremerCode(); - Map<String, TerrestrialDivision> unitCodesToDivision = indexedObservationUnits.get(regionCode); - if (unitCodesToDivision == null) { - unitCodesToDivision = new HashMap<>(); - } - unitCodesToDivision.put(terrestrialDivision.getObservationUnitCode(), terrestrialDivision); - indexedObservationUnits.put(regionCode, unitCodesToDivision); - } - - if (log.isTraceEnabled()) { - for (Map.Entry<String, Map<String, TerrestrialDivision>> entry : indexedObservationUnits.entrySet()) { - log.trace(entry.getKey()); - for (Map.Entry<String, TerrestrialDivision> unitCodesToDivision : entry.getValue().entrySet()) { - log.trace(" -> " + unitCodesToDivision.getKey() + " -> " - + unitCodesToDivision.getValue()); - } - } - } - } - - @Override - public TerrestrialDivision parse(String observationUnitCode) throws ParseException { - if (indexedObservationUnits == null) { - indexObservationUnits(observationUnits); - } - Map<String, TerrestrialDivision> uos = indexedObservationUnits.get(currentRegionCode); - if (uos == null) { - throw new IllegalArgumentException("Le code de région '" + currentRegionCode - + "' n'est pas un code valide"); - } - TerrestrialDivision observationUnit = uos.get(observationUnitCode); - if (observationUnit == null) { - throw new IllegalArgumentException("Il n'y a pas d'unité '" + observationUnitCode - + "' dans la région '" + currentRegionCode + "'"); - } - return observationUnit; - } - - @Override - public String format(TerrestrialDivision terrestrialDivision) { - String observationUnitCode = ""; - if (terrestrialDivision != null) { - observationUnitCode = terrestrialDivision.getObservationUnitCode(); - } - return observationUnitCode; - } - - public void setCurrentRegionCode(String regionCode) { - currentRegionCode = regionCode; - } - } - - protected static class RegionCodeSetter implements ValueGetterSetter<SampleRow, String> { - - protected ObservationUnitParserFormatter observationUnitSetter; - - RegionCodeSetter(ObservationUnitParserFormatter observationUnitSetter) { - this.observationUnitSetter = observationUnitSetter; - } - - @Override - public String get(SampleRow sampleRow) throws Exception { - String regionCode; - if (sampleRow.getObservationUnit() == null) { - regionCode = ""; - } else { - regionCode = sampleRow.getObservationUnit().getRegionIfremer() - .getRegionIfremerCode(); - } - return regionCode; - } - - @Override - public void set(SampleRow sampleRow, String regionCode) throws Exception { - observationUnitSetter.setCurrentRegionCode(regionCode); - } - } -}

1 0

r2107 - in trunk/wao-web/src/main: resources/i18n webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com June 26, 2014

June 26, 2014

Author: bleny Date: 2014-06-26 11:14:21 +0200 (Thu, 26 Jun 2014) New Revision: 2107 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2107 Log: fixes #5311 validate postal code 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/boat-details.jsp 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-06-25 16:41:58 UTC (rev 2106) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-26 09:14:21 UTC (rev 2107) @@ -283,6 +283,7 @@ wao.ui.form.Boat.name=Name wao.ui.form.Boat.registrationCode=Registration number wao.ui.form.BoatInfos.success=Modifications successfuly saved +wao.ui.form.BoatInfos.validation.invalidPostalCode=This is not a valid postal code wao.ui.form.Company.error.nameMustBeUnique=Company name must be unique wao.ui.form.Company.title.creation=Create a new company wao.ui.form.Company.title.edition=Edit company %s 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-06-25 16:41:58 UTC (rev 2106) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-26 09:14:21 UTC (rev 2107) @@ -283,6 +283,7 @@ wao.ui.form.Boat.name=Nom wao.ui.form.Boat.registrationCode=Immatriculation wao.ui.form.BoatInfos.success=Les informations ont bien été enregistrées +wao.ui.form.BoatInfos.validation.invalidPostalCode=Ce n'est pas un code postal valide wao.ui.form.Company.error.nameMustBeUnique=Le nom de la société doit être unique wao.ui.form.Company.title.creation=Création d'une société wao.ui.form.Company.title.edition=Modification de la société %s Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-06-25 16:41:58 UTC (rev 2106) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-06-26 09:14:21 UTC (rev 2107) @@ -31,14 +31,18 @@ var $unlockBoatInfosFormButton = $('#unlock-boat-infos-form'); $saveBoatInfosButton.click(function () { - $boatInfosForm.find('input, textarea').attr('readonly', 'readonly'); - $saveBoatInfosButton.attr('disabled', 'disabled'); - $unlockBoatInfosFormButton.removeAttr('disabled'); var data = WAO.toData($boatInfosForm); - var successCallback = function () { - WAO.notifications.success('<s:text name="wao.ui.form.BoatInfos.success"/>'); + if ( ! data['boatInfos.contactPostalCode'].match(/^[\d ]*$/)) { + alert("<s:text name="wao.ui.form.BoatInfos.validation.invalidPostalCode"/>"); + } else { + $boatInfosForm.find('input, textarea').attr('readonly', 'readonly'); + $saveBoatInfosButton.attr('disabled', 'disabled'); + $unlockBoatInfosFormButton.removeAttr('disabled'); + var successCallback = function () { + WAO.notifications.success('<s:text name="wao.ui.form.BoatInfos.success"/>'); + }; + WAO.post(WAO.UPDATE_BOAT_INFOS_JSON_URL, data, successCallback); } - WAO.post(WAO.UPDATE_BOAT_INFOS_JSON_URL, data, successCallback); }); $unlockBoatInfosFormButton.click(function () {

1 0

r2106 - in trunk/wao-web/src/main: resources/i18n webapp/WEB-INF/content/administration
by bleny＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: bleny Date: 2014-06-25 18:41:58 +0200 (Wed, 25 Jun 2014) New Revision: 2106 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2106 Log: fixes #5328 add missing phoneNumber field in wao user form 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/administration/edit-wao-user.jsp 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-06-25 16:33:03 UTC (rev 2105) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-25 16:41:58 UTC (rev 2106) @@ -276,6 +276,7 @@ wao.ui.field.WaoUser.login=Login wao.ui.field.WaoUser.mammalsNotifications=Receive notifications about mammals captures wao.ui.field.WaoUser.password=Password +wao.ui.field.WaoUser.phoneNumber=Phone number wao.ui.filters.filters=Search filters wao.ui.filters.refresh=Refresh filters wao.ui.forgotPassword=Forgot password ? 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-06-25 16:33:03 UTC (rev 2105) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-25 16:41:58 UTC (rev 2106) @@ -276,6 +276,7 @@ wao.ui.field.WaoUser.login=Identifiant wao.ui.field.WaoUser.mammalsNotifications=Recevoir les notifications de captures accidentelles wao.ui.field.WaoUser.password=Mot de passe +wao.ui.field.WaoUser.phoneNumber=N° de téléphone wao.ui.filters.filters=Filtres de recherche wao.ui.filters.refresh=Rafraîchir les champs du filtre wao.ui.forgotPassword=Mot de passe oublié ? Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-06-25 16:33:03 UTC (rev 2105) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-06-25 16:41:58 UTC (rev 2106) @@ -89,6 +89,7 @@ <s:textfield name="updateWaoUserCommand.waoUser.firstName" label="%{getText('wao.ui.field.WaoUser.firstName')}" requiredLabel="true" /> <s:textfield name="updateWaoUserCommand.waoUser.lastName" label="%{getText('wao.ui.field.WaoUser.lastName')}" requiredLabel="true" /> + <s:textfield name="updateWaoUserCommand.waoUser.phoneNumber" label="%{getText('wao.ui.field.WaoUser.phoneNumber')}" size="14" /> <s:if test="authenticatedWaoUser.authorizedToChangeUserCompany"> <s:select name="updateWaoUserCommand.companyId"

1 0

r2105 - in trunk/wao-services/src/main: java/fr/ifremer/wao/services/service resources/i18n
by bleny＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: bleny Date: 2014-06-25 18:33:03 +0200 (Wed, 25 Jun 2014) New Revision: 2105 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2105 Log: fixes #5320 add validation to sampling plan import Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-25 14:50:28 UTC (rev 2104) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-25 16:33:03 UTC (rev 2105) @@ -54,9 +54,11 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Export; import org.nuiton.csv.ExportModel; -import org.nuiton.csv.Import; +import org.nuiton.csv.Import2; import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportRow; import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.i18n.I18n; import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.DateUtil; @@ -258,6 +260,8 @@ Preconditions.checkState(authenticatedWaoUser.isAuthorizedToCreateSampleRow()); + ObsProgram obsProgram = authenticatedWaoUser.getObsProgram(); + UpdateSampleRowCommand updateSampleRowCommand = new UpdateSampleRowCommand(); if (optionalSampleRowId.isPresent()) { @@ -275,12 +279,6 @@ updateSampleRowCommand.setCreation(false); - SampleRowLogImpl newSampleRowLog = new SampleRowLogImpl(); - newSampleRowLog.setAuthor(authenticatedWaoUser.getWaoUser()); - newSampleRowLog.setFromAdmin(authenticatedWaoUser.isAdmin()); - updateSampleRowCommand.setSampleRowLog(newSampleRowLog); - sampleRow.addSampleRowLog(newSampleRowLog); - Set<Boat> elligibleBoats = new HashSet<>(); for (ElligibleBoat elligibleBoat : sampleRow.getElligibleBoat()) { boolean boatIsElligibleForUser = @@ -297,12 +295,10 @@ SampleRow newSampleRow = new SampleRowImpl(); - newSampleRow.setObsProgram(ObsProgram.OBSMER); + newSampleRow.setObsProgram(obsProgram); newSampleRow.setProfession(new ProfessionImpl()); newSampleRow.setFishingZone(new HashSet<FishingZone>()); newSampleRow.setSampleMonth(new HashSet<SampleMonth>()); - - ObsProgram obsProgram = authenticatedWaoUser.getObsProgram(); if (obsProgram.isObsMer()) { newSampleRow.setSamplingStrategy(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); } @@ -316,6 +312,12 @@ } + SampleRowLogImpl newSampleRowLog = new SampleRowLogImpl(); + newSampleRowLog.setAuthor(authenticatedWaoUser.getWaoUser()); + newSampleRowLog.setFromAdmin(authenticatedWaoUser.isAdmin()); + updateSampleRowCommand.setSampleRowLog(newSampleRowLog); + updateSampleRowCommand.getSampleRow().addSampleRowLog(newSampleRowLog); + ImmutableMap<String, FishingZone> allFishingZones = Maps.uniqueIndex( getReferentialService().getAllFishingZones(), @@ -430,6 +432,13 @@ public void save(UpdateSampleRowCommand updateSampleRowCommand) { + save0(updateSampleRowCommand); + + commit(); + + } + + public void save0(UpdateSampleRowCommand updateSampleRowCommand) { SampleRow sampleRow = updateSampleRowCommand.getSampleRow(); if (!updateSampleRowCommand.isCreation()) { @@ -463,8 +472,6 @@ } else { dao.create(sampleRow); } - commit(); - } public InputStream exportSamplingPlan(SampleRowsFilter filter) { @@ -504,30 +511,78 @@ public void importSamplingPlan(AuthenticatedWaoUser authenticatedWaoUser, InputStream csv) throws ImportErrorException { + ObsProgram obsProgram = authenticatedWaoUser.getObsProgram(); + ImportModel<SampleRow> samplingPlanImportModel = newSamplingPlanImportModel(authenticatedWaoUser); - Import<SampleRow> samplingPlanImport = - Import.newImport(samplingPlanImportModel, csv); + Import2<SampleRow> samplingPlanImport = + Import2.newImport(samplingPlanImportModel, csv); - SampleRowTopiaDao dao = getSampleRowDao(); - try { - for (SampleRow sampleRow : samplingPlanImport) { + for (ImportRow<SampleRow> importRow : samplingPlanImport) { - if (StringUtils.isBlank(sampleRow.getCode())) { + SampleRow sampleRow = importRow.getBean(); + long lineNumber = importRow.getLineNumber(); - String newSampleRowCode = getNewSampleRowCode(ObsProgram.OBSMER); + UpdateSampleRowCommand updateSampleRowCommand = + newUpdateSampleRowCommand(authenticatedWaoUser, Optional.<String>absent()); + String logText = I18n.l(getLocale(), "csv.import.logComment"); + updateSampleRowCommand.getSampleRowLog().setLogText(logText); + + if (StringUtils.isBlank(sampleRow.getCode())) { + String newSampleRowCode = getNewSampleRowCode(obsProgram); sampleRow.setCode(newSampleRowCode); + } + updateSampleRowCommand.setSampleRow(sampleRow); + + try { + validate(authenticatedWaoUser, updateSampleRowCommand); + } catch (MissingSampleRowLogCommentException e) { + // à l'import l'utilisateur ne précise pas le commentaire, c'est la couche service qui doit le faire en amont + if (log.isErrorEnabled()) { + log.error("should never occur", e); + } + throw new WaoTechnicalException("should never occur", e); + } catch (SampleRowCodeMustBeUniqueException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.codeMustBeUnique", lineNumber); + throw new ImportErrorException(message); + } catch (MissingPeriodEndException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.missingPeriodEnd", lineNumber); + throw new ImportErrorException(message); + } catch (MissingPeriodBeginException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.missingPeriodBegin", lineNumber); + throw new ImportErrorException(message); + } catch (MissingFishingZonesException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.missingFishingZones", lineNumber); + throw new ImportErrorException(message); + } catch (WrongSampleRowCodeFormatException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.wrongSampleRowCodeFormat", lineNumber); + throw new ImportErrorException(message); + } catch (MissingProfessionSpeciesException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.missingProfessionSpecies", lineNumber); + throw new ImportErrorException(message); + } catch (SampleMonthWithIllegalExpectedTidesValueException e) { + SampleMonth sampleMonth = e.getSampleMonth(); + String message = I18n.l( + getLocale(), + "wao.import.sampleRow.failure.sampleMonthWithIllegalExpectedTidesValue", + lineNumber, + WaoUtils.formatMonth(getLocale(), sampleMonth.getPeriodDate())); + throw new ImportErrorException(message); + } catch (MissingProgramNameException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.missingProgramName", lineNumber); + throw new ImportErrorException(message); + } catch (MissingDcf5CodesException e) { + String message = I18n.l(getLocale(), "wao.import.sampleRow.failure.missingDcf5Codes", lineNumber); + throw new ImportErrorException(message); } - getProfessionDao().create(sampleRow.getProfession()); + save0(updateSampleRowCommand); - dao.create(sampleRow); - } } catch (ImportRuntimeException e) { Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-25 14:50:28 UTC (rev 2104) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-06-25 16:33:03 UTC (rev 2105) @@ -7,7 +7,7 @@ csv.import.error.unableToReadLine=Unable to read line %s csv.import.error.unableToSetValue=Unable to set value '%s' (entity '%s', line %s, column '%s') csv.import.error.unrecognizedHeaders=Fields %s are not recognized. Accepted fields are %s. -csv.import.logComment=Edited through import +csv.import.logComment=Creation through import fr.ifremer.wao.services.service.mail.UserCredentialsEmail.subject=Your Wao credentials wao.action.delete.failure.attachedContacts=Object is attached to some contacts. wao.action.delete.failure.attachedNews=Object is attached to some news. @@ -83,8 +83,16 @@ wao.import.failure.wrongValue=Unable to parse value '%S'. Possible values are %s wao.import.invalid.latitude=a latitude must be contained in range %s. ('%s' argument given) wao.import.invalid.longitude=a longitude must be contained in range %s. ('%s' argument given) -wao.import.sampleRow.failure.fishingZoneMissing=You must precise at least one fishing zone -wao.import.sampleRow.failure.missingSampleRowCode=You must precise a code for the sample row +wao.import.sampleRow.failure.codeMustBeUnique=Line %s\: The sample row code must be unique +wao.import.sampleRow.failure.fishingZoneMissing=Line %s\: You must precise at least one fishing zone +wao.import.sampleRow.failure.missingDcf5Codes=Line %s\: You must precise at least one DCF5 code +wao.import.sampleRow.failure.missingFishingZones=Line %s\: You must precise at least one fishing zone +wao.import.sampleRow.failure.missingPeriodBegin=Line %s\: You must precise the period beginning +wao.import.sampleRow.failure.missingPeriodEnd=Line %s\: You must precise the period end +wao.import.sampleRow.failure.missingProfessionSpecies=Line %s\: For this sampling strategy, you must provide the species +wao.import.sampleRow.failure.missingProgramName=Line %s\: You must precise the program name +wao.import.sampleRow.failure.missingSampleRowCode=Line %s\: You must precise a code for the sample row +wao.import.sampleRow.failure.sampleMonthWithIllegalExpectedTidesValue=Line %s\: Effort must be positive for month %s wao.import.sampleRow.failure.unknownFishingGearDcfCode=Unknown fishing gear code\: %s wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Unknown target species code\: %s wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-25 14:50:28 UTC (rev 2104) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-06-25 16:33:03 UTC (rev 2105) @@ -7,7 +7,7 @@ csv.import.error.unableToReadLine=Impossible de lire la ligne %s csv.import.error.unableToSetValue=Impossible d'enregistrer la valeur '%s' (entité '%s', ligne %s, column '%s') csv.import.error.unrecognizedHeaders=Les champs %s ne sont pas reconnus. Les champs possibles sont %s. -csv.import.logComment=Modification depuis import +csv.import.logComment=Création par import fr.ifremer.wao.services.service.mail.UserCredentialsEmail.subject=Informations de connexion Wao wao.action.delete.failure.attachedContacts=L'objet est lié à des contacts. wao.action.delete.failure.attachedNews=L'objet est lié à des actualités. @@ -80,8 +80,16 @@ wao.import.failure.wrongValue=Valeur '%s' non reconnue. Valeurs possibles \: %s wao.import.invalid.latitude=La latitude doit être dans l'intervalle %s (valeur actuelle %s) wao.import.invalid.longitude=La longitude doit être dans l'intervalle %s (valeur actuelle %s) -wao.import.sampleRow.failure.fishingZoneMissing=Il faut préciser au moins une zone de pêche -wao.import.sampleRow.failure.missingSampleRowCode=Il faut préciser un code pour a ligne du plan +wao.import.sampleRow.failure.codeMustBeUnique=Ligne %s \: Le code ligne doit être unique +wao.import.sampleRow.failure.fishingZoneMissing=Ligne %s \: Il faut préciser au moins une zone de pêche +wao.import.sampleRow.failure.missingDcf5Codes=Ligne %s \: Il faut préciser au moins un code DCF5 +wao.import.sampleRow.failure.missingFishingZones=Ligne %s \: Il faut préciser au moins une zone de pêche +wao.import.sampleRow.failure.missingPeriodBegin=Ligne %s \: Il faut préciser le débat de la période +wao.import.sampleRow.failure.missingPeriodEnd=Ligne %s \: Il faut préciser la fin de la période +wao.import.sampleRow.failure.missingProfessionSpecies=Ligne %s \: Il faut préciser les espèces cibles pour cette stratégie d'échantillonage +wao.import.sampleRow.failure.missingProgramName=Ligne %s \: Il faut préciser le programme +wao.import.sampleRow.failure.missingSampleRowCode=Ligne %s \: Il faut préciser un code pour a ligne du plan +wao.import.sampleRow.failure.sampleMonthWithIllegalExpectedTidesValue=Ligne %s \: l'effort d'observation doit être positif pour le mois %s wao.import.sampleRow.failure.unknownFishingGearDcfCode=Le code engin %s est inconnu du référentiel wao.import.sampleRow.failure.unknownTargetSpeciesDcfCode=Le code espèce cible %s est inconnu du référentiel wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucune zone de pêche connue du référentiel

1 0

r2104 - in trunk: wao-services/src/main/java/fr/ifremer/wao/services/service wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com June 25, 2014

June 25, 2014

Author: bleny Date: 2014-06-25 16:50:28 +0200 (Wed, 25 Jun 2014) New Revision: 2104 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2104 Log: refs #5320 move sample row validation from ui to services Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactValidationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java Removed: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoContactValidationException.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactRestitutionDateBeforeDataInputDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataInputDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationBeginDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationEndDateException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactRestitutionException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactStateMotifException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateAfterTodayException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -10,7 +10,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class ContactDataInputDateAfterTodayException extends WaoContactValidationException { +public class ContactDataInputDateAfterTodayException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactDataInputDateBeforeObservationEndDateException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class ContactDataInputDateBeforeObservationEndDateException extends WaoContactValidationException { +public class ContactDataInputDateBeforeObservationEndDateException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateAfterTodayException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -10,7 +10,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class ContactObservationEndDateAfterTodayException extends WaoContactValidationException { +public class ContactObservationEndDateAfterTodayException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactObservationEndDateBeforeBeginDateException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class ContactObservationEndDateBeforeBeginDateException extends WaoContactValidationException { +public class ContactObservationEndDateBeforeBeginDateException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactRestitutionDateBeforeDataInputDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactRestitutionDateBeforeDataInputDateException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactRestitutionDateBeforeDataInputDateException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class ContactRestitutionDateBeforeDataInputDateException extends WaoContactValidationException { +public class ContactRestitutionDateBeforeDataInputDateException extends ContactValidationException { private static final long serialVersionUID = 1L; Copied: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactValidationException.java (from rev 2100, trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoContactValidationException.java) =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactValidationException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactValidationException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,47 @@ +package fr.ifremer.wao.services.service; + +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import fr.ifremer.wao.entity.Contact; + +/** + * Exception de base pour la validation d'une création - mise à jour ou import d'un contact. + * <p/> + * Created on 4/4/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 4.0 + */ +public abstract class ContactValidationException extends WaoValidationException { + + private static final long serialVersionUID = 1L; + + protected Contact contact; + + public ContactValidationException(Contact contact) { + this.contact = contact; + } + + public Contact getContact() { + return contact; + } +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactWithObservedDataControlToCorrectionAskedException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -5,7 +5,7 @@ /** * Un contact en correction demandée ne peut pas être accepté par la société. */ -public class ContactWithObservedDataControlToCorrectionAskedException extends WaoContactValidationException { +public class ContactWithObservedDataControlToCorrectionAskedException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/DuplicatedContactMainObserverInSecondaryObserversException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class DuplicatedContactMainObserverInSecondaryObserversException extends WaoContactValidationException { +public class DuplicatedContactMainObserverInSecondaryObserversException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalAcceptationException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -2,7 +2,7 @@ import fr.ifremer.wao.entity.Contact; -public class IllegalAcceptationException extends WaoContactValidationException { +public class IllegalAcceptationException extends ContactValidationException { public IllegalAcceptationException(Contact contact) { super(contact); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InvalidContactObservationBeginDateException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class InvalidContactObservationBeginDateException extends WaoContactValidationException { +public class InvalidContactObservationBeginDateException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactMainObserverCompanyException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -10,7 +10,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MismatchContactMainObserverCompanyException extends WaoContactValidationException { +public class MismatchContactMainObserverCompanyException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MismatchContactSecondaryObserverCompanyException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -10,7 +10,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MismatchContactSecondaryObserverCompanyException extends WaoContactValidationException { +public class MismatchContactSecondaryObserverCompanyException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentAdminException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactCommentAdminException extends WaoContactValidationException { +public class MissingContactCommentAdminException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactCommentException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactCommentException extends WaoContactValidationException { +public class MissingContactCommentException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataInputDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataInputDateException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataInputDateException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactDataInputDateException extends WaoContactValidationException { +public class MissingContactDataInputDateException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactDataReliabilityException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactDataReliabilityException extends WaoContactValidationException { +public class MissingContactDataReliabilityException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMainObserverException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactMainObserverException extends WaoContactValidationException { +public class MissingContactMainObserverException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactMammalsInfoException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -2,7 +2,7 @@ import fr.ifremer.wao.entity.Contact; -public class MissingContactMammalsInfoException extends WaoContactValidationException { +public class MissingContactMammalsInfoException extends ContactValidationException { public MissingContactMammalsInfoException(Contact contact) { super(contact); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactNbObservantsException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactNbObservantsException extends WaoContactValidationException { +public class MissingContactNbObservantsException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationBeginDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationBeginDateException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationBeginDateException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactObservationBeginDateException extends WaoContactValidationException { +public class MissingContactObservationBeginDateException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationEndDateException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationEndDateException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservationEndDateException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactObservationEndDateException extends WaoContactValidationException { +public class MissingContactObservationEndDateException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactObservedDataControlException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactObservedDataControlException extends WaoContactValidationException { +public class MissingContactObservedDataControlException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactRestitutionException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactRestitutionException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactRestitutionException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactRestitutionException extends WaoContactValidationException { +public class MissingContactRestitutionException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactStateMotifException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactStateMotifException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactStateMotifException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -29,7 +29,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class MissingContactStateMotifException extends WaoContactValidationException { +public class MissingContactStateMotifException extends ContactValidationException { private static final long serialVersionUID = 1L; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingContactTerrestrialLocationException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -2,7 +2,7 @@ import fr.ifremer.wao.entity.Contact; -public class MissingContactTerrestrialLocationException extends WaoContactValidationException { +public class MissingContactTerrestrialLocationException extends ContactValidationException { public MissingContactTerrestrialLocationException(Contact contact) { super(contact); Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingDcf5CodesException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class MissingDcf5CodesException extends SampleRowValidationException { + + public MissingDcf5CodesException(SampleRow sampleRow) { + super(sampleRow); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingFishingZonesException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class MissingFishingZonesException extends SampleRowValidationException { + + public MissingFishingZonesException(SampleRow sampleRow) { + super(sampleRow); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodBeginException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class MissingPeriodBeginException extends SampleRowValidationException { + + public MissingPeriodBeginException(SampleRow sampleRow) { + super(sampleRow); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingPeriodEndException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class MissingPeriodEndException extends SampleRowValidationException { + + public MissingPeriodEndException(SampleRow sampleRow) { + super(sampleRow); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProfessionSpeciesException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class MissingProfessionSpeciesException extends SampleRowValidationException { + + public MissingProfessionSpeciesException(SampleRow sampleRow) { + super(sampleRow); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingProgramNameException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class MissingProgramNameException extends SampleRowValidationException { + + public MissingProgramNameException(SampleRow sampleRow) { + super(sampleRow); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleRowLogCommentException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class MissingSampleRowLogCommentException extends SampleRowValidationException { + + public MissingSampleRowLogCommentException(SampleRow sampleRow) { + super(sampleRow); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleMonthWithIllegalExpectedTidesValueException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,18 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleMonth; +import fr.ifremer.wao.entity.SampleRow; + +public class SampleMonthWithIllegalExpectedTidesValueException extends SampleRowValidationException { + + protected SampleMonth sampleMonth; + + public SampleMonthWithIllegalExpectedTidesValueException(SampleRow sampleRow, SampleMonth sampleMonth) { + super(sampleRow); + this.sampleMonth = sampleMonth; + } + + public SampleMonth getSampleMonth() { + return sampleMonth; + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowValidationException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,16 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public abstract class SampleRowValidationException extends WaoValidationException { + + protected SampleRow sampleRow; + + public SampleRowValidationException(SampleRow sampleRow) { + this.sampleRow = sampleRow; + } + + public SampleRow getSampleRow() { + return sampleRow; + } +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -11,6 +11,7 @@ import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.WaoTechnicalException; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Boats; import fr.ifremer.wao.entity.Company; @@ -44,6 +45,7 @@ import fr.ifremer.wao.services.service.administration.ReferentialService; import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; import fr.ifremer.wao.services.service.csv.ObsMerObsVenteSamplingPlanImportExportModel; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -340,18 +342,10 @@ } public void preValidate(AuthenticatedWaoUser authenticatedWaoUser, UpdateSampleRowCommand updateSampleRowCommand) - throws UnknownBoatImmatriculationsException, SampleRowCodeMustBeUniqueException { + throws UnknownBoatImmatriculationsException { SampleRow sampleRow = updateSampleRowCommand.getSampleRow(); - SampleRowTopiaDao dao = getSampleRowDao(); - List<SampleRow> existingSampleRowsForTheSameCode = dao.forCodeEquals(sampleRow.getCode()).findAll(); - if (existingSampleRowsForTheSameCode.size() > 1) { - throw new SampleRowCodeMustBeUniqueException(); - } else if (existingSampleRowsForTheSameCode.size() == 1 && !Iterables.getOnlyElement(existingSampleRowsForTheSameCode).equals(sampleRow)) { - throw new SampleRowCodeMustBeUniqueException(); - } - String elligibleBoatImmatriculations = updateSampleRowCommand.getElligibleBoatImmatriculations(); List<Boat> elligibleBoats = getReferentialService().getBoatsFromImmatriculations(elligibleBoatImmatriculations); @@ -620,4 +614,67 @@ } + public void validate(AuthenticatedWaoUser authenticatedWaoUser, UpdateSampleRowCommand updateSampleRowCommand) throws + WrongSampleRowCodeFormatException, + MissingSampleRowLogCommentException, + MissingProgramNameException, + MissingPeriodBeginException, + MissingPeriodEndException, + MissingFishingZonesException, + MissingProfessionSpeciesException, + SampleMonthWithIllegalExpectedTidesValueException, + MissingDcf5CodesException, + SampleRowCodeMustBeUniqueException { + + SampleRow sampleRow = updateSampleRowCommand.getSampleRow(); + + SampleRowTopiaDao dao = getSampleRowDao(); + List<SampleRow> existingSampleRowsForTheSameCode = dao.forCodeEquals(sampleRow.getCode()).findAll(); + if (existingSampleRowsForTheSameCode.size() > 1) { + throw new SampleRowCodeMustBeUniqueException(); + } else if (existingSampleRowsForTheSameCode.size() == 1 && !Iterables.getOnlyElement(existingSampleRowsForTheSameCode).equals(sampleRow)) { + throw new SampleRowCodeMustBeUniqueException(); + } + + if (updateSampleRowCommand.isCreation()) { + if ( ! WaoUtils.getSampleRowCodePattern(sampleRow.getObsProgram()).matcher(sampleRow.getCode()).matches()) { + throw new WrongSampleRowCodeFormatException(sampleRow); + } + } else { + if (StringUtils.isBlank(updateSampleRowCommand.getSampleRowLog().getComment())) { + throw new MissingSampleRowLogCommentException(sampleRow); + } + } + + if (StringUtils.isBlank(sampleRow.getProgramName())) { + throw new MissingProgramNameException(sampleRow); + } + + if (sampleRow.getPeriodBegin() == null) { + throw new MissingPeriodBeginException(sampleRow); + } + + if (sampleRow.getPeriodEnd() == null) { + throw new MissingPeriodEndException(sampleRow); + } + + if (CollectionUtils.isEmpty(sampleRow.getFishingZone())) { + throw new MissingFishingZonesException(sampleRow); + } + + if (sampleRow.getSamplingStrategy().isSpecificStock() && StringUtils.isEmpty(sampleRow.getProfession().getSpecies())) { + throw new MissingProfessionSpeciesException(sampleRow); + } + + for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { + if (sampleMonth.getExpectedTidesValue() < 0) { + throw new SampleMonthWithIllegalExpectedTidesValueException(sampleRow, sampleMonth); + } + } + + if (CollectionUtils.isEmpty(sampleRow.getdCF5Code())) { + throw new MissingDcf5CodesException(sampleRow); + } + + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UnwantedContactContactStateMotifException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -8,7 +8,7 @@ * @author Tony Chemit <chemit(a)codelutin.com> * @since 4.0 */ -public class UnwantedContactContactStateMotifException extends WaoContactValidationException { +public class UnwantedContactContactStateMotifException extends ContactValidationException { private static final long serialVersionUID = 1L; Deleted: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoContactValidationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoContactValidationException.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoContactValidationException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -1,48 +0,0 @@ -package fr.ifremer.wao.services.service; - -/* - * #%L - * Wao :: Services - * %% - * Copyright (C) 2009 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import fr.ifremer.wao.WaoException; -import fr.ifremer.wao.entity.Contact; - -/** - * Exception de base pour la validation d'une création - mise à jour ou import d'un contact. - * <p/> - * Created on 4/4/14. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 4.0 - */ -public class WaoContactValidationException extends WaoException { - - private static final long serialVersionUID = 1L; - - protected Contact contact; - - public WaoContactValidationException(Contact contact) { - this.contact = contact; - } - - public Contact getContact() { - return contact; - } -} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoValidationException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,21 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.WaoException; + +public abstract class WaoValidationException extends WaoException { + + public WaoValidationException() { + } + + public WaoValidationException(String message) { + super(message); + } + + public WaoValidationException(String message, Throwable cause) { + super(message, cause); + } + + public WaoValidationException(Throwable cause) { + super(cause); + } +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WrongSampleRowCodeFormatException.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.entity.SampleRow; + +public class WrongSampleRowCodeFormatException extends SampleRowValidationException { + + public WrongSampleRowCodeFormatException(SampleRow sampleRow) { + super(sampleRow); + } +} Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-25 13:56:42 UTC (rev 2103) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-06-25 14:50:28 UTC (rev 2104) @@ -25,17 +25,24 @@ import com.google.common.base.Optional; import com.google.common.base.Strings; import com.opensymphony.xwork2.Preparable; -import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.services.service.MissingDcf5CodesException; +import fr.ifremer.wao.services.service.MissingFishingZonesException; +import fr.ifremer.wao.services.service.MissingPeriodBeginException; +import fr.ifremer.wao.services.service.MissingPeriodEndException; +import fr.ifremer.wao.services.service.MissingProfessionSpeciesException; +import fr.ifremer.wao.services.service.MissingProgramNameException; +import fr.ifremer.wao.services.service.MissingSampleRowLogCommentException; import fr.ifremer.wao.services.service.ObsMerSamplingPlanService; +import fr.ifremer.wao.services.service.SampleMonthWithIllegalExpectedTidesValueException; import fr.ifremer.wao.services.service.SampleRowCodeMustBeUniqueException; import fr.ifremer.wao.services.service.SamplingPlanService; import fr.ifremer.wao.services.service.UpdateSampleRowCommand; +import fr.ifremer.wao.services.service.WrongSampleRowCodeFormatException; import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.convention.annotation.Result; @@ -86,6 +93,8 @@ service.preValidate(getAuthenticatedWaoUser(), updateSampleRowCommand); + service.validate(getAuthenticatedWaoUser(), updateSampleRowCommand); + if (CollectionUtils.isEmpty(sampleRow.getdCF5Code())) { addFieldError("updateSampleRowCommand.dcf5Codes", t("wao.ui.form.SampleRow.error.missingDcf5Codes")); } @@ -94,45 +103,27 @@ addFieldError("updateSampleRowCommand.elligibleBoatImmatriculations", t("wao.ui.unknownBoatImmatriculations", Joiner.on(", ").join(e.getImmatriculations()))); } catch (SampleRowCodeMustBeUniqueException e) { addFieldError("updateSampleRowCommand.code", t("wao.ui.form.SampleRow.error.codeMustBeUnique")); - } - - if (updateSampleRowCommand.isCreation()) { - if ( ! WaoUtils.getSampleRowCodePattern(sampleRow.getObsProgram()).matcher(sampleRow.getCode()).matches()) { - addFieldError("updateSampleRowCommand.code", t("wao.import.sampleRow.failure.wrongSampleRowCodeFormat", sampleRow.getCode())); - } - } else { - if (StringUtils.isBlank(updateSampleRowCommand.getSampleRowLog().getComment())) { - addFieldError("updateSampleRowCommand.sampleRowLog.comment", t("wao.ui.form.SampleRow.error.missingLogComment")); - } - } - - if (StringUtils.isBlank(sampleRow.getProgramName())) { - addFieldError("updateSampleRowCommand.sampleRow.programName", t("wao.ui.form.SampleRow.error.missingProgramName")); - } - - if (sampleRow.getPeriodBegin() == null) { - addFieldError("updateSampleRowCommand.sampleRow.periodBegin", t("wao.ui.form.SampleRow.error.missingPeriodBegin")); - } - - if (sampleRow.getPeriodEnd() == null) { + } catch (MissingPeriodEndException e) { addFieldError("updateSampleRowCommand.sampleRow.periodEnd", t("wao.ui.form.SampleRow.error.missingPeriodEnd")); - } - - if (CollectionUtils.isEmpty(sampleRow.getFishingZone())) { + } catch (MissingPeriodBeginException e) { + addFieldError("updateSampleRowCommand.sampleRow.periodBegin", t("wao.ui.form.SampleRow.error.missingPeriodBegin")); + } catch (MissingFishingZonesException e) { addFieldError("updateSampleRowCommand.fishingZones", t("wao.ui.form.SampleRow.error.missingFishingZones")); - } - - if (sampleRow.getSamplingStrategy().isSpecificStock() && StringUtils.isEmpty(sampleRow.getProfession().getSpecies())) { + } catch (WrongSampleRowCodeFormatException e) { + addFieldError("updateSampleRowCommand.code", t("wao.import.sampleRow.failure.wrongSampleRowCodeFormat", sampleRow.getCode())); + } catch (MissingSampleRowLogCommentException e) { + addFieldError("updateSampleRowCommand.sampleRowLog.comment", t("wao.ui.form.SampleRow.error.missingLogComment")); + } catch (MissingProfessionSpeciesException e) { addFieldError("updateSampleRowCommand.sampleRow.samplingStrategy", t("wao.ui.form.SampleRow.error.missingProfessionSpecies")); + } catch (SampleMonthWithIllegalExpectedTidesValueException e) { + SampleMonth sampleMonth = e.getSampleMonth(); + addActionError(t("wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue", formatMonth(sampleMonth.getPeriodDate()))); + } catch (MissingProgramNameException e) { + addFieldError("updateSampleRowCommand.sampleRow.programName", t("wao.ui.form.SampleRow.error.missingProgramName")); + } catch (MissingDcf5CodesException e) { + addFieldError("updateSampleRowCommand.dcf5Codes", t("wao.ui.form.SampleRow.error.missingDcf5Codes")); } - for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { - if (sampleMonth.getExpectedTidesValue() < 0) { - addActionError(t("wao.ui.form.SampleRow.error.sampleMonthWithIllegalExpectedTidesValue", - formatMonth(sampleMonth.getPeriodDate()))); - } - } - } @Override

1 0