- Tutti-commits - mailman.cloud.codelutin.com

r1740 - in trunk: src/update tutti-ui-swing/src/main/assembly/min
by tchemit＠users.forge.codelutin.com 29 Apr '14

29 Apr '14

Author: tchemit Date: 2014-04-29 09:45:29 +0200 (Tue, 29 Apr 2014) New Revision: 1740 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1740 Log: fixes #5013: [TECH] Mise en place d'un module sp?\195?\169cifique pour l'ichtyometre Modified: trunk/src/update/tutti-application-dev.properties trunk/src/update/tutti-application.properties trunk/tutti-ui-swing/src/main/assembly/min/update.bat trunk/tutti-ui-swing/src/main/assembly/min/update.sh Modified: trunk/src/update/tutti-application-dev.properties =================================================================== --- trunk/src/update/tutti-application-dev.properties 2014-04-29 07:23:25 UTC (rev 1739) +++ trunk/src/update/tutti-application-dev.properties 2014-04-29 07:45:29 UTC (rev 1740) @@ -55,3 +55,10 @@ help.version=@projectVersion@ help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-relea… + +################################################################################ +### Ichtyometer Updates ######################################################## +################################################################################ + +ichtyometer.version=@projectVersion@ +ichtyometer.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-ichtyometer.zip Modified: trunk/src/update/tutti-application.properties =================================================================== --- trunk/src/update/tutti-application.properties 2014-04-29 07:23:25 UTC (rev 1739) +++ trunk/src/update/tutti-application.properties 2014-04-29 07:45:29 UTC (rev 1740) @@ -57,3 +57,10 @@ help.version=@projectVersion@ help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-relea… + +################################################################################ +### Ichtyometer Updates ######################################################## +################################################################################ + +ichtyometer.version=@projectVersion@ +ichtyometer.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-ichtyometer.zip \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/assembly/min/update.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update.bat 2014-04-29 07:23:25 UTC (rev 1739) +++ trunk/tutti-ui-swing/src/main/assembly/min/update.bat 2014-04-29 07:45:29 UTC (rev 1740) @@ -42,7 +42,7 @@ :help -if not exist "NEW\help" goto report +if not exist "NEW\help" goto ichtyometer rem deplacement de l'ancien help set /p oldVersion=<help\version.appup @@ -53,6 +53,19 @@ move help "%backupdir%" move NEW\help help +:ichtyometer + +if not exist "NEW\ichtyometer" goto report + +rem deplacement de l'ancien ichtyometer +set /p oldVersion=<ichtyometer\version.appup +set /p newVersion=<NEW\ichtyometer\version.appup +set backupdir=OLD\ichtyometer-%oldVersion: =%-%BACKUP_DATE: =% +echo Update ichtyometer version %oldVersion: =% to %newVersion: =% old ichtyometer keep in "%backupdir%" +if not exist "OLD" mkdir OLD +move ichtyometer "%backupdir%" +move NEW\ichtyometer ichtyometer + :report if not exist "NEW\report" goto end Modified: trunk/tutti-ui-swing/src/main/assembly/min/update.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/update.sh 2014-04-29 07:23:25 UTC (rev 1739) +++ trunk/tutti-ui-swing/src/main/assembly/min/update.sh 2014-04-29 07:45:29 UTC (rev 1740) @@ -49,6 +49,17 @@ mv NEW/help . fi +if [ -d NEW/ichtyometer ]; then + oldVersion=`cat ichtyometer/version.appup` + newVersion=`cat NEW/ichtyometer/version.appup` + echo "Update ichtyometer version $oldVersion to $newVersion" + mkdir -p OLD + backupdir=OLD/ichtyometer-$oldVersion-$BACKUP_DATE + echo "Backup ichtyometer old version to $backupdir" + mv ichtyometer $backupdir + mv NEW/ichtyometer . +fi + if [ -d NEW/report ]; then oldVersion=`cat report/version.appup` newVersion=`cat NEW/report/version.appup`

1 0

r1739 - in trunk: . src/update tutti-persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util tutti-persistence/src/main/xmi tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service tutti-service tutti-service/src/main/java/fr/ifremer/tu
by tchemit＠users.forge.codelutin.com 29 Apr '14

29 Apr '14

Author: tchemit Date: 2014-04-29 09:23:25 +0200 (Tue, 29 Apr 2014) New Revision: 1739 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1739 Log: optimize some dependencies update jre to 1.7u55 fixes #5011: [TECH] Mise en place d'un d?\195?\169ployement de type *dev* fixes #5013: [TECH] Mise en place d'un module sp?\195?\169cifique pour l'ichtyometre Added: trunk/src/update/tutti-application-dev.properties trunk/tutti-ui-swing/src/main/assembly/ichtyometer.xml trunk/tutti-ui-swing/src/main/ichtyometer/ Removed: trunk/src/update/tutti-data.properties trunk/src/update/update-tutti.properties trunk/tutti-ui-swing/src/main/assembly/full/ichtyometre/ Modified: trunk/pom.xml trunk/src/update/tutti-application.properties trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java trunk/tutti-service/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/pom.xml 2014-04-29 07:23:25 UTC (rev 1739) @@ -126,6 +126,10 @@ <platform>codelutin.com</platform> <projectId>tutti</projectId> +  +  + <releaseType>-dev</releaseType> +  <javaVersion>1.7</javaVersion>  @@ -139,7 +143,6 @@ <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <eugenePluginVersion>2.9-SNAPSHOT</eugenePluginVersion> -  <jaxxVersion>2.8.4</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> @@ -165,7 +168,7 @@ <relativizeDecorationLinks>false</relativizeDecorationLinks>  - <jreVersion>1.7.51</jreVersion> + <jreVersion>1.7.55</jreVersion> </properties> @@ -694,7 +697,7 @@ <filter value="${jreVersion}" token="jreVersion" /> </filterset> <fileset dir="${basedir}/src/update/"> - <include name="tutti-application.properties" /> + <include name="tutti-application${releaseClassifier}.properties" /> </fileset> </copy> </tasks> @@ -721,7 +724,7 @@ <configuration> <serverId>doc.codelutin.com</serverId> <fromFile> - ${project.build.directory}/update/tutti-application.properties + ${project.build.directory}/update/tutti-application${releaseClassifier}.properties </fromFile> <url> scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti Copied: trunk/src/update/tutti-application-dev.properties (from rev 1735, trunk/src/update/tutti-application.properties) =================================================================== --- trunk/src/update/tutti-application-dev.properties (rev 0) +++ trunk/src/update/tutti-application-dev.properties 2014-04-29 07:23:25 UTC (rev 1739) @@ -0,0 +1,57 @@ +### +# #%L +# Tutti +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +################################################################################ +### For dev versions only ###################################################### +################################################################################ + +################################################################################ +### JRE Updates ################################################################ +################################################################################ + +jre.version=@jreVersion@ +linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip +windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip +#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip + +################################################################################ +### Tutti Updates ############################################################## +################################################################################ + +tutti.version=@projectVersion@ +tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip + +################################################################################ +### I18n Updates ############################################################### +################################################################################ + +i18n.version=@projectVersion@ +i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip + +################################################################################ +### Help Updates ############################################################### +################################################################################ + +help.version=@projectVersion@ +help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip Modified: trunk/src/update/tutti-application.properties =================================================================== --- trunk/src/update/tutti-application.properties 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/src/update/tutti-application.properties 2014-04-29 07:23:25 UTC (rev 1739) @@ -23,6 +23,10 @@ ### ################################################################################ +### For production versions only ############################################### +################################################################################ + +################################################################################ ### JRE Updates ################################################################ ################################################################################ Deleted: trunk/src/update/tutti-data.properties =================================================================== --- trunk/src/update/tutti-data.properties 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/src/update/tutti-data.properties 2014-04-29 07:23:25 UTC (rev 1739) @@ -1,39 +0,0 @@ -### -# #%L -# Tutti -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -################################################################################ -### DB Updates ################################################################# -################################################################################ - -db.version=@dbVersion@ -db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip -db.auth=true - -################################################################################ -### Report Updates ############################################################# -################################################################################ - -report.version=@reportVersion@ -report.url=zip:http://appup.nuiton.org/tutti/auth/tutti-report-@reportVersion@.zip -report.auth=true \ No newline at end of file Deleted: trunk/src/update/update-tutti.properties =================================================================== --- trunk/src/update/update-tutti.properties 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/src/update/update-tutti.properties 2014-04-29 07:23:25 UTC (rev 1739) @@ -1,78 +0,0 @@ -### -# #%L -# Tutti -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -################################################################################ -### IMPORTANT NOTE ############################################################# -### This is the legacy update files, will be removed in version 3.0 ############ -### IMPORTANT NOTE ############################################################# -################################################################################ - -################################################################################ -### JRE Updates ################################################################ -################################################################################ - -jre.version=@jreVersion@ -linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip -windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip -windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip -#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip -#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip - -################################################################################ -### Tutti Updates ############################################################## -################################################################################ - -tutti.version=@projectVersion@ -tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip - -################################################################################ -### I18n Updates ############################################################### -################################################################################ - -i18n.version=@projectVersion@ -i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip - -################################################################################ -### Help Updates ############################################################### -################################################################################ - -help.version=@projectVersion@ -help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip - - -################################################################################ -### DB Updates ################################################################# -################################################################################ - -db.version=@dbVersion@ -db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip -db.auth=true - -################################################################################ -### Report Updates ############################################################# -################################################################################ - -report.version=@reportVersion@ -report.url=zip:http://appup.nuiton.org/tutti/auth/tutti-report-@reportVersion@.zip -report.auth=true \ No newline at end of file Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/pom.xml 2014-04-29 07:23:25 UTC (rev 1739) @@ -115,8 +115,8 @@ <artifactId>commons-beanutils</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> <groupId>commons-logging</groupId> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -38,7 +38,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Species; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -41,7 +41,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.v1.TuttiProtocolBean1; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -49,7 +49,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.service.util.SamplePersistenceHelper; import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -75,7 +75,7 @@ import fr.ifremer.tutti.persistence.service.util.MeasurementPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; import fr.ifremer.tutti.persistence.service.util.VesselPersonFeaturesPersistenceHelper; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -82,9 +82,9 @@ import fr.ifremer.tutti.persistence.service.util.MeasurementPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; import fr.ifremer.tutti.persistence.service.util.VesselPersonFeaturesPersistenceHelper; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -51,7 +51,7 @@ import fr.ifremer.tutti.persistence.service.util.BatchPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.SamplePersistenceHelper; import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -59,7 +59,7 @@ import fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceService; import fr.ifremer.tutti.persistence.service.ReferentialPersistenceService; import fr.ifremer.tutti.persistence.service.batch.TuttiCatchBatchValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.dao.DataIntegrityViolationException; Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties =================================================================== --- trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/main/xmi/tutti-persistence.properties 2014-04-29 07:23:25 UTC (rev 1739) @@ -32,7 +32,7 @@ model.tagvalue.simpleBeanInterfaceSuperClass=fr.ifremer.tutti.persistence.entities.TuttiEntity model.tagvalue.simpleBeanGenerateDefaults=true -fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol.attribute.mandatorySampleCategoryId.stereotype=indexed +fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol.attribute.mandatorySampleCategoryId.stereotype=ordered fr.ifremer.tutti.persistence.entities.data.Cruise.attribute.gear.stereotype=ordered fr.ifremer.tutti.persistence.entities.data.Cruise.attribute.headOfMission.stereotype=ordered Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.test.DatabaseResource; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.test.DatabaseResource; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -35,7 +35,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiLocations; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.test.DatabaseResource; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.test.DatabaseResource; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/pom.xml 2014-04-29 07:23:25 UTC (rev 1739) @@ -81,10 +81,6 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency>  <dependency> @@ -102,10 +98,6 @@ <artifactId>commons-collections4</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -63,7 +63,7 @@ import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -46,7 +46,7 @@ import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.ValidationService; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -42,7 +42,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.ValidationService; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/AccidentalCatchExportModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -34,8 +34,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import java.io.Serializable; import java.util.List; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/CatchExportModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -41,7 +41,7 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.io.Serializable; import java.util.List; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/IndividualObservationExportModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -34,8 +34,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import java.io.Serializable; import java.util.List; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/MarineLitterExportModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.List; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -53,7 +53,7 @@ import fr.ifremer.tutti.service.TuttiCsvUtil; import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.catches.WeightComputingService; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -41,7 +41,7 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -52,7 +52,7 @@ import fr.ifremer.tutti.service.TuttiCsvUtil; import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.TuttiServiceContext; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/pom.xml 2014-04-29 07:23:25 UTC (rev 1739) @@ -21,7 +21,8 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -86,7 +87,7 @@ <tutti.log.file> \$\{java.io.tmpdir\}/tutti-${project.version}.log </tutti.log.file> - +  <skipPostRelease>false</skipPostRelease> @@ -155,10 +156,6 @@  <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -167,6 +164,10 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -199,9 +200,9 @@ <artifactId>jaxx-application-api</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-application-swing</artifactId> - </dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-swing</artifactId> + </dependency>  <dependency> @@ -398,7 +399,6 @@ <profiles> - <profile> <id>add-release-properties</id> <activation> @@ -446,6 +446,9 @@ <descriptor> src/main/assembly/help.xml </descriptor> + <descriptor> + src/main/assembly/ichtyometer.xml + </descriptor> </descriptors> </configuration> </execution> Copied: trunk/tutti-ui-swing/src/main/assembly/ichtyometer.xml (from rev 1735, trunk/tutti-ui-swing/src/main/assembly/i18n.xml) =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/ichtyometer.xml (rev 0) +++ trunk/tutti-ui-swing/src/main/assembly/ichtyometer.xml 2014-04-29 07:23:25 UTC (rev 1739) @@ -0,0 +1,52 @@ + + +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>ichtyometer</id> + <formats> + <format>zip</format> + </formats> + + <fileSets> + + <fileSet> + <directory>src/main/ichtyometer</directory> + <outputDirectory/> + <includes> + <include>*</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly/min</directory> + <outputDirectory/> + <filtered>true</filtered> + <includes> + <include>version.appup</include> + </includes> + </fileSet> + + </fileSets> +</assembly> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -54,7 +54,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -48,7 +48,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.caracteristics.GearCaracteristicListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -41,7 +41,7 @@ import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import jaxx.runtime.swing.editor.gis.DmdCoordinate; import jaxx.runtime.swing.editor.gis.DmsCoordinate; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.util.DateUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -31,7 +31,7 @@ import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ComponentAdapter; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -39,7 +39,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import org.nuiton.jaxx.application.swing.tab.TabContentModel; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import static org.nuiton.i18n.I18n.n; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -43,7 +43,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -76,7 +76,7 @@ import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -34,7 +34,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortableRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import static org.nuiton.i18n.I18n.n; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -44,7 +44,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.Set; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -58,7 +58,7 @@ import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.table.CaracteristicColumnIdentifier; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -29,7 +29,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import org.nuiton.jaxx.application.swing.tab.TabContentModel; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.List; import java.util.Set; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -48,7 +48,7 @@ import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.ObjectUtils; import org.jdesktop.beans.AbstractSerializableBean; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import static org.nuiton.i18n.I18n.n; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -43,7 +43,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -75,7 +75,7 @@ import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -38,7 +38,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortableRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.List; import java.util.Map; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -51,7 +51,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.Set; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -51,7 +51,7 @@ import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.editor.bean.BeanUIUtil; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -26,7 +26,7 @@ import fr.ifremer.tutti.persistence.entities.data.Attachment; import jaxx.runtime.SwingUtil; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; import javax.swing.JComponent; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -34,7 +34,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.MapUtils; import org.nuiton.csv.ValueFormatter; import org.nuiton.decorator.Decorator; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -39,7 +39,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUI; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2014-04-29 07:23:25 UTC (rev 1739) @@ -27,7 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.Binder;

1 0

r1738 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: action content/cruise content/home
by tchemit＠users.forge.codelutin.com 28 Apr '14

28 Apr '14

Author: tchemit Date: 2014-04-28 18:10:12 +0200 (Mon, 28 Apr 2014) New Revision: 1738 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1738 Log: fixes #4958: [TECHNIQUE] Gestion des grappes d'objet pour la synchronisation : statut READY_TO_SYNC Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java 2014-04-28 15:43:29 UTC (rev 1737) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java 2014-04-28 16:10:12 UTC (rev 1738) @@ -26,6 +26,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; +import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.cruise.ValidateCruiseUI; @@ -65,7 +66,6 @@ protected final PropertyChangeListener editFishingOperationModelListener = new PropertyChangeListener() { protected final List<String> propertiesToIgnore = Lists.newArrayList( - EditFishingOperationUIModel.PROPERTY_MODIFY, EditFishingOperationUIModel.PROPERTY_VALID, EditFishingOperationUIModel.PROPERTY_PERSISTED ); @@ -75,20 +75,28 @@ EditFishingOperationUIModel model = (EditFishingOperationUIModel) evt.getSource(); - if (!model.isLoadingData() - && model.getFishingOperation() != null - && !propertiesToIgnore.contains(evt.getPropertyName())) { + if (!model.isLoadingData() && model.getFishingOperation() != null) { - model.convertGearShootingCoordinatesToDD(); + if (EditFishingOperationUIModel.PROPERTY_MODIFY.equals(evt.getPropertyName())) { - FishingOperation operation = model.toBean(); - NuitonValidatorResult validationResult = validationService.validateCruiseOperation(operation); + if (!model.isModify()) { - ValidateCruiseUIModel uiModel = getModel(); - uiModel.addValidatorResult(uiModel.getSelectedFishingOperation(), validationResult); + // after a save, or a reset, reload model cruise, since the synchronizationStatus may have changed + Cruise cruise = getDataContext().reloadCruise(); + getModel().setCruise(cruise); + } - getHandler().updateCurrentOperationNode(validationResult); + } else if (!propertiesToIgnore.contains(evt.getPropertyName())) { + model.convertGearShootingCoordinatesToDD(); + FishingOperation operation = model.toBean(); + NuitonValidatorResult validationResult = validationService.validateCruiseOperation(operation); + + ValidateCruiseUIModel uiModel = getModel(); + uiModel.addValidatorResult(uiModel.getSelectedFishingOperation(), validationResult); + + getHandler().updateCurrentOperationNode(validationResult); + } } } }; @@ -96,7 +104,6 @@ protected final PropertyChangeListener editCatchesModelListener = new PropertyChangeListener() { protected final List<String> propertiesToIgnore = Lists.newArrayList( - EditCatchesUIModel.PROPERTY_MODIFY, EditCatchesUIModel.PROPERTY_VALID, EditCatchesUIModel.PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT, EditCatchesUIModel.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, @@ -120,17 +127,26 @@ public void propertyChange(PropertyChangeEvent evt) { EditCatchesUIModel model = (EditCatchesUIModel) evt.getSource(); - if (!model.isLoadingData() - && model.getFishingOperation() != null - && !propertiesToIgnore.contains(evt.getPropertyName())) { + if (!model.isLoadingData() && model.getFishingOperation() != null) { - CatchBatch catchBatch = model.toBean(); - NuitonValidatorResult validationResult = validationService.validateCruiseOperation(catchBatch); + if (EditFishingOperationUIModel.PROPERTY_MODIFY.equals(evt.getPropertyName())) { - ValidateCruiseUIModel uiModel = getModel(); - uiModel.addValidatorResult(uiModel.getSelectedFishingOperation(), validationResult); + if (!model.isModify()) { - getHandler().updateCurrentOperationNode(validationResult); + // after a save, or a reset, reload model cruise, since the synchronizationStatus may have changed + Cruise cruise = getDataContext().reloadCruise(); + getModel().setCruise(cruise); + } + + } else if (!propertiesToIgnore.contains(evt.getPropertyName())) { + CatchBatch catchBatch = model.toBean(); + NuitonValidatorResult validationResult = validationService.validateCruiseOperation(catchBatch); + + ValidateCruiseUIModel uiModel = getModel(); + uiModel.addValidatorResult(uiModel.getSelectedFishingOperation(), validationResult); + + getHandler().updateCurrentOperationNode(validationResult); + } } } }; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java 2014-04-28 15:43:29 UTC (rev 1737) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveFishingOperationAction.java 2014-04-28 16:10:12 UTC (rev 1738) @@ -38,7 +38,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.AbstractCaracteristicTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUIModel; -import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,6 +61,8 @@ */ protected boolean updateUI; + protected boolean moveTab; + public SaveFishingOperationAction(EditFishingOperationUIHandler handler) { super(handler, true); } @@ -79,17 +80,16 @@ @Override public void doAction() throws Exception { - TuttiBeanMonitor<EditFishingOperationUIModel> monitor = - handler.getFishingOperationMonitor(); - // previous fishingOperation was modified, let's save it - EditFishingOperationUIModel beanToSave = monitor.getBean(); + EditFishingOperationUIModel beanToSave = + handler.getFishingOperationMonitor().getBean(); // must save when bean is new or was modifiy and is valid boolean mustSave = beanToSave.getFishingOperation() != null && beanToSave.isValid(); - boolean moveTab = true; + + moveTab = true; if (mustSave) { // prepare model @@ -125,19 +125,23 @@ " was modified, will save it."); } - monitor.clearModified(); - getModel().setModify(false); saveFishingOperation(toSave); - - if (moveTab && ValidationService.VALIDATION_CONTEXT_EDIT.equals(getContext().getValidationContext())) { - handler.getParentUi().getTabPane().setSelectedIndex(1); - handler.getParentUi().getCatchesTabContent().getTabPane().setSelectedIndex(1); - } } } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + handler.getFishingOperationMonitor().clearModified(); + getModel().setModify(false); + if (moveTab && ValidationService.VALIDATION_CONTEXT_EDIT.equals(getContext().getValidationContext())) { + handler.getParentUi().getTabPane().setSelectedIndex(1); + handler.getParentUi().getCatchesTabContent().getTabPane().setSelectedIndex(1); + } + } + protected void saveFishingOperation(FishingOperation toSave) { PersistenceService service = getContext().getPersistenceService(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-04-28 15:43:29 UTC (rev 1737) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) @@ -131,8 +131,9 @@ FishingOperationsUI operationPanel = ui.getOperationPanel(); operationPanel.getTopPanel().setVisible(false); - // This binding need to be replayed (was not fired, since model is computed in beforeInit method). - SwingUtil.applyDataBinding(getUI(), ValidateCruiseUI.BINDING_READY_TO_SYNCH_BUTTON_ENABLED); + getModel().computeReadyToSynch(); +// // This binding need to be replayed (was not fired, since model is computed in beforeInit method). +// SwingUtil.applyDataBinding(getUI(), ValidateCruiseUI.BINDING_READY_TO_SYNCH_BUTTON_ENABLED); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-04-28 15:43:29 UTC (rev 1737) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-04-28 16:10:12 UTC (rev 1738) @@ -86,15 +86,15 @@ for (Map.Entry<FishingOperation, NuitonValidatorResult> entry : validator.entrySet()) { this.validator.put(entry.getKey(), entry.getValue()); } - computeReadyToSynch(); +// computeReadyToSynch(); } public void addValidatorResult(FishingOperation fishingOperation, NuitonValidatorResult validatorResult) { validator.put(fishingOperation, validatorResult); - computeReadyToSynch(); +// computeReadyToSynch(); } - protected void computeReadyToSynch() { + public void computeReadyToSynch() { boolean result = Cruises.isDirty(cruise); if (result) { for (NuitonValidatorResult nuitonValidatorResult : validator.values()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-04-28 15:43:29 UTC (rev 1737) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2014-04-28 16:10:12 UTC (rev 1738) @@ -111,7 +111,9 @@ Cruise selectedCruise = null; if (getContext().isCruiseFilled()) { - selectedCruise = getDataContext().getCruise(); + + // always reload the cruise to be sure synchronizationStatus is ok + selectedCruise = getDataContext().reloadCruise(); } model.setCruise(selectedCruise); }

1 0

r1737 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 28 Apr '14

28 Apr '14

Author: tchemit Date: 2014-04-28 17:43:29 +0200 (Mon, 28 Apr 2014) New Revision: 1737 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1737 Log: fix cache name Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-04-28 15:43:29 UTC (rev 1737) @@ -80,7 +80,7 @@ cacheService.clearCache("species"); cacheService.clearCache("referentSpecies"); cacheService.clearCache("referentSpeciesById"); - cacheService.clearCache("referentSpeciesByIdVernacula"); + cacheService.clearCache("referentSpeciesByIdVernacular"); } catch (Exception e) { //FIXME This

1 0

r1736 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by tchemit＠users.forge.codelutin.com 28 Apr '14

28 Apr '14

Author: tchemit Date: 2014-04-28 13:17:10 +0200 (Mon, 28 Apr 2014) New Revision: 1736 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1736 Log: refs-90 #4958 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SynchronizationStatusHelper.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -40,7 +40,6 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixImpl; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; -import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; @@ -54,7 +53,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; -import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -138,6 +136,7 @@ beanToEntity(bean, sample); samplePersistenceHelper.create(sample); bean.setId(String.valueOf(sample.getId())); + synchronizationStatusHelper.setDirty(bean); return bean; } @@ -150,12 +149,9 @@ Preconditions.checkState(!TuttiEntities.isNew(bean.getFishingOperation())); Sample sample = samplePersistenceHelper.load(bean.getIdAsInt()); - if (sample == null) { - throw new DataRetrievalFailureException( - "Could not retrieve sample id=" + bean.getId()); - } beanToEntity(bean, sample); samplePersistenceHelper.update(sample); + synchronizationStatusHelper.setDirty(bean); return bean; } @@ -243,9 +239,6 @@ // Always use a null batch (to differ with other samples) target.setBatch(null); - // Synchronization Status - target.setSynchronizationStatus(SynchronizationStatus.DIRTY.getValue()); - // Comment target.setComments(source.getComment()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -51,6 +51,8 @@ import fr.ifremer.tutti.persistence.service.util.BatchPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.BatchTreeHelper; import fr.ifremer.tutti.persistence.service.util.MeasurementPersistenceHelper; +import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.dao.DataIntegrityViolationException; @@ -90,6 +92,9 @@ @Resource(name = "measurementPersistenceHelper") protected MeasurementPersistenceHelper measurementPersistenceHelper; + @Resource(name = "synchronizationStatusHelper") + protected SynchronizationStatusHelper synchronizationStatusHelper; + //------------------------------------------------------------------------// //-- Benthos Batch methods --// //------------------------------------------------------------------------// @@ -121,7 +126,7 @@ BenthosBatch target = BenthosBatchs.newBenthosBatch(); target.setSpecies(species); - entityToBenthosBatch(sampleCategoryModel, source, target); + entityToBean(sampleCategoryModel, source, target); result.addChildren(target); if (log.isDebugEnabled()) { log.debug("Loaded CatchBatch Vrac > Benthos > Alive Itemized > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); @@ -145,7 +150,7 @@ BenthosBatch target = BenthosBatchs.newBenthosBatch(); target.setSpecies(species); - entityToBenthosBatch(sampleCategoryModel, source, target); + entityToBean(sampleCategoryModel, source, target); result.addChildren(target); if (log.isDebugEnabled()) { log.debug("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); @@ -174,7 +179,7 @@ CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getId(), false); SortingBatch batch = SortingBatch.Factory.newInstance(); - benthosBatchToEntity(bean, batch, parentBatchId, catchBatch); + beanToEntity(bean, batch, parentBatchId, catchBatch); bean = batchHelper.createSortingBatch(bean, catchBatch, batch); return bean; @@ -193,7 +198,7 @@ if (bean.getParentBatch() != null) { parentBatchId = bean.getParentBatch().getId(); } - benthosBatchToEntity(bean, batch, parentBatchId, catchBatch); + beanToEntity(bean, batch, parentBatchId, catchBatch); batchHelper.updateSortingBatch(batch, catchBatch); return bean; @@ -202,24 +207,21 @@ @Override public void deleteBenthosBatch(String id) { Preconditions.checkNotNull(id); - - Integer batchId = Integer.valueOf(id); - batchHelper.removeWithChildren(batchId); + batchHelper.deleteBatch(id); } @Override public void deleteBenthosSubBatch(String id) { + Preconditions.checkNotNull(id); batchHelper.deleteSpeciesSubBatch(id); } @Override - public void changeBenthosBatchSpecies(String batchId, Species species) { - - Preconditions.checkNotNull(batchId); + public void changeBenthosBatchSpecies(String id, Species species) { + Preconditions.checkNotNull(id); Preconditions.checkNotNull(species); Preconditions.checkNotNull(species.getReferenceTaxonId()); - - batchHelper.setSortingBatchReferenceTaxon(batchId, species.getReferenceTaxonId()); + batchHelper.changeBatchSpecies(id, species); } //------------------------------------------------------------------------// @@ -288,6 +290,9 @@ return frequencies; } + // Synchronization status + synchronizationStatusHelper.setDirty(catchBatch); + // Retrieve parent SortingBatch parentBatch = batchHelper.getSortingBatchById(catchBatch, sortingBatchId); @@ -310,7 +315,7 @@ target = SortingBatch.Factory.newInstance(); // Fill the sorting batch from the source - benthosBatchFrequencyToEntity(source, target, parentBatch, rankOrder); + beanToEntity(source, target, parentBatch, rankOrder); // Create the targeted batch, then update the source id batchHelper.createSortingBatch(source, catchBatch, target); @@ -321,7 +326,7 @@ target = batchHelper.getSortingBatchById(catchBatch, source.getIdAsInt()); // Fill the sorting batch from the source - benthosBatchFrequencyToEntity(source, target, parentBatch, rankOrder); + beanToEntity(source, target, parentBatch, rankOrder); // Add the batch into a list (will be update later, using this list) batchsToUpdate.add(target); @@ -331,11 +336,11 @@ } // If some batchs need to be update, do it - if (batchsToUpdate.size() > 0) { + if (CollectionUtils.isNotEmpty(batchsToUpdate)) { batchHelper.updateSortingBatch(batchsToUpdate, catchBatch); } - if (notUpdatedChildIds.size() > 0) { + if (CollectionUtils.isNotEmpty(notUpdatedChildIds)) { for (Integer batchId : notUpdatedChildIds) { batchHelper.removeWithChildren(batchId, catchBatch); } @@ -348,9 +353,9 @@ //-- Internal methods --// //------------------------------------------------------------------------// - protected BenthosBatch entityToBenthosBatch(SampleCategoryModel sampleCategoryModel, - SortingBatch source, - BenthosBatch target) { + protected BenthosBatch entityToBean(SampleCategoryModel sampleCategoryModel, + SortingBatch source, + BenthosBatch target) { Preconditions.checkNotNull(target.getSpecies()); @@ -403,7 +408,7 @@ SortingBatch sourceChild = (SortingBatch) batch; BenthosBatch targetChild = BenthosBatchs.newBenthosBatch(); targetChild.setSpecies(target.getSpecies()); - entityToBenthosBatch(sampleCategoryModel, sourceChild, targetChild); + entityToBean(sampleCategoryModel, sourceChild, targetChild); if (log.isDebugEnabled()) { log.debug("Loaded CatchBatch Hors Vrac > Benthos > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); } @@ -421,15 +426,14 @@ return target; } - protected void benthosBatchToEntity(BenthosBatch source, - SortingBatch target, - String parentBatchId, - CatchBatch catchBatch) { + protected void beanToEntity(BenthosBatch source, + SortingBatch target, + String parentBatchId, + CatchBatch catchBatch) { Preconditions.checkNotNull(source.getFishingOperation()); Preconditions.checkNotNull(source.getFishingOperation().getId()); - Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements(); Collection<SortingMeasurement> sortingMeasurements = target.getSortingMeasurements(); @@ -563,10 +567,10 @@ } } - protected void benthosBatchFrequencyToEntity(BenthosBatchFrequency source, - SortingBatch target, - SortingBatch parentBatch, - short rankOrder) { + protected void beanToEntity(BenthosBatchFrequency source, + SortingBatch target, + SortingBatch parentBatch, + short rankOrder) { Preconditions.checkNotNull(source.getBatch()); Preconditions.checkNotNull(source.getBatch().getId()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -33,7 +33,6 @@ import fr.ifremer.adagio.core.dao.data.operation.FishingOperationImpl; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatchBean; import fr.ifremer.tutti.persistence.service.util.BatchPersistenceHelper; @@ -105,37 +104,111 @@ batchTreeHelper.displayCatchBatch(source); CatchBatch result = new CatchBatchBean(); - result.setId(source.getId()); - result.setCatchTotalWeight(source.getWeight()); - result.setSynchronizationStatus(source.getSynchronizationStatus()); + entityToBean(source, result); + + return result; + } + + @Override + public CatchBatch createCatchBatch(CatchBatch bean) { + Preconditions.checkNotNull(bean); + Preconditions.checkArgument(bean.getId() == null); + Preconditions.checkNotNull(bean.getFishingOperation()); + Preconditions.checkNotNull(bean.getFishingOperation().getId()); + + fr.ifremer.adagio.core.dao.data.batch.CatchBatch catchBatch = fr.ifremer.adagio.core.dao.data.batch.CatchBatch.Factory.newInstance(); + beanToEntity(bean, catchBatch); + bean = batchHelper.createCatchBatch(bean, catchBatch); + + // Link to fishing operation + getCurrentSession().flush(); + Integer fishingOperationId = bean.getFishingOperation().getIdAsInt(); + int rowUpdated = queryUpdate("updateFishingOperationCatchBatch", + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId, + "catchBatchId", IntegerType.INSTANCE, catchBatch.getId()); + if (rowUpdated == 0) { + throw new DataIntegrityViolationException("Could not attach catch batch to the given operation : operation was not found."); + } + + // bean is dirty + synchronizationStatusHelper.setDirty(bean); + return bean; + } + + @Override + public CatchBatch saveCatchBatch(CatchBatch bean) { + + Preconditions.checkNotNull(bean); + Preconditions.checkNotNull(bean.getId()); + Preconditions.checkNotNull(bean.getFishingOperation()); + Preconditions.checkNotNull(bean.getFishingOperation().getId()); + + getCurrentSession().enableFetchProfile("batch-with-childs"); + getCurrentSession().setFlushMode(FlushMode.COMMIT); + fr.ifremer.adagio.core.dao.data.batch.CatchBatch catchBatch = load(CatchBatchImpl.class, bean.getIdAsInt()); + if (catchBatch == null) { + throw new DataRetrievalFailureException("Could not retrieve catch batch with id=" + bean.getId()); + } + + beanToEntity(bean, catchBatch); + batchHelper.update(catchBatch); + getCurrentSession().flush(); + + // bean is dirty + synchronizationStatusHelper.setDirty(bean); + return bean; + } + + @Override + public void deleteCatchBatch(String fishingOperationId) { + Preconditions.checkNotNull(fishingOperationId); + Integer catchBatchId = batchHelper.getCatchBatchIdByFishingOperationId(Integer.valueOf(fishingOperationId)); + + if (catchBatchId == null) { + throw new DataRetrievalFailureException("Could not retrieve catch batch for fishingOperation id=" + fishingOperationId); + } + + batchHelper.deleteCatchBatch(fishingOperationId, catchBatchId); + } + + //------------------------------------------------------------------------// + //-- Internal methods --// + //------------------------------------------------------------------------// + + protected void entityToBean(fr.ifremer.adagio.core.dao.data.batch.CatchBatch source, CatchBatch target) { + + target.setId(source.getId()); + target.setCatchTotalWeight(source.getWeight()); + target.setSynchronizationStatus(source.getSynchronizationStatus()); + // -- Vrac SortingBatch vracBatch = batchTreeHelper.getVracBatch(source); if (vracBatch != null) { - result.setCatchTotalSortedCarousselWeight(vracBatch.getWeight()); - result.setCatchTotalSortedTremisWeight(vracBatch.getWeightBeforeSampling()); + target.setCatchTotalSortedCarousselWeight(vracBatch.getWeight()); + target.setCatchTotalSortedTremisWeight(vracBatch.getWeightBeforeSampling()); // -- Vrac > Species SortingBatch vracSpeciesBatch = batchTreeHelper.getSpeciesVracRootBatch(vracBatch); if (vracSpeciesBatch != null) { - result.setSpeciesTotalSortedWeight(vracSpeciesBatch.getWeight()); + target.setSpeciesTotalSortedWeight(vracSpeciesBatch.getWeight()); // -- Vrac > Species > Inert SortingBatch inertBatch = batchTreeHelper.getSpeciesVracInertRootBatch(vracSpeciesBatch); if (inertBatch != null) { - result.setSpeciesTotalInertWeight(inertBatch.getWeight()); + target.setSpeciesTotalInertWeight(inertBatch.getWeight()); } // -- Vrac > Species > Alive not itemized SortingBatch livingNotItemizedBatch = batchTreeHelper.getSpeciesVracAliveNotItemizedRootBatch(vracSpeciesBatch); if (livingNotItemizedBatch != null) { - result.setSpeciesTotalLivingNotItemizedWeight(livingNotItemizedBatch.getWeight()); + target.setSpeciesTotalLivingNotItemizedWeight(livingNotItemizedBatch.getWeight()); } } @@ -143,20 +216,20 @@ SortingBatch vracBenthosBatch = batchTreeHelper.getBenthosVracRootBatch(vracBatch); if (vracBenthosBatch != null) { - result.setBenthosTotalSortedWeight(vracBenthosBatch.getWeight()); + target.setBenthosTotalSortedWeight(vracBenthosBatch.getWeight()); // -- Vrac > Benthos > Inert SortingBatch inertBatch = batchTreeHelper.getBenthosVracInertRootBatch(vracBenthosBatch); if (inertBatch != null) { - result.setBenthosTotalInertWeight(inertBatch.getWeight()); + target.setBenthosTotalInertWeight(inertBatch.getWeight()); } // -- Vrac > Benthos > Alive no itemized SortingBatch livingNotItemizedBatch = batchTreeHelper.getBenthosVracAliveNotItemizedRootBatch(vracBenthosBatch); if (livingNotItemizedBatch != null) { - result.setBenthosTotalLivingNotItemizedWeight(livingNotItemizedBatch.getWeight()); + target.setBenthosTotalLivingNotItemizedWeight(livingNotItemizedBatch.getWeight()); } } } @@ -176,7 +249,7 @@ SortingBatch marineLitterBatch = batchTreeHelper.getMarineLitterRootBatch(horsVracBatch); if (marineLitterBatch != null) { - result.setMarineLitterTotalWeight(marineLitterBatch.getWeight()); + target.setMarineLitterTotalWeight(marineLitterBatch.getWeight()); } } @@ -184,80 +257,12 @@ SortingBatch unsortedBatch = batchTreeHelper.getRejectedBatch(source); if (unsortedBatch != null) { - result.setCatchTotalRejectedWeight(unsortedBatch.getWeight()); + target.setCatchTotalRejectedWeight(unsortedBatch.getWeight()); } - - return result; } - @Override - public CatchBatch createCatchBatch(CatchBatch bean) { - Preconditions.checkNotNull(bean); - Preconditions.checkArgument(bean.getId() == null); - Preconditions.checkNotNull(bean.getFishingOperation()); - Preconditions.checkNotNull(bean.getFishingOperation().getId()); - - bean.setSynchronizationStatus(SynchronizationStatus.DIRTY.getValue()); - - fr.ifremer.adagio.core.dao.data.batch.CatchBatch catchBatch = fr.ifremer.adagio.core.dao.data.batch.CatchBatch.Factory.newInstance(); - catchBatchToEntity(bean, catchBatch); - bean = batchHelper.createCatchBatch(bean, catchBatch); - - // Link to fishing operation - getCurrentSession().flush(); - Integer fishingOperationId = bean.getFishingOperation().getIdAsInt(); - int rowUpdated = queryUpdate("updateFishingOperationCatchBatch", - "fishingOperationId", IntegerType.INSTANCE, fishingOperationId, - "catchBatchId", IntegerType.INSTANCE, catchBatch.getId()); - if (rowUpdated == 0) { - throw new DataIntegrityViolationException("Could not attach catch batch to the given operation : operation was not found."); - } - - return bean; - } - - @Override - public CatchBatch saveCatchBatch(CatchBatch bean) { - - Preconditions.checkNotNull(bean); - Preconditions.checkNotNull(bean.getId()); - Preconditions.checkNotNull(bean.getFishingOperation()); - Preconditions.checkNotNull(bean.getFishingOperation().getId()); - - bean.setSynchronizationStatus(SynchronizationStatus.DIRTY.getValue()); - - getCurrentSession().enableFetchProfile("batch-with-childs"); - getCurrentSession().setFlushMode(FlushMode.COMMIT); - fr.ifremer.adagio.core.dao.data.batch.CatchBatch catchBatch = load(CatchBatchImpl.class, bean.getIdAsInt()); - if (catchBatch == null) { - throw new DataRetrievalFailureException("Could not retrieve catch batch with id=" + bean.getId()); - } - - catchBatchToEntity(bean, catchBatch); - batchHelper.update(catchBatch); - getCurrentSession().flush(); - - return bean; - } - - @Override - public void deleteCatchBatch(String fishingOperationId) { - Preconditions.checkNotNull(fishingOperationId); - Integer catchBatchId = batchHelper.getCatchBatchIdByFishingOperationId(Integer.valueOf(fishingOperationId)); - - if (catchBatchId == null) { - throw new DataRetrievalFailureException("Could not retrieve catch batch for fishingOperation id=" + fishingOperationId); - } - - batchHelper.deleteCatchBatch(fishingOperationId, catchBatchId); - } - - //------------------------------------------------------------------------// - //-- Internal methods --// - //------------------------------------------------------------------------// - - protected void catchBatchToEntity(CatchBatch source, - fr.ifremer.adagio.core.dao.data.batch.CatchBatch target) { + protected void beanToEntity(CatchBatch source, + fr.ifremer.adagio.core.dao.data.batch.CatchBatch target) { Preconditions.checkNotNull(source.getFishingOperation()); Preconditions.checkNotNull(source.getFishingOperation().getId()); @@ -270,11 +275,8 @@ target.setQualityFlag(load(QualityFlagImpl.class, QualityFlagCode.NOTQUALIFIED.getValue())); target.setRankOrder((short) 1); - // SynchronizationStatus - String synchronizationStatus = SynchronizationStatus.DIRTY.getValue(); - target.setSynchronizationStatus(synchronizationStatus); - target.getFishingOperation().getFishingTrip().setSynchronizationStatus(synchronizationStatus); - target.getFishingOperation().getFishingTrip().getScientificCruise().setSynchronizationStatus(synchronizationStatus); + // Synchronization status + synchronizationStatusHelper.setDirty(target); // Create lists to store all updates, then remove not updated items Collection<QuantificationMeasurement> quantificationMeasurements = target.getQuantificationMeasurements(); @@ -484,7 +486,6 @@ batchTreeHelper.getOrCreateRejectedBatch( target, source.getCatchTotalRejectedWeight()); } - } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -450,6 +450,7 @@ fishingOperationDao.create(fishingOperation); bean.setId(String.valueOf(fishingOperation.getId())); getCurrentSession().flush(); + return bean; } @@ -753,9 +754,7 @@ target.setFishingTrip(fishingTrip); // SynchronizationStatus - String synchronizationStatus = SynchronizationStatus.DIRTY.getValue(); - fishingTrip.setSynchronizationStatus(synchronizationStatus); - scientificCruise.setSynchronizationStatus(synchronizationStatus); + synchronizationStatusHelper.setDirty(fishingTrip); // Retrieve entities : VesselPosition (start and end) Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -41,7 +41,6 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixId2; import fr.ifremer.adagio.core.dao.referential.pmfm.MatrixImpl; import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxonImpl; -import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -56,7 +55,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; -import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -158,6 +156,7 @@ beanToEntity(bean, sample, catchBatch); samplePersistenceHelper.create(sample); bean.setId(String.valueOf(sample.getId())); + synchronizationStatusHelper.setDirty(bean); return bean; } @@ -175,12 +174,10 @@ Batch catchBatch = getBatch(fishingOperation.getIdAsInt()); Sample sample = samplePersistenceHelper.load(bean.getIdAsInt()); - if (sample == null) { - throw new DataRetrievalFailureException( - "Could not retrieve sample id: " + bean.getId()); - } + beanToEntity(bean, sample, catchBatch); samplePersistenceHelper.update(sample); + synchronizationStatusHelper.setDirty(bean); return bean; } @@ -271,9 +268,6 @@ // Always attach to given vracSpecies batch target.setBatch(vracSpeciesBatch); - // Synchronization Status - target.setSynchronizationStatus(SynchronizationStatus.DIRTY.getValue()); - // Comment target.setComments(source.getComment()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -114,7 +114,7 @@ SortingBatch source = (SortingBatch) batch1; MarineLitterBatch target = MarineLitterBatchs.newMarineLitterBatch(); - entityToMarineLitterBatch(source, target); + entityToBean(source, target); result.addChildren(target); if (log.isDebugEnabled()) { @@ -141,7 +141,7 @@ CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getId(), false); SortingBatch batch = SortingBatch.Factory.newInstance(); - marineLitterBatchToEntity(bean, batch, catchBatch); + beanToEntity(bean, batch, catchBatch); bean = batchHelper.createSortingBatch(bean, catchBatch, batch); return bean; @@ -154,7 +154,7 @@ Integer batchId = bean.getIdAsInt(); CatchBatch catchBatch = batchHelper.getRootCatchBatchByBatchId(batchId); SortingBatch batch = batchHelper.getSortingBatchById(catchBatch, batchId); - marineLitterBatchToEntity(bean, batch, catchBatch); + beanToEntity(bean, batch, catchBatch); batchHelper.updateSortingBatch(batch, catchBatch); return bean; @@ -163,13 +163,10 @@ @Override public void deleteMarineLitterBatch(String id) { Preconditions.checkNotNull(id); - - Integer batchId = Integer.valueOf(id); - batchHelper.removeWithChildren(batchId); + batchHelper.deleteBatch(id); } - public MarineLitterBatch entityToMarineLitterBatch(SortingBatch source, - MarineLitterBatch target) { + public MarineLitterBatch entityToBean(SortingBatch source, MarineLitterBatch target) { target.setId(source.getId().toString()); @@ -204,9 +201,9 @@ return target; } - protected void marineLitterBatchToEntity(MarineLitterBatch source, - SortingBatch target, - CatchBatch catchBatch) { + protected void beanToEntity(MarineLitterBatch source, + SortingBatch target, + CatchBatch catchBatch) { Preconditions.checkNotNull(source.getFishingOperation()); Preconditions.checkNotNull(source.getFishingOperation().getId()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -51,6 +51,8 @@ import fr.ifremer.tutti.persistence.service.util.BatchPersistenceHelper; import fr.ifremer.tutti.persistence.service.util.BatchTreeHelper; import fr.ifremer.tutti.persistence.service.util.MeasurementPersistenceHelper; +import fr.ifremer.tutti.persistence.service.util.SynchronizationStatusHelper; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.dao.DataIntegrityViolationException; @@ -90,6 +92,9 @@ @Resource(name = "measurementPersistenceHelper") protected MeasurementPersistenceHelper measurementPersistenceHelper; + @Resource(name = "synchronizationStatusHelper") + protected SynchronizationStatusHelper synchronizationStatusHelper; + //------------------------------------------------------------------------// //-- SpeciesBatch methods --// //------------------------------------------------------------------------// @@ -128,7 +133,7 @@ SpeciesBatch target = SpeciesBatchs.newSpeciesBatch(); target.setSpecies(species); - entityToSpeciesBatch(sampleCategoryModel, source, target); + entityToBean(sampleCategoryModel, source, target); result.addChildren(target); if (log.isDebugEnabled()) { @@ -154,7 +159,7 @@ } SpeciesBatch target = SpeciesBatchs.newSpeciesBatch(); target.setSpecies(species); - entityToSpeciesBatch(sampleCategoryModel, source, target); + entityToBean(sampleCategoryModel, source, target); result.addChildren(target); if (log.isDebugEnabled()) { log.debug("Loaded CatchBatch Hors Vrac > Species > " + target.getSpecies().getReferenceTaxonId() + ": " + target.getId()); @@ -183,7 +188,7 @@ CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getId(), false); SortingBatch batch = SortingBatch.Factory.newInstance(); - speciesBatchToEntity(bean, batch, parentBatchId, catchBatch); + beanToEntity(bean, batch, parentBatchId, catchBatch); bean = batchHelper.createSortingBatch(bean, catchBatch, batch); return bean; @@ -202,7 +207,7 @@ if (bean.getParentBatch() != null) { parentBatchId = bean.getParentBatch().getId(); } - speciesBatchToEntity(bean, batch, parentBatchId, catchBatch); + beanToEntity(bean, batch, parentBatchId, catchBatch); batchHelper.updateSortingBatch(batch, catchBatch); return bean; @@ -211,26 +216,21 @@ @Override public void deleteSpeciesBatch(String id) { Preconditions.checkNotNull(id); - - Integer batchId = Integer.valueOf(id); - batchHelper.removeWithChildren(batchId); + batchHelper.deleteBatch(id); } @Override public void deleteSpeciesSubBatch(String id) { + Preconditions.checkNotNull(id); batchHelper.deleteSpeciesSubBatch(id); } @Override - public void changeSpeciesBatchSpecies(String batchId, Species species) { - - Preconditions.checkNotNull(batchId); + public void changeSpeciesBatchSpecies(String id, Species species) { + Preconditions.checkNotNull(id); Preconditions.checkNotNull(species); Preconditions.checkNotNull(species.getReferenceTaxonId()); - - batchHelper.setSortingBatchReferenceTaxon( - batchId, - species.getReferenceTaxonId()); + batchHelper.changeBatchSpecies(id, species); } //------------------------------------------------------------------------// @@ -308,6 +308,9 @@ return notNullFrequencies; } + // Synchronization status + synchronizationStatusHelper.setDirty(catchBatch); + // Retrieve parent SortingBatch parentBatch = batchHelper.getSortingBatchById(catchBatch, sortingBatchId); @@ -330,7 +333,7 @@ target = SortingBatch.Factory.newInstance(); // Fill the sorting batch from the source - speciesBatchFrequencyToEntity(source, target, parentBatch, rankOrder); + beanToEntity(source, target, parentBatch, rankOrder); // Create the targeted batch, then update the source id batchHelper.createSortingBatch(source, catchBatch, target); @@ -347,7 +350,7 @@ target = batchHelper.loadSortingBatch(source.getIdAsInt(), catchBatch); // Fill the sorting batch from the source - speciesBatchFrequencyToEntity(source, target, parentBatch, rankOrder); + beanToEntity(source, target, parentBatch, rankOrder); // Add the batch into a list (will be update later, using this list) batchsToUpdate.add(target); @@ -361,13 +364,13 @@ } } - if (batchsToUpdate.size() > 0) { + if (CollectionUtils.isNotEmpty(batchsToUpdate)) { // update some batchs batchHelper.updateSortingBatch(batchsToUpdate, catchBatch); } - if (notUpdatedChildIds.size() > 0) { + if (CollectionUtils.isNotEmpty(notUpdatedChildIds)) { // Remove obsolete frequencies for (Integer batchId : notUpdatedChildIds) { @@ -386,8 +389,8 @@ //-- Internal methods --// //------------------------------------------------------------------------// - protected SpeciesBatch entityToSpeciesBatch(SampleCategoryModel sampleCategoryModel, SortingBatch source, - SpeciesBatch target) { + protected SpeciesBatch entityToBean(SampleCategoryModel sampleCategoryModel, SortingBatch source, + SpeciesBatch target) { Preconditions.checkNotNull(target.getSpecies()); @@ -441,7 +444,7 @@ SortingBatch sourceChild = (SortingBatch) batch; SpeciesBatch targetChild = SpeciesBatchs.newSpeciesBatch(); targetChild.setSpecies(target.getSpecies()); - entityToSpeciesBatch(sampleCategoryModel, sourceChild, targetChild); + entityToBean(sampleCategoryModel, sourceChild, targetChild); if (log.isDebugEnabled()) { log.debug("Loaded CatchBatch (Vrac|Hors Vrac) > Species > " + targetChild.getSpecies().getReferenceTaxonId() + " : " + target.getId()); } @@ -459,10 +462,10 @@ return target; } - protected void speciesBatchToEntity(SpeciesBatch source, - SortingBatch target, - String parentBatchId, - fr.ifremer.adagio.core.dao.data.batch.CatchBatch catchBatch) { + protected void beanToEntity(SpeciesBatch source, + SortingBatch target, + String parentBatchId, + fr.ifremer.adagio.core.dao.data.batch.CatchBatch catchBatch) { Preconditions.checkNotNull(source.getFishingOperation()); Preconditions.checkNotNull(source.getFishingOperation().getId()); @@ -603,10 +606,10 @@ } } - protected void speciesBatchFrequencyToEntity(SpeciesBatchFrequency source, - SortingBatch target, - SortingBatch parentBatch, - short rankOrder) { + protected void beanToEntity(SpeciesBatchFrequency source, + SortingBatch target, + SortingBatch parentBatch, + short rankOrder) { Preconditions.checkNotNull(source.getBatch()); Preconditions.checkNotNull(source.getBatch().getId()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -36,6 +36,8 @@ import fr.ifremer.adagio.core.dao.data.batch.validator.CatchBatchValidationError; import fr.ifremer.adagio.core.dao.data.batch.validator.CatchBatchValidationException; import fr.ifremer.adagio.core.dao.data.measure.SortingMeasurement; +import fr.ifremer.adagio.core.dao.data.operation.FishingOperation; +import fr.ifremer.adagio.core.dao.data.operation.FishingOperationDao; import fr.ifremer.adagio.core.dao.referential.pmfm.ObjectTypeCode2; import fr.ifremer.adagio.core.dao.referential.pmfm.Pmfm; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId2; @@ -51,6 +53,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.service.AbstractPersistenceService; import fr.ifremer.tutti.persistence.service.AttachmentPersistenceService; import fr.ifremer.tutti.persistence.service.IndividualObservationBatchPersistenceService; @@ -99,12 +102,18 @@ @Resource(name = "sortingBatchDao") protected SortingBatchDao sortingBatchDao; + @Resource(name = "fishingOperationDao") + protected FishingOperationDao fishingOperationDao; + @Resource(name = "scientificCruiseCatchBatchValidator") protected TuttiCatchBatchValidator catchBatchValidator; @Resource(name = "batchTreeHelper") protected BatchTreeHelper batchTreeHelper; + @Resource(name = "synchronizationStatusHelper") + protected SynchronizationStatusHelper synchronizationStatusHelper; + @Override public void init() { super.init(); @@ -163,6 +172,10 @@ getCurrentSession().flush(); + // SynchronizationStatus on fishingTrip + FishingOperation fishingOperation = fishingOperationDao.load(Integer.valueOf(fishingOperationId)); + synchronizationStatusHelper.setDirty(fishingOperation.getFishingTrip()); + // get all catch batch children ids (to delete attachments) List<Integer> ids = catchBatchDao.getAllChildrenIds(catchBatchId); @@ -176,6 +189,8 @@ } public <D extends TuttiEntity> D createSortingBatch(D bean, CatchBatch catchBatch, SortingBatch batch) { + // Synchronization status + synchronizationStatusHelper.setDirty(catchBatch); batch = catchBatchDao.createSortingBatch(batch, catchBatch); bean.setId(batch.getId()); return bean; @@ -213,15 +228,13 @@ catchBatchDao.update(catchBatch); } - public void setSortingBatchReferenceTaxon(String batchId, Integer referenceTaxonId) { - catchBatchDao.setSortingBatchReferenceTaxon(batchId, referenceTaxonId); - } - public SortingBatch getSortingBatchById(CatchBatch catchBatch, Integer sortingBatchId) { return catchBatchDao.getSortingBatchById(catchBatch, sortingBatchId); } public void updateSortingBatch(SortingBatch sortingBatch, CatchBatch parentCatchBatch) { + // Synchronization status + synchronizationStatusHelper.setDirty(parentCatchBatch); catchBatchDao.updateSortingBatch(sortingBatch, parentCatchBatch); } @@ -489,12 +502,25 @@ return qualitativeValueId; } + public void deleteBatch(String id) { + Preconditions.checkNotNull(id); + + Integer batchId = Integer.valueOf(id); + + CatchBatch catchBatch = getRootCatchBatchByBatchId(batchId); + synchronizationStatusHelper.setDirty(catchBatch); + + removeWithChildren(batchId); + } + public void deleteSpeciesSubBatch(String id) { Preconditions.checkNotNull(id); Integer speciesBatchId = Integer.valueOf(id); CatchBatch catchBatch = getRootCatchBatchByBatchId(speciesBatchId); + synchronizationStatusHelper.setDirty(catchBatch); + SortingBatch sortingBatch = getSortingBatchById(catchBatch, speciesBatchId); // get his children @@ -515,10 +541,19 @@ } } -// protected Integer getSortingTypeId() { -// return Integer.valueOf(PmfmId2.SCIENTIFIC_CRUISE_SORTING_TYPE.getValue()); -// } + public void changeBatchSpecies(String id, Species species) { + Preconditions.checkNotNull(id); + Preconditions.checkNotNull(species); + Preconditions.checkNotNull(species.getReferenceTaxonId()); + + Integer batchId = Integer.valueOf(id); + CatchBatch catchBatch = getRootCatchBatchByBatchId(batchId); + synchronizationStatusHelper.setDirty(catchBatch); + + catchBatchDao.setSortingBatchReferenceTaxon(id, species.getReferenceTaxonId()); + } + public <S extends SpeciesAbleBatch> void setSampleCategoryQualitative(S target, Integer pmfmId, Float numericalvalue, Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SamplePersistenceHelper.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.persistence.service.AttachmentPersistenceService; import fr.ifremer.tutti.persistence.service.ReferentialPersistenceService; import org.hibernate.type.IntegerType; +import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -64,31 +65,47 @@ @Resource(name = "attachmentPersistenceService") protected AttachmentPersistenceService attachmentPersistenceService; + @Resource(name = "synchronizationStatusHelper") + protected SynchronizationStatusHelper synchronizationStatusHelper; + @Resource(name = "sampleDao") protected SampleDao sampleDao; public Sample create(Sample sample) { + + // Synchronization Status + synchronizationStatusHelper.setDirty(sample); + return sampleDao.create(sample); } public void update(Sample sample) { + + // Synchronization Status + synchronizationStatusHelper.setDirty(sample); + sampleDao.update(sample); } public Sample load(Integer id) { - return sampleDao.load(id); + Sample sample = sampleDao.load(id); + if (sample == null) { + throw new DataRetrievalFailureException( + "Could not retrieve sample id=" + id); + } + return sample; } public void deleteSample(Integer sampleId) { - Sample sample = sampleDao.load(sampleId); - if (sample != null) { - sample.getSampleMeasurements().clear(); - sampleDao.remove(sample); - attachmentPersistenceService.deleteAllAttachment( - ObjectTypeCode2.SAMPLE, - sampleId); - } + Sample sample = load(sampleId); + + // Synchronization Status + synchronizationStatusHelper.setDirty(sample); + + sample.getSampleMeasurements().clear(); + sampleDao.remove(sample); + attachmentPersistenceService.deleteAllAttachment(ObjectTypeCode2.SAMPLE, sampleId); } public void setSampleMeasurements(Sample target, Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SynchronizationStatusHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SynchronizationStatusHelper.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/SynchronizationStatusHelper.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -6,6 +6,8 @@ import fr.ifremer.adagio.core.dao.data.survey.fishingTrip.FishingTrip; import fr.ifremer.adagio.core.dao.data.survey.scientificCruise.ScientificCruise; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; +import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.service.AbstractPersistenceService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,24 +32,36 @@ public void setDirty(ScientificCruise scientificCruise) { String synchronizationStatus = getDirtyValue(); + if (log.isInfoEnabled()) { + log.info("SetDirty scientificCruise: " + scientificCruise.getId()); + } scientificCruise.setSynchronizationStatus(synchronizationStatus); } public void setDirty(FishingTrip fishingTrip) { String synchronizationStatus = getDirtyValue(); fishingTrip.setSynchronizationStatus(synchronizationStatus); + if (log.isInfoEnabled()) { + log.info("SetDirty fishingTrip: " + fishingTrip.getId()); + } setDirty(fishingTrip.getScientificCruise()); } public void setDirty(CatchBatch catchBatch) { String synchronizationStatus = getDirtyValue(); catchBatch.setSynchronizationStatus(synchronizationStatus); + if (log.isInfoEnabled()) { + log.info("SetDirty catchBatch: " + catchBatch.getId()); + } setDirty(catchBatch.getFishingOperation().getFishingTrip()); } public void setDirty(Sample sample) { String synchronizationStatus = getDirtyValue(); sample.setSynchronizationStatus(synchronizationStatus); + if (log.isInfoEnabled()) { + log.info("SetDirty sample: " + sample.getId()); + } Batch batch = sample.getBatch(); if (batch != null && batch instanceof CatchBatch) { setDirty((CatchBatch) batch); @@ -61,6 +75,10 @@ String oldStatus = getDirtyValue(); String newStatus = SynchronizationStatus.READY_TO_SYNCHRONIZE.getValue(); + if (log.isInfoEnabled()) { + log.info("setCruiseReadyToSynch cruise: " + cruiseId); + } + // update scientificCruise int scientificCruiseQueryUpdate = queryUpdate("updateScientificCruiseSynchronizationStatus", "cruiseId", IntegerType.INSTANCE, cruiseId, @@ -104,4 +122,16 @@ protected String getDirtyValue() { return SynchronizationStatus.DIRTY.getValue(); } + + public void setDirty(fr.ifremer.tutti.persistence.entities.data.CatchBatch bean) { + bean.setSynchronizationStatus(getDirtyValue()); + } + + public void setDirty(IndividualObservationBatch bean) { + bean.setSynchronizationStatus(getDirtyValue()); + } + + public void setDirty(AccidentalBatch bean) { + bean.setSynchronizationStatus(getDirtyValue()); + } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -438,6 +438,17 @@ return cruise; } + public Cruise reloadCruise() { + checkOpened(); + Preconditions.checkState(isCruiseFilled()); + String id = getCruiseId(); + if (log.isInfoEnabled()) { + log.info("Loading cruise: " + id); + } + cruise = service.getCruise(id); + return cruise; + } + public TuttiProtocol getProtocol() { checkOpened(); if (isProtocolFilled()) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -47,6 +47,7 @@ import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.ValidationService; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -306,9 +307,11 @@ errors.add(e.getMessage()); } - Map<String, List<String>> errorMap = Maps.newHashMap(); - errorMap.put("catches", errors); - validator.addMessagesForScope(NuitonValidatorScope.ERROR, errorMap); + if (CollectionUtils.isNotEmpty(errors)) { + Map<String, List<String>> errorMap = Maps.newHashMap(); + errorMap.put("catches", errors); + validator.addMessagesForScope(NuitonValidatorScope.ERROR, errorMap); + } TuttiDataContext dataContext = context.getDataContext(); if (dataContext.isProtocolFilled()) { @@ -346,7 +349,9 @@ } } - validator.addMessagesForScope(NuitonValidatorScope.WARNING, warningMap); + if (MapUtils.isNotEmpty(warningMap)) { + validator.addMessagesForScope(NuitonValidatorScope.WARNING, warningMap); + } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -154,7 +154,8 @@ Cruise bean = model.toBean(); Cruise saved; - if (TuttiEntities.isNew(bean)) { + boolean createCruise = TuttiEntities.isNew(bean); + if (createCruise) { saved = persistenceService.createCruise(bean); model.setId(saved.getId()); @@ -167,6 +168,12 @@ context.setProgramId(saved.getProgram().getId()); context.setCruiseId(saved.getId()); + if (!createCruise) { + + // reload cruise + getDataContext().reloadCruise(); + } + // update originalRankOrder for all gears of the cruise for (GearWithOriginalRankOrder gear : model.getGear()) { gear.setOriginalRankOrder(gear.getRankOrder()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -59,7 +59,11 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - // can't synch anylonger - getModel().setReadyToSynch(false); + + // reload cruise in data context + getDataContext().reloadCruise(); + + // reload it in our model + getModel().setCruise(getDataContext().getCruise()); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-04-25 11:39:08 UTC (rev 1735) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-04-28 11:17:10 UTC (rev 1736) @@ -98,11 +98,25 @@ boolean result = Cruises.isDirty(cruise); if (result) { for (NuitonValidatorResult nuitonValidatorResult : validator.values()) { - if (nuitonValidatorResult.hasErrorMessagess() || nuitonValidatorResult.hasFatalMessages()) { + if (nuitonValidatorResult.hasErrorMessagess() ) { result = false; + if (log.isInfoEnabled()) { + log.info("there is some errors: "+nuitonValidatorResult.getFieldsForError()); + } break; } + if ( nuitonValidatorResult.hasFatalMessages()) { + result = false; + if (log.isInfoEnabled()) { + log.info("there is some fatal errors: "+nuitonValidatorResult.getFieldsForFatal()); + } + break; + } } + } else { + if (log.isInfoEnabled()) { + log.info("Cruise is not dirty"); + } } if (log.isInfoEnabled()) { log.info("New readyToSynch value: " + result);

1 0

r1735 - in trunk/tutti-persistence/src: main/java/fr/ifremer/tutti/persistence/service test/java/fr/ifremer/tutti/persistence/service
by blavenier＠users.forge.codelutin.com 25 Apr '14

25 Apr '14

Author: blavenier Date: 2014-04-25 13:39:08 +0200 (Fri, 25 Apr 2014) New Revision: 1735 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1735 Log: Fix Issue #4995 : do not create a new entity when existing in the list of regulation area Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-25 08:56:17 UTC (rev 1734) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2014-04-25 11:39:08 UTC (rev 1735) @@ -31,6 +31,7 @@ import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocation; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocationDao; +import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocationImpl; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingArea2RegulationLocationPK; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingAreaDao; import fr.ifremer.adagio.core.dao.data.fishingArea.FishingAreaImpl; @@ -83,6 +84,7 @@ import fr.ifremer.tutti.persistence.service.util.VesselPersonFeaturesPersistenceHelper; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -737,7 +739,6 @@ protected void beanToEntity(FishingOperation source, fr.ifremer.adagio.core.dao.data.operation.FishingOperation target) { - // Retrieve entities : FishingTrip and ScientificCruise ScientificCruise scientificCruise; FishingTrip fishingTrip = target.getFishingTrip(); @@ -1144,8 +1145,8 @@ // ---------------------------------------------------------------- // Fishing Area : Strata, substrata, localite --- // ---------------------------------------------------------------- - - // Fishing Area : + + // Compute a statistical rectangle, using lat/long (to be used in FishingArea.location) Integer statisticalLocationId = null; if (source.getGearShootingStartLatitude() != null && source.getGearShootingStartLongitude() != null) { statisticalLocationId = locationService.getLocationIdByLatLong(source.getGearShootingStartLatitude(), source.getGearShootingStartLongitude()); @@ -1156,18 +1157,12 @@ // Strata : if (source.getStrata() != null && source.getStrata().getId() != null) { - FishingArea2RegulationLocation fa2rl = FishingArea2RegulationLocation.Factory.newInstance(); - FishingArea2RegulationLocationPK fa2rlPK = new FishingArea2RegulationLocationPK(); - fa2rl.setFishingArea2RegulationLocationPk(fa2rlPK); - fa2rlPK.setFishingArea((FishingAreaImpl) fishingArea); - fa2rlPK.setLocation(load(LocationImpl.class, source.getStrata().getIdAsInt())); - + FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, + source.getStrata().getIdAsInt(), + true /*create if need*/); notChangedRegulationLocation.remove(fa2rl); - if (fishingArea.getRegulationLocations() == null) { - fishingArea.setRegulationLocations(Sets.newHashSet(fa2rl)); - } else { - fishingArea.getRegulationLocations().add(fa2rl); - } + + // If no statistical location define yet, then use strata if (statisticalLocationId == null) { statisticalLocationId = source.getStrata().getIdAsInt(); } @@ -1175,19 +1170,12 @@ // Sub-Strata : if (source.getSubStrata() != null && source.getSubStrata().getId() != null) { - FishingArea2RegulationLocation fa2rl = FishingArea2RegulationLocation.Factory.newInstance(); - FishingArea2RegulationLocationPK fa2rlPK = new FishingArea2RegulationLocationPK(); - fa2rl.setFishingArea2RegulationLocationPk(fa2rlPK); - fa2rlPK.setFishingArea((FishingAreaImpl) fishingArea); - fa2rlPK.setLocation(load(LocationImpl.class, source.getSubStrata().getIdAsInt())); - + FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, + source.getSubStrata().getIdAsInt(), + true /*create if need*/); notChangedRegulationLocation.remove(fa2rl); - - if (fishingArea.getRegulationLocations() == null) { - fishingArea.setRegulationLocations(Sets.newHashSet(fa2rl)); - } else { - fishingArea.getRegulationLocations().add(fa2rl); - } + + // If no statistical location define yet, then use sub-strata if (statisticalLocationId == null) { statisticalLocationId = source.getSubStrata().getIdAsInt(); } @@ -1195,23 +1183,18 @@ // Localite : if (source.getLocation() != null && source.getLocation().getId() != null) { - FishingArea2RegulationLocation fa2rl = FishingArea2RegulationLocation.Factory.newInstance(); - FishingArea2RegulationLocationPK fa2rlPK = new FishingArea2RegulationLocationPK(); - fa2rl.setFishingArea2RegulationLocationPk(fa2rlPK); - fa2rlPK.setFishingArea((FishingAreaImpl) fishingArea); - fa2rlPK.setLocation(load(LocationImpl.class, source.getLocation().getIdAsInt())); - + FishingArea2RegulationLocation fa2rl = getFishingArea2RegulationLocation(fishingArea, + source.getLocation().getIdAsInt(), + true /*create if need*/); notChangedRegulationLocation.remove(fa2rl); - if (fishingArea.getRegulationLocations() == null) { - fishingArea.setRegulationLocations(Sets.newHashSet(fa2rl)); - } else { - fishingArea.getRegulationLocations().add(fa2rl); - } + + // If no statistical location define yet, then use Localité if (statisticalLocationId == null) { statisticalLocationId = source.getLocation().getIdAsInt(); } } + // Remove unused regulation locations fishingArea.getRegulationLocations().removeAll(notChangedRegulationLocation); // Fishing Area location (should be a statistical location) @@ -1223,7 +1206,6 @@ } } else if (statisticalLocationId != null) { fishingArea.setLocation(load(LocationImpl.class, statisticalLocationId)); - //gearUseFeatures.getFishingAreas().add(fishingArea); } } @@ -1335,4 +1317,47 @@ target.getOperationVesselAssociations().addAll(toAdd); } } + + /** + * Issue #4995 : use this method to avoid re-create of existing regulation location + * @param fishingArea + * @param regulationLocationId + * @param createIfNotExists + * @return a entity FishingArea2RegulationLocation, or null if not found and createIfNotExists=false + */ + private FishingArea2RegulationLocation getFishingArea2RegulationLocation(FishingArea fishingArea, int regulationLocationId, boolean createIfNotExists) { + Preconditions.checkNotNull(fishingArea); + + // Create the PK + FishingArea2RegulationLocationPK pk = new FishingArea2RegulationLocationPK(); + pk.setFishingArea((FishingAreaImpl) fishingArea); + pk.setLocation(load(LocationImpl.class, regulationLocationId)); + + // Retrieve exiting regulation location + FishingArea2RegulationLocation fa2rl = null; + if (CollectionUtils.isNotEmpty(fishingArea.getRegulationLocations())) { + for(FishingArea2RegulationLocation existingFa2rl: fishingArea.getRegulationLocations()) { + FishingArea2RegulationLocationPK existingPk = existingFa2rl.getFishingArea2RegulationLocationPk(); + if (ObjectUtils.equals(existingPk, pk)) { + return fa2rl; + } + } + } + + // If not exists, create if need + if (fa2rl != null || !createIfNotExists) { + return fa2rl; + } + + fa2rl = FishingArea2RegulationLocation.Factory.newInstance(); + fa2rl.setFishingArea2RegulationLocationPk(pk); + + if (fishingArea.getRegulationLocations() == null) { + fishingArea.setRegulationLocations(Sets.newHashSet(fa2rl)); + } else { + fishingArea.getRegulationLocations().add(fa2rl); + } + + return fa2rl; + } } Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java 2014-04-25 08:56:17 UTC (rev 1734) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java 2014-04-25 11:39:08 UTC (rev 1735) @@ -37,7 +37,7 @@ fishingOperation.setCruise(cruise); } - @Test(expected = NonUniqueObjectException.class) + @Test public void saveFishingOperation() { assertNotNull(fishingOperation);

1 0

Build failed in Jenkins: tutti-ci » Tutti :: UI #63
by admin+ci-codelutin.com＠codelutin.com 25 Apr '14

25 Apr '14

See <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…> Changes: [Tony CHEMIT] refs #4958 ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.5-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.8.4:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 41 modified jaxx file(s). ERROR [pool-1-thread-1 for channel] (JAXXEngine.java:366) run - jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…>: Unable to parse Java code near token: > java.lang.RuntimeException: jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…>: Unable to parse Java code near token: > at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile.resolvDescriptor(ClassDescriptorResolverFromJavaFile.java:93) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor0(ClassDescriptorHelper.java:276) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor(ClassDescriptorHelper.java:218) at jaxx.compiler.tags.TagManager.getTagHandler(TagManager.java:474) at jaxx.compiler.JAXXCompiler.compileSecondPass(JAXXCompiler.java:635) at jaxx.compiler.tags.DefaultObjectHandler.compileChildTagSecondPass(DefaultObjectHandler.java:1335) at jaxx.compiler.tags.DefaultObjectHandler.compileChildrenSecondPass(DefaultObjectHandler.java:1300) at jaxx.compiler.tags.DefaultObjectHandler.compileSecondPass(DefaultObjectHandler.java:500) at jaxx.compiler.tags.DefaultComponentHandler.compileSecondPass(DefaultComponentHandler.java:153) at jaxx.compiler.JAXXCompiler.compileSecondPass(JAXXCompiler.java:647) at jaxx.compiler.JAXXCompiler.compileSecondPass(JAXXCompiler.java:754) at jaxx.compiler.tasks.CompileSecondPassTask.perform(CompileSecondPassTask.java:81) at jaxx.compiler.JAXXEngine.run(JAXXEngine.java:352) at org.nuiton.jaxx.plugin.GenerateMojo.doAction(GenerateMojo.java:522) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:132) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…>: Unable to parse Java code near token: > at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile$JavaFileParser.doParse(ClassDescriptorResolverFromJavaFile.java:284) at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile.resolvDescriptor(ClassDescriptorResolverFromJavaFile.java:90) ... 46 more [WARNING] JAXX detects 1 warning : <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…> Found a handler fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditorHandler which does not implements jaxx.runtime.spi.UIHandler [ERROR] JAXX detects 1 error : <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…>:1 : jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/fr.ifremer.tutti$tutti-ui-swin…>: Unable to parse Java code near token: > [JENKINS] Archiving disabled

1 2

Build failed in Jenkins: tutti-ci #63
by admin+ci-codelutin.com＠codelutin.com 25 Apr '14

25 Apr '14

See <http://ci.codelutin.com/jenkins/job/tutti-ci/63/changes> Changes: [Tony CHEMIT] refs #4958 ------------------------------------------ [...truncated 337 lines...] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-service --- [INFO] Compiling 96 source files to <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/target/…> [WARNING] <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/mai…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/mai…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti-service --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/target/…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ tutti-service --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 30 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ tutti-service --- [INFO] Compiling 19 source files to <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/target/…> [WARNING] <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-test) @ tutti-service --- [INFO] Surefire report directory: <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/target/…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running fr.ifremer.tutti.service.BeanValidatorDetectorTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.881 sec - in fr.ifremer.tutti.service.BeanValidatorDetectorTest Running fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-04-25 10:19:03,177 0 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-04-25 10:19:03,431 254 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.catches.WeightComputingServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.265 sec - in fr.ifremer.tutti.service.catches.WeightComputingServiceTest Running fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-04-25 10:19:03,436 259 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-04-25 10:19:03,443 266 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.009 sec - in fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest Running fr.ifremer.tutti.service.UpdateSchemaTest 2014-04-25 10:19:03,444 267 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.UpdateSchemaTest 2014-04-25 10:19:03,448 271 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS_old.properties 2014-04-25 10:19:03,450 273 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS_old, test [class fr.ifremer.tutti.service.UpdateSchemaTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.007 sec - in fr.ifremer.tutti.service.UpdateSchemaTest Running fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-04-25 10:19:03,452 275 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-04-25 10:19:03,456 279 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-04-25 10:19:03,458 281 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.015 sec - in fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest Running fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest 2014-04-25 10:19:03,459 282 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest 2014-04-25 10:19:03,462 285 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-04-25 10:19:03,465 288 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.001 sec - in fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest Running fr.ifremer.tutti.service.ValidationServiceTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.service.ValidationServiceTest Running fr.ifremer.tutti.service.DecoratorServiceTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.495 sec - in fr.ifremer.tutti.service.DecoratorServiceTest Running fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-04-25 10:19:03,967 790 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-04-25 10:19:03,968 791 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-04-25 10:19:03,971 794 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbExport, test [class fr.ifremer.tutti.service.psionimport.PsionImportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.psionimport.PsionImportServiceTest Running fr.ifremer.tutti.service.report.ReportServiceTest 2014-04-25 10:19:03,972 795 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.report.ReportServiceTest 2014-04-25 10:19:03,976 799 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.report.ReportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec - in fr.ifremer.tutti.service.report.ReportServiceTest Running fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-04-25 10:19:03,979 802 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-04-25 10:19:03,981 804 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-04-25 10:19:03,983 806 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest Running fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-04-25 10:19:03,985 808 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-04-25 10:19:03,987 810 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-04-25 10:19:03,989 812 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at src/test/dbCGFS, test [class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.005 sec - in fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-04-25 10:19:03,992 815 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-04-25 10:19:03,996 819 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-04-25 10:19:03,997 820 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-04-25 10:19:04,001 824 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportService2Test Running fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-04-25 10:19:04,002 825 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-04-25 10:19:04,007 830 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.006 sec - in fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest Running fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceV2Test 2014-04-25 10:19:04,009 832 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceV2Test 2014-04-25 10:19:04,012 835 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceV2Test] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec - in fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceV2Test Running fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-04-25 10:19:04,013 836 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-04-25 10:19:04,017 840 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/src/tes…,> test [class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.004 sec - in fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest Results : Tests run: 23, Failures: 0, Errors: 0, Skipped: 15 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service --- [INFO] Building jar: <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-service/target/…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-service --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.5-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-ui-swing/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.8.4:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 41 modified jaxx file(s). ERROR [pool-1-thread-1 for channel] (JAXXEngine.java:366) run - jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-ui-swing/src/ma…>: Unable to parse Java code near token: > java.lang.RuntimeException: jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-ui-swing/src/ma…>: Unable to parse Java code near token: > at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile.resolvDescriptor(ClassDescriptorResolverFromJavaFile.java:93) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor0(ClassDescriptorHelper.java:276) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor(ClassDescriptorHelper.java:218) at jaxx.compiler.tags.TagManager.getTagHandler(TagManager.java:474) at jaxx.compiler.JAXXCompiler.compileSecondPass(JAXXCompiler.java:635) at jaxx.compiler.tags.DefaultObjectHandler.compileChildTagSecondPass(DefaultObjectHandler.java:1335) at jaxx.compiler.tags.DefaultObjectHandler.compileChildrenSecondPass(DefaultObjectHandler.java:1300) at jaxx.compiler.tags.DefaultObjectHandler.compileSecondPass(DefaultObjectHandler.java:500) at jaxx.compiler.tags.DefaultComponentHandler.compileSecondPass(DefaultComponentHandler.java:153) at jaxx.compiler.JAXXCompiler.compileSecondPass(JAXXCompiler.java:647) at jaxx.compiler.JAXXCompiler.compileSecondPass(JAXXCompiler.java:754) at jaxx.compiler.tasks.CompileSecondPassTask.perform(CompileSecondPassTask.java:81) at jaxx.compiler.JAXXEngine.run(JAXXEngine.java:352) at org.nuiton.jaxx.plugin.GenerateMojo.doAction(GenerateMojo.java:522) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:132) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-ui-swing/src/ma…>: Unable to parse Java code near token: > at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile$JavaFileParser.doParse(ClassDescriptorResolverFromJavaFile.java:284) at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaFile.resolvDescriptor(ClassDescriptorResolverFromJavaFile.java:90) ... 46 more [WARNING] JAXX detects 1 warning : <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-ui-swing/src/ma…> Found a handler fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditorHandler which does not implements jaxx.runtime.spi.UIHandler [ERROR] JAXX detects 1 error : <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-ui-swing/src/ma…>:1 : jaxx.compiler.CompilerException: Error parsing Java source code <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/tutti-ui-swing/src/ma…>: Unable to parse Java code near token: > [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [ 3.104 s] [INFO] Tutti :: Persistence .............................. SUCCESS [ 15.883 s] [INFO] Tutti :: Ichtyometer API .......................... SUCCESS [ 1.319 s] [INFO] Tutti :: Service .................................. SUCCESS [ 6.557 s] [INFO] Tutti :: UI ....................................... FAILURE [ 8.088 s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 37.253 s [INFO] Finished at: 2014-04-25T10:19:13+01:00 [INFO] Final Memory: 105M/1158M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.jaxx:jaxx-maven-plugin:2.8.4:generate (default) on project tutti-ui-swing: Aborting due to errors reported by jaxxc -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.jaxx:jaxx-maven-plugin:2.8.4:generate (default) on project tutti-ui-swing: Aborting due to errors reported by jaxxc at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745) Caused by: org.apache.maven.plugin.MojoExecutionException: Aborting due to errors reported by jaxxc at org.nuiton.jaxx.plugin.GenerateMojo.doAction(GenerateMojo.java:528) at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:132) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :tutti-ui-swing Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit+codelutin-ci(a)codelutin.com channel stopped

1 2

r1734 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise
by tchemit＠users.forge.codelutin.com 25 Apr '14

25 Apr '14

Author: tchemit Date: 2014-04-25 10:56:17 +0200 (Fri, 25 Apr 2014) New Revision: 1734 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1734 Log: fix build (jaxx can't support jdk 7) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-04-25 08:37:12 UTC (rev 1733) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIModel.java 2014-04-25 08:56:17 UTC (rev 1734) @@ -50,13 +50,11 @@ public static final String PROPERTY_SELECTED_FISHING_OPERATION = "selectedFishingOperation"; -// public static final String PROPERTY_VALIDATOR = "validator"; - public static final String PROPERTY_READY_TO_SYNCH = "readyToSynch"; protected FishingOperation selectedFishingOperation; - protected final Map<FishingOperation, NuitonValidatorResult> validator = new HashMap<>(); + protected final Map<FishingOperation, NuitonValidatorResult> validator = new HashMap<FishingOperation, NuitonValidatorResult>(); protected boolean readyToSynch; @@ -73,7 +71,7 @@ } public Map<FishingOperation, NuitonValidatorResult> getValidator() { - return new HashMap<>(validator); + return new HashMap<FishingOperation, NuitonValidatorResult>(validator); } public Set<FishingOperation> getFishingOperations() { @@ -88,13 +86,11 @@ for (Map.Entry<FishingOperation, NuitonValidatorResult> entry : validator.entrySet()) { this.validator.put(entry.getKey(), entry.getValue()); } -// firePropertyChange(PROPERTY_VALIDATOR, null, validator); computeReadyToSynch(); } public void addValidatorResult(FishingOperation fishingOperation, NuitonValidatorResult validatorResult) { validator.put(fishingOperation, validatorResult); -// firePropertyChange(PROPERTY_VALIDATOR, null, validator); computeReadyToSynch(); }

1 0

r1733 - trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 25 Apr '14

25 Apr '14

Author: tchemit Date: 2014-04-25 10:37:12 +0200 (Fri, 25 Apr 2014) New Revision: 1733 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1733 Log: refs #4995 (add TU) Added: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java Added: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java (rev 0) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java 2014-04-25 08:37:12 UTC (rev 1733) @@ -0,0 +1,54 @@ +package fr.ifremer.tutti.persistence.service; + +import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.test.DatabaseResource; +import org.hibernate.NonUniqueObjectException; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; + +/** + * To fix http://forge.codelutin.com/issues/4995. + * <p/> + * Created on 4/25/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.5 + */ +public class FishingOperationPersistenceServiceAno4995Test { + + @ClassRule + public static final DatabaseResource dbResource = DatabaseResource.writeDb("dbCGFS_ANO4995"); + + protected FishingOperationPersistenceService service; + + protected FishingOperation fishingOperation; + + @Before + public void setUp() throws Exception { + service = TuttiPersistenceServiceLocator.getFishingOperationPersistenceService(); + + // get fishing operation + Cruise cruise = TuttiPersistenceServiceLocator.getCruisePersistenceService().getCruise("0"); + fishingOperation = service.getFishingOperation("0"); + fishingOperation.setCruise(cruise); + } + + @Test(expected = NonUniqueObjectException.class) + public void saveFishingOperation() { + + assertNotNull(fishingOperation); + assertNotNull(fishingOperation.getCruise()); + assertNotNull(fishingOperation.getStrata()); + assertNotNull(fishingOperation.getLocation()); + + // modifiy it + fishingOperation.setStrata(null); + + // save it + service.saveFishingOperation(fishingOperation); + } +} Property changes on: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0