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

Build failed in Jenkins: tutti #1142
by admin+hudson＠codelutin.com Nov. 21, 2013

Nov. 21, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/1142/changes> Changes: [Tony Chemit] fix third parties [Tony Chemit] hide report action ------------------------------------------ [...truncated 414 lines...] 2013-11-21 17:41:13,809 2199 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter fr.ifremer.tutti.persistence.config.SampleCategoryModelConverter@2ca8fc2d 2013-11-21 17:41:13,809 2199 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URLConverter@2a95d12e 2013-11-21 17:41:13,809 2199 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URIConverter@51d838d9 2013-11-21 17:41:13,809 2199 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.VersionConverter@4a7c5889 2013-11-21 17:41:13,809 2199 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.LocaleConverter@111a3ce4 2013-11-21 17:41:13,810 2200 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2013-11-21 17:41:13,810 2200 [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.009 sec - in fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest Running fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2013-11-21 17:41:13,812 2202 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2013-11-21 17:41:13,814 2204 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter fr.ifremer.tutti.persistence.config.SampleCategoryModelConverter@7fc096f2 2013-11-21 17:41:13,815 2205 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URLConverter@37304e33 2013-11-21 17:41:13,815 2205 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URIConverter@445e1293 2013-11-21 17:41:13,815 2205 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.VersionConverter@7c1593f5 2013-11-21 17:41:13,815 2205 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.LocaleConverter@2f98440e 2013-11-21 17:41:13,815 2205 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2013-11-21 17:41:13,816 2206 [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.001 sec - in fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2013-11-21 17:41:13,824 2214 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2013-11-21 17:41:13,826 2216 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter fr.ifremer.tutti.persistence.config.SampleCategoryModelConverter@f764569 2013-11-21 17:41:13,826 2216 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URLConverter@1ba14608 2013-11-21 17:41:13,826 2216 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URIConverter@78fcc563 2013-11-21 17:41:13,826 2216 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.VersionConverter@1b0324a3 2013-11-21 17:41:13,827 2217 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.LocaleConverter@6735b09d 2013-11-21 17:41:13,827 2217 [main] INFO org.nuiton.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-11-21 17:41:13,827 2217 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/test/dbCG…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.017 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2013-11-21 17:41:13,828 2218 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2013-11-21 17:41:13,831 2221 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter fr.ifremer.tutti.persistence.config.SampleCategoryModelConverter@409ef237 2013-11-21 17:41:13,831 2221 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URLConverter@79d34ca 2013-11-21 17:41:13,831 2221 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URIConverter@61f4bdad 2013-11-21 17:41:13,831 2221 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.VersionConverter@ad0db19 2013-11-21 17:41:13,832 2222 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.LocaleConverter@549adb8 2013-11-21 17:41:13,832 2222 [main] INFO org.nuiton.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-11-21 17:41:13,833 2223 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/test/dbEx…,> test [class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportService2Test Running fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2013-11-21 17:41:13,834 2224 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2013-11-21 17:41:13,837 2227 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter fr.ifremer.tutti.persistence.config.SampleCategoryModelConverter@5780208f 2013-11-21 17:41:13,837 2227 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URLConverter@69d254f9 2013-11-21 17:41:13,837 2227 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URIConverter@6fc8ddb5 2013-11-21 17:41:13,837 2227 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.VersionConverter@6c53cf68 2013-11-21 17:41:13,838 2228 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.LocaleConverter@3796fcd1 2013-11-21 17:41:13,838 2228 [main] INFO org.nuiton.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-11-21 17:41:13,838 2228 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/test/dbEx…,> test [class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.008 sec - in fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest Running fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2013-11-21 17:41:13,840 2230 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2013-11-21 17:41:13,842 2232 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter fr.ifremer.tutti.persistence.config.SampleCategoryModelConverter@51c8092c 2013-11-21 17:41:13,843 2233 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URLConverter@2f9312a2 2013-11-21 17:41:13,843 2233 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.URIConverter@7d5be0ab 2013-11-21 17:41:13,844 2234 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.VersionConverter@5c6d416 2013-11-21 17:41:13,844 2234 [main] INFO org.nuiton.util.converter.ConverterUtil - register converter org.nuiton.util.converter.LocaleConverter@521ab8b7 2013-11-21 17:41:13,845 2235 [main] INFO org.nuiton.config.ApplicationConfig - Loading configuration file (classpath) : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/test-c…> 2013-11-21 17:41:13,845 2235 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - Could not find db at <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/src/test/dbMe…,> test [class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest Results : Tests run: 22, Failures: 0, Errors: 0, Skipped: 11 [JENKINS] Recording test results [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti-service --- [INFO] [INFO] --- maven-install-plugin:2.5.1:install (default-install) @ tutti-service --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/3.0-rc-1-SNAPSHOT/tutti-service-3.0-rc-1-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/3.0-rc-1-SNAPSHOT/tutti-service-3.0-rc-1-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.0-rc-1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/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.5.30:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 44 modified jaxx file(s). [WARNING] JAXX detects 2 warnings : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'title' in component 'dialog' : [_("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'text' in component 'message' : [_("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())] [INFO] Generated 44 file(s) in 7.03s [INFO] [INFO] --- jaxx-maven-plugin:2.5.30:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 31/1601 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1604/1610 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> [INFO] collected 10 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 27/2065 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1898/2074 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 97 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 351 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/class…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[393,44] getSelectedValues() in javax.swing.JList has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>: Recompile with -Xlint:unchecked for details. [INFO] 4 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[476,30] cannot find symbol symbol: method getMenuFileReport() location: variable ui of type UI [INFO] 1 error [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [2.455s] [INFO] Tutti :: Persistence .............................. SUCCESS [7.590s] [INFO] Tutti :: Service .................................. SUCCESS [4.604s] [INFO] Tutti :: UI ....................................... FAILURE [11.776s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 27.506s [INFO] Finished at: Thu Nov 21 17:41:26 CET 2013 [INFO] Final Memory: 70M/229M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project tutti-ui-swing: Compilation failure [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[476,30] cannot find symbol [ERROR] symbol: method getMenuFileReport() [ERROR] location: variable ui of type UI [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:compile (default-compile) on project tutti-ui-swing: Compilation failure <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[476,30] cannot find symbol symbol: method getMenuFileReport() location: variable ui of type UI at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) 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:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) 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:326) 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:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[476,30] cannot find symbol symbol: method getMenuFileReport() location: variable ui of type UI at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.CompilerMojo.execute(CompilerMojo.java:129) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) 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/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :tutti-ui-swing [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml> to fr.ifremer.tutti/tutti-ui-swing/3.0-rc-1-SNAPSHOT/tutti-ui-swing-3.0-rc-1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> to fr.ifremer.tutti/tutti-ui-swing/3.0-rc-1-SNAPSHOT/tutti-ui-swing-3.0-rc-1-SNAPSHOT-third-party.properties [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to fr.ifremer.tutti/tutti-persistence/3.0-rc-1-SNAPSHOT/tutti-persistence-3.0-rc-1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to fr.ifremer.tutti/tutti-persistence/3.0-rc-1-SNAPSHOT/tutti-persistence-3.0-rc-1-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to fr.ifremer.tutti/tutti-service/3.0-rc-1-SNAPSHOT/tutti-service-3.0-rc-1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to fr.ifremer.tutti/tutti-service/3.0-rc-1-SNAPSHOT/tutti-service-3.0-rc-1-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to fr.ifremer/tutti/3.0-rc-1-SNAPSHOT/tutti-3.0-rc-1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-3.0-rc-1-SNAPS…> to fr.ifremer/tutti/3.0-rc-1-SNAPSHOT/tutti-3.0-rc-1-SNAPSHOT-site_fr.xml Sending e-mails to: tutti-commits(a)list.forge.codelutin.com null chemit(a)codelutin.com channel stopped

1 1

Build failed in Jenkins: tutti » Tutti :: UI #1142
by admin+hudson＠codelutin.com Nov. 21, 2013

Nov. 21, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/1142…> Changes: [Tony Chemit] hide report action ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.0-rc-1-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-ui-swing --- [INFO] [INFO] --- jaxx-maven-plugin:2.5.30:generate (default) @ tutti-ui-swing --- [INFO] use project compile scope class-path [INFO] Detects 44 modified jaxx file(s). [WARNING] JAXX detects 2 warnings : <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'title' in component 'dialog' : [_("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> jaxx supports i18n, no need to add explicit call to I18n._ for attribute 'text' in component 'message' : [_("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())] [INFO] Generated 44 file(s) in 7.03s [INFO] [INFO] --- jaxx-maven-plugin:2.5.30:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (scan-sources) @ tutti-ui-swing --- [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 31/1601 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1604/1610 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 10 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] collected 10 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 27/2065 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1898/2074 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- license-maven-plugin:1.5:update-project-license (attach-licenses) @ tutti-ui-swing --- [INFO] [INFO] --- license-maven-plugin:1.5:add-third-party (attach-licenses) @ tutti-ui-swing --- [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 97 resources [INFO] Copying 4 resources [INFO] Copying 4 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 351 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[393,44] getSelectedValues() in javax.swing.JList has been deprecated [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>: Recompile with -Xlint:unchecked for details. [INFO] 4 warnings [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[476,30] cannot find symbol symbol: method getMenuFileReport() location: variable ui of type UI [INFO] 1 error [INFO] -------------------------------------------------------------

1 1

[ANN] - Tutti 3.0-rc-1 released
by forge.codelutin.com Release Notification Nov. 21, 2013

Nov. 21, 2013

The Tutti team is pleased to announce the tutti-3.0-rc-1 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [EXPORT GENERIQUE] "id_operation" et "NumOrdre_Station" à renommer partout en "Code_station" et "Numero_trait" Issue: 3817. Thanks to Vincent BADTS. Resolved by tchemit. o Améliorer l'affichage lors de l'élévation des poids Issue: 3822. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [CAPTURE] probleme d'affichage de la valeur d'un nombre : écriture blanc sur blanc Issue: 3780. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] élévations : marche pas en .csv et .pdf depuis l'onglet résumé Issue: 3803. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] mauvais affichage des // Issue: 3804. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] mensurations, non réinitialisation des champs taile min et max entre deux ouverture de l'écran... Issue: 3807. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURES] Poids sous-échantilloné calculé non converti Issue: 3821. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] erreur suite suppression d'un lot espèce et fermeture de l'écran de saisie. A analyser Issue: 3808. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] j'arrive à enregistrer une classe de taille de valeur 0 avec un nombre non nul d'individus associés. Ca doit pas être possible Issue: 3838. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Temps d'affichage d'un trait trop lent Issue: 3823. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] mauvaise recopie des lots vers données individuelles Issue: 3806. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] lat long, visiblement il aime pas quand je créé un nouveau trait avec le nouveau formatage des lat long Issue: 3796. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o [TECH] Amélioration du démarrage de l'application Issue: 3841. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1377 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: maven-release Date: 2013-11-21 17:48:42 +0100 (Thu, 21 Nov 2013) New Revision: 1377 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1377 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-21 16:48:33 UTC (rev 1376) +++ trunk/pom.xml 2013-11-21 16:48:42 UTC (rev 1377) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1</version> + <version>3.0-rc-2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0-rc-1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0-rc-1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0-rc-1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-11-21 16:48:33 UTC (rev 1376) +++ trunk/tutti-persistence/pom.xml 2013-11-21 16:48:42 UTC (rev 1377) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1</version> + <version>3.0-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-11-21 16:48:33 UTC (rev 1376) +++ trunk/tutti-service/pom.xml 2013-11-21 16:48:42 UTC (rev 1377) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1</version> + <version>3.0-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-11-21 16:48:33 UTC (rev 1376) +++ trunk/tutti-ui-swing/pom.xml 2013-11-21 16:48:42 UTC (rev 1377) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1</version> + <version>3.0-rc-2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1376 - tags
by maven-release＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: maven-release Date: 2013-11-21 17:48:33 +0100 (Thu, 21 Nov 2013) New Revision: 1376 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1376 Log: [maven-release-plugin] copy for tag tutti-3.0-rc-1 Added: tags/tutti-3.0-rc-1/

1 0

r1375 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: maven-release Date: 2013-11-21 17:48:25 +0100 (Thu, 21 Nov 2013) New Revision: 1375 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1375 Log: [maven-release-plugin] prepare release tutti-3.0-rc-1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-21 16:46:18 UTC (rev 1374) +++ trunk/pom.xml 2013-11-21 16:48:25 UTC (rev 1375) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1-SNAPSHOT</version> + <version>3.0-rc-1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0-rc-1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0-rc-1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-3.0-rc-1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-11-21 16:46:18 UTC (rev 1374) +++ trunk/tutti-persistence/pom.xml 2013-11-21 16:48:25 UTC (rev 1375) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1-SNAPSHOT</version> + <version>3.0-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-11-21 16:46:18 UTC (rev 1374) +++ trunk/tutti-service/pom.xml 2013-11-21 16:48:25 UTC (rev 1375) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1-SNAPSHOT</version> + <version>3.0-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-11-21 16:46:18 UTC (rev 1374) +++ trunk/tutti-ui-swing/pom.xml 2013-11-21 16:48:25 UTC (rev 1375) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.0-rc-1-SNAPSHOT</version> + <version>3.0-rc-1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1374 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content
by tchemit＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: tchemit Date: 2013-11-21 17:46:18 +0100 (Thu, 21 Nov 2013) New Revision: 1374 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1374 Log: hide report action Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-11-21 16:31:54 UTC (rev 1373) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-11-21 16:46:18 UTC (rev 1374) @@ -47,7 +47,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; -import fr.ifremer.tutti.ui.swing.content.report.ReportUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.CloseableUI; import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; @@ -469,12 +468,12 @@ icon = ui.getMenuActionValidateCatches().getIcon(); break; - case REPORT: - - screenUI = new ReportUI(ui); - screenTitle = _("tutti.report.title"); - icon = ui.getMenuFileReport().getIcon(); - break; +// case REPORT: +// +// screenUI = new ReportUI(ui); +// screenTitle = _("tutti.report.title"); +// icon = ui.getMenuFileReport().getIcon(); +// break; } JButton showHelp = ui.getShowHelp();

1 0

r1373 - in trunk: tutti-persistence/src/license tutti-service/src/license
by tchemit＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: tchemit Date: 2013-11-21 17:31:54 +0100 (Thu, 21 Nov 2013) New Revision: 1373 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1373 Log: fix third parties Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties trunk/tutti-service/src/license/THIRD-PARTY.properties Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-11-21 16:31:32 UTC (rev 1372) +++ trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2013-11-21 16:31:54 UTC (rev 1373) @@ -22,29 +22,9 @@ # Please fill the missing licenses for dependencies : # # -#Mon May 27 20:19:31 CEST 2013 +#Thu Nov 21 17:08:16 CET 2013 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.persistence--persistence-api--1.0.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.andromda--andromda-core--3.3.1=BSD License -org.andromda--andromda-utils--3.3.1=BSD License -org.andromda.cartridges--andromda-hibernate-cartridge--3.3.1=BSD License -org.andromda.cartridges--andromda-java-cartridge--3.3.1=BSD License -org.andromda.cartridges--andromda-spring-cartridge--3.3.1=BSD License -org.andromda.metafacades--andromda-metafacades-uml--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-common--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-datatype--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-meta--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-persistence--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-presentation--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-process--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-screen--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-service--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-webservice--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-xml--3.3.1=BSD License -org.andromda.translationlibraries--andromda-ocl-translation-core--3.3.1=BSD License -org.andromda.translationlibraries--andromda-ocl-validation-library--3.3.1=BSD License -xalan--xalan--2.7.0=The Apache Software License, Version 2.0 -xerces--xercesImpl--2.6.0=The Apache Software License, Version 2.0 Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-11-21 16:31:32 UTC (rev 1372) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-11-21 16:31:54 UTC (rev 1373) @@ -21,7 +21,6 @@ # - MPL 1.1 # - New BSD License # - Public Domain -# - The AndroMDA Project # - The Apache Software License, Version 2.0 # - The MIT License # - license.txt @@ -29,30 +28,9 @@ # Please fill the missing licenses for dependencies : # # -#Thu Oct 31 15:46:39 CET 2013 +#Thu Nov 21 17:08:17 CET 2013 antlr--antlr--2.7.6=BSD License -commons-cli--commons-cli--1.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.persistence--persistence-api--1.0.2=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.andromda--andromda-core--3.3.1=BSD License -org.andromda--andromda-utils--3.3.1=BSD License -org.andromda.cartridges--andromda-hibernate-cartridge--3.3.1=BSD License -org.andromda.cartridges--andromda-java-cartridge--3.3.1=BSD License -org.andromda.cartridges--andromda-spring-cartridge--3.3.1=BSD License -org.andromda.metafacades--andromda-metafacades-uml--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-common--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-datatype--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-meta--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-persistence--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-presentation--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-process--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-screen--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-service--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-webservice--3.3.1=BSD License -org.andromda.profiles.emf.uml2--andromda-profile-xml--3.3.1=BSD License -org.andromda.translationlibraries--andromda-ocl-translation-core--3.3.1=BSD License -org.andromda.translationlibraries--andromda-ocl-validation-library--3.3.1=BSD License -xalan--xalan--2.7.0=The Apache Software License, Version 2.0 -xerces--xercesImpl--2.6.0=The Apache Software License, Version 2.0

1 0

r1372 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content
by tchemit＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: tchemit Date: 2013-11-21 17:31:32 +0100 (Thu, 21 Nov 2013) New Revision: 1372 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1372 Log: hide report action Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-11-21 16:09:10 UTC (rev 1371) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-11-21 16:31:32 UTC (rev 1372) @@ -32,6 +32,7 @@ title: "tutti.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; + iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; } #menuFile { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-11-21 16:09:10 UTC (rev 1371) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-11-21 16:31:32 UTC (rev 1372) @@ -70,9 +70,9 @@ <JMenuItem id='menuFileUpdateReport'/> <JSeparator/> <JMenuItem id='menuFileManageDb'/> +  +  <JSeparator/> - <JMenuItem id='menuFileReport'/> - <JSeparator/> <JMenuItem id='menuFileExit'/> </JMenu>

1 0

r1371 - in trunk: . tutti-persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities tutti-service tutti-service/src/main/java/fr/ifremer/tutti/service/export tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf tutti-ui-swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos tutti-ui-swing
by tchemit＠users.forge.codelutin.com Nov. 21, 2013

Nov. 21, 2013

Author: tchemit Date: 2013-11-21 17:09:10 +0100 (Thu, 21 Nov 2013) New Revision: 1371 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1371 Log: - update to version 3.0-rc-1 - round number in sumatra export - prepare release Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java Removed: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/ExportCatchContext.java Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-service/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/pom.xml 2013-11-21 16:09:10 UTC (rev 1371) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.10-SNAPSHOT</version> + <version>3.0-rc-1-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-persistence/pom.xml 2013-11-21 16:09:10 UTC (rev 1371) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.10-SNAPSHOT</version> + <version>3.0-rc-1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</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 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -337,7 +337,7 @@ * * @param value the float to round. * @return the rounded value - * @since 2.10 + * @since 3.0-rc-1 */ public static float roundKiloGram(float value) { BigDecimal sumB = new BigDecimal(value); Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-service/pom.xml 2013-11-21 16:09:10 UTC (rev 1371) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.10-SNAPSHOT</version> + <version>3.0-rc-1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -1,13 +1,36 @@ package fr.ifremer.tutti.service.export; +/* + * #%L + * Tutti :: Service + * $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% + */ + import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; /** * To store a species or batch entry within his speices informations, - * his sorted weight, total weight and percentage amoong the total catch - * weight. + * his sorted weight, total weight and optional his total number. * - * @since 2.10 + * @since 3.0-rc-1 */ public class ExportBatchEntry { Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Copied: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java (from rev 1370, trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/ExportCatchContext.java) =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -0,0 +1,362 @@ +package fr.ifremer.tutti.service.export; + +/* + * #%L + * Tutti :: Service + * $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% + */ + +import com.google.common.base.Predicate; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.BatchContainer; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.CatchBatch; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; +import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.catches.WeightComputingService; + +import java.util.List; +import java.util.Map; + +/** + * Contains the global context for a catch export. + * <p/> + * Created on 11/21/13. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.0-rc-1 + */ +public class ExportCatchContext { + + final FishingOperation fishingOperation; + + final CatchBatch catchBatch; + + final BatchContainer<SpeciesBatch> rootSpeciesBatch; + + final BatchContainer<BenthosBatch> rootBenthosBatch; + + final BatchContainer<MarineLitterBatch> marineLitterBatches; + + final Predicate<SpeciesAbleBatch> vracPredicate; + + public static ExportCatchContext newExportContext(PersistenceService persistenceService, + WeightComputingService weightComputingService, + String fishingOperationId) { + + FishingOperation fishingOperation = + persistenceService.getFishingOperation(fishingOperationId); + + CatchBatch catchBatch = + persistenceService.getCatchBatchFromFishingOperation(fishingOperationId); + + BatchContainer<SpeciesBatch> rootSpeciesBatch = + weightComputingService.getComputedSpeciesBatches(fishingOperationId); + + BatchContainer<BenthosBatch> rootBenthosBatch = + weightComputingService.getComputedBenthosBatches(fishingOperationId); + + BatchContainer<MarineLitterBatch> marineLitterBatches = + weightComputingService.getComputedMarineLitterBatches( + fishingOperationId, + catchBatch.getMarineLitterTotalWeight()); + weightComputingService.computeCatchBatchWeights(catchBatch, + rootSpeciesBatch, + rootBenthosBatch, + marineLitterBatches); + + Predicate<SpeciesAbleBatch> vracPredicate = persistenceService.getVracBatchPredicate(); + + ExportCatchContext result = new ExportCatchContext(vracPredicate, + fishingOperation, + catchBatch, + rootSpeciesBatch, + rootBenthosBatch, + marineLitterBatches); + return result; + + } + + private ExportCatchContext(Predicate<SpeciesAbleBatch> vracPredicate, + FishingOperation fishingOperation, + CatchBatch catchBatch, + BatchContainer<SpeciesBatch> rootSpeciesBatch, + BatchContainer<BenthosBatch> rootBenthosBatch, + BatchContainer<MarineLitterBatch> marineLitterBatches) { + this.vracPredicate = vracPredicate; + this.fishingOperation = fishingOperation; + this.catchBatch = catchBatch; + this.rootSpeciesBatch = rootSpeciesBatch; + this.rootBenthosBatch = rootBenthosBatch; + this.marineLitterBatches = marineLitterBatches; + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + public float getCatchTotalWeight() { + float result = TuttiEntities.getValueOrComputedValue( + catchBatch.getCatchTotalWeight(), + catchBatch.getCatchTotalComputedWeight()); + return result; + } + + public float getCatchTotalSortedWeight() { + return catchBatch.getSpeciesTotalSampleSortedComputedWeight() + + catchBatch.getBenthosTotalSampleSortedComputedWeight(); + } + + public boolean withSpeciesBatches() { + return rootSpeciesBatch != null && !rootSpeciesBatch.isEmptyChildren(); + } + + public boolean withBenthosBatches() { + return rootBenthosBatch != null && !rootBenthosBatch.isEmptyChildren(); + } + + public List<ExportBatchEntry> getSpeciesBatchEntry(boolean computeNumber) { + List<ExportBatchEntry> catchList = Lists.newArrayList(); + + if (withSpeciesBatches()) { + + Map<Species, ExportBatchEntry> catches = Maps.newLinkedHashMap(); + + // ratio total species weight / total sorted sampled species weight + float rate = getSpeciesElevationRate(); + + List<SpeciesBatch> batches = rootSpeciesBatch.getChildren(); + for (SpeciesBatch batch : batches) { + + createExportBatchCatch( + batch, + catches, + rate, + computeNumber); + } + catchList.addAll(catches.values()); + } + return catchList; + } + + public List<ExportBatchEntry> getBenthosBatchEntry(boolean computeNumber) { + List<ExportBatchEntry> catchList = Lists.newArrayList(); + + if (withBenthosBatches()) { + + Map<Species, ExportBatchEntry> catches = Maps.newLinkedHashMap(); + + // ratio total species weight / total sorted sampled species weight + float rate = getBenthosElevationRate(); + + List<BenthosBatch> batches = rootBenthosBatch.getChildren(); + for (BenthosBatch batch : batches) { + + createExportBatchCatch( + batch, + catches, + rate, + computeNumber); + } + + catchList.addAll(catches.values()); + } + return catchList; + } + + public ExportBatchEntry getInertAndLivingNotItemizedCatch() { + + ExportBatchEntry result = new ExportBatchEntry(null); + + float speciesRatio = getSpeciesElevationRate(); + float benthosRatio = getBenthosElevationRate(); + + Float speciesInterWeight = TuttiEntities.getValueOrComputedValue( + catchBatch.getSpeciesTotalInertWeight(), + catchBatch.getSpeciesTotalInertComputedWeight()); + + if (speciesInterWeight != null) { + result.addSortedWeight(speciesInterWeight); + result.addTotalWeight(speciesInterWeight * speciesRatio); + } + + Float speciesLivingNotItemizedWeigth = TuttiEntities.getValueOrComputedValue( + catchBatch.getSpeciesTotalLivingNotItemizedWeight(), + catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); + + if (speciesLivingNotItemizedWeigth != null) { + result.addSortedWeight(speciesLivingNotItemizedWeigth); + result.addTotalWeight(speciesLivingNotItemizedWeigth * speciesRatio); + } + + Float benthosInterWeight = TuttiEntities.getValueOrComputedValue( + catchBatch.getBenthosTotalInertWeight(), + catchBatch.getBenthosTotalInertComputedWeight()); + + if (benthosInterWeight != null) { + result.addSortedWeight(benthosInterWeight); + result.addTotalWeight(benthosInterWeight * benthosRatio); + } + + Float benthosLivingNotItemizedWeight = TuttiEntities.getValueOrComputedValue( + catchBatch.getBenthosTotalLivingNotItemizedWeight(), + catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); + + if (benthosLivingNotItemizedWeight != null) { + result.addSortedWeight(benthosLivingNotItemizedWeight); + result.addTotalWeight(benthosLivingNotItemizedWeight * benthosRatio); + } + + return result; + } + + public boolean isVracBatch(SpeciesAbleBatch batch) { + return vracPredicate.apply(batch); + } + + protected float getSpeciesElevationRate() { + + float globalRatio = (getCatchTotalWeight() - catchBatch.getCatchTotalUnsortedComputedWeight()) / catchBatch.getCatchTotalSortedComputedWeight(); + + float speciesTotalSortedWeight = TuttiEntities.getValueOrComputedValue( + catchBatch.getSpeciesTotalSortedWeight(), + catchBatch.getSpeciesTotalSortedComputedWeight()); + + // ratio total species weight / total sorted sampled species weight + float result = globalRatio * speciesTotalSortedWeight; + if (catchBatch.getSpeciesTotalSampleSortedComputedWeight() > 0) { + result /= catchBatch.getSpeciesTotalSampleSortedComputedWeight(); + } + return result; + } + + protected float getBenthosElevationRate() { + + float globalRatio = (getCatchTotalWeight() - catchBatch.getCatchTotalUnsortedComputedWeight()) / catchBatch.getCatchTotalSortedComputedWeight(); + + float benthosTotalSortedWeight = TuttiEntities.getValueOrComputedValue( + catchBatch.getBenthosTotalSortedWeight(), + catchBatch.getBenthosTotalSortedComputedWeight()); + + // ratio total benthos weight / total sorted sampled benthos weight + float result = globalRatio * benthosTotalSortedWeight; + if (catchBatch.getBenthosTotalSampleSortedComputedWeight() > 0) { + result /= catchBatch.getBenthosTotalSampleSortedComputedWeight(); + } + return result; + } + + protected void createExportBatchCatch(SpeciesAbleBatch batch, + Map<Species, ExportBatchEntry> catches, + float ratio, + boolean computeNumber) { + + Species species = batch.getSpecies(); + + ExportBatchEntry ktch = catches.get(species); + if (ktch == null) { + ktch = new ExportBatchEntry(batch); + catches.put(species, ktch); + } + + float sortedWeight = TuttiEntities.getValueOrComputedValue( + batch.getSampleCategoryWeight(), + batch.getSampleCategoryComputedWeight()); + + ktch.addSortedWeight(sortedWeight); + + boolean isVracBatch = isVracBatch(batch); + float speciesTotalWeight = sortedWeight; + if (isVracBatch) { + speciesTotalWeight *= ratio; + } + ktch.addTotalWeight(speciesTotalWeight); + + if (computeNumber) { + float number = Math.round(computeNumber(batch, 1.0f)); + if (isVracBatch) { + number *= ratio; + } + ktch.addNumber(Math.round(number)); + } + } + + protected float computeNumber(SpeciesAbleBatch batch, float rf) { + float result; + + float weight = TuttiEntities.getValueOrComputedValue( + batch.getSampleCategoryWeight(), + batch.getSampleCategoryComputedWeight()); + + if (batch.isChildBatchsEmpty()) { + + // on a leaf, get his weight + + Integer number = TuttiEntities.getValueOrComputedValue( + batch.getNumber(), + batch.getComputedNumber()); + if (number == null) { + + // no count + number = 0; + } + + // get the sample weight + Float subweight = TuttiEntities.getValueOrComputedValue( + batch.getWeight(), + batch.getComputedWeight()); + + if (subweight != null) { + + // with sub sample, update the raising factor + rf *= weight / subweight; + } + + result = number.floatValue() * rf; + } else { + + // get total weight of all childs + float totalWeight = 0.f; + for (SpeciesAbleBatch child : batch.getChildBatchs()) { + totalWeight += TuttiEntities.getValueOrComputedValue( + child.getSampleCategoryWeight(), + child.getSampleCategoryComputedWeight()); + } + + result = 0f; + + float rf2 = rf * weight / totalWeight; + // sum result of each child + for (SpeciesAbleBatch child : batch.getChildBatchs()) { + + result += computeNumber(child, rf2); + } + + } + return result; + } +} Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -36,6 +36,7 @@ import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.catches.WeightComputingService; import fr.ifremer.tutti.service.export.ExportBatchEntry; +import fr.ifremer.tutti.service.export.ExportCatchContext; import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/ExportCatchContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/ExportCatchContext.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/ExportCatchContext.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -1,337 +0,0 @@ -package fr.ifremer.tutti.service.export.pdf; - -import com.google.common.base.Predicate; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.BatchContainer; -import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; -import fr.ifremer.tutti.persistence.entities.data.CatchBatch; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; -import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; -import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; -import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.service.catches.WeightComputingService; -import fr.ifremer.tutti.service.export.ExportBatchEntry; - -import java.util.List; -import java.util.Map; - -/** - * Created on 11/21/13. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since XXX - */ -public class ExportCatchContext { - - final FishingOperation fishingOperation; - - final CatchBatch catchBatch; - - final BatchContainer<SpeciesBatch> rootSpeciesBatch; - - final BatchContainer<BenthosBatch> rootBenthosBatch; - - final BatchContainer<MarineLitterBatch> marineLitterBatches; - - final Predicate<SpeciesAbleBatch> vracPredicate; - - public static ExportCatchContext newExportContext(PersistenceService persistenceService, - WeightComputingService weightComputingService, - String fishingOperationId) { - - FishingOperation fishingOperation = - persistenceService.getFishingOperation(fishingOperationId); - - CatchBatch catchBatch = - persistenceService.getCatchBatchFromFishingOperation(fishingOperationId); - - BatchContainer<SpeciesBatch> rootSpeciesBatch = - weightComputingService.getComputedSpeciesBatches(fishingOperationId); - - BatchContainer<BenthosBatch> rootBenthosBatch = - weightComputingService.getComputedBenthosBatches(fishingOperationId); - - BatchContainer<MarineLitterBatch> marineLitterBatches = - weightComputingService.getComputedMarineLitterBatches( - fishingOperationId, - catchBatch.getMarineLitterTotalWeight()); - weightComputingService.computeCatchBatchWeights(catchBatch, - rootSpeciesBatch, - rootBenthosBatch, - marineLitterBatches); - - Predicate<SpeciesAbleBatch> vracPredicate = persistenceService.getVracBatchPredicate(); - - ExportCatchContext result = new ExportCatchContext(vracPredicate, - fishingOperation, - catchBatch, - rootSpeciesBatch, - rootBenthosBatch, - marineLitterBatches); - return result; - - } - - private ExportCatchContext(Predicate<SpeciesAbleBatch> vracPredicate, - FishingOperation fishingOperation, - CatchBatch catchBatch, - BatchContainer<SpeciesBatch> rootSpeciesBatch, - BatchContainer<BenthosBatch> rootBenthosBatch, - BatchContainer<MarineLitterBatch> marineLitterBatches) { - this.vracPredicate = vracPredicate; - this.fishingOperation = fishingOperation; - this.catchBatch = catchBatch; - this.rootSpeciesBatch = rootSpeciesBatch; - this.rootBenthosBatch = rootBenthosBatch; - this.marineLitterBatches = marineLitterBatches; - } - - public FishingOperation getFishingOperation() { - return fishingOperation; - } - - public float getCatchTotalWeight() { - float result = TuttiEntities.getValueOrComputedValue( - catchBatch.getCatchTotalWeight(), - catchBatch.getCatchTotalComputedWeight()); - return result; - } - - public float getCatchTotalSortedWeight() { - return catchBatch.getSpeciesTotalSampleSortedComputedWeight() + - catchBatch.getBenthosTotalSampleSortedComputedWeight(); - } - - public boolean withSpeciesBatches() { - return rootSpeciesBatch != null && !rootSpeciesBatch.isEmptyChildren(); - } - - public boolean withBenthosBatches() { - return rootBenthosBatch != null && !rootBenthosBatch.isEmptyChildren(); - } - - public List<ExportBatchEntry> getSpeciesBatchEntry(boolean computeNumber) { - List<ExportBatchEntry> catchList = Lists.newArrayList(); - - if (withSpeciesBatches()) { - - Map<Species, ExportBatchEntry> catches = Maps.newLinkedHashMap(); - - // ratio total species weight / total sorted sampled species weight - float speciesRatio = getSpeciesElevationRate(); - - List<SpeciesBatch> batches = rootSpeciesBatch.getChildren(); - for (SpeciesBatch batch : batches) { - - createExportBatchCatch( - batch, - catches, - speciesRatio, - computeNumber); - } - catchList.addAll(catches.values()); - } - return catchList; - } - - public List<ExportBatchEntry> getBenthosBatchEntry(boolean computeNumber) { - List<ExportBatchEntry> catchList = Lists.newArrayList(); - - if (withBenthosBatches()) { - - Map<Species, ExportBatchEntry> catches = Maps.newLinkedHashMap(); - - // ratio total species weight / total sorted sampled species weight - float speciesRatio = getBenthosElevationRate(); - - List<BenthosBatch> batches = rootBenthosBatch.getChildren(); - for (BenthosBatch batch : batches) { - - createExportBatchCatch( - batch, - catches, - speciesRatio, - computeNumber); - } - - catchList.addAll(catches.values()); - } - return catchList; - } - - public ExportBatchEntry getInertAndLivingNotItemizedCatch() { - - ExportBatchEntry result = new ExportBatchEntry(null); - - float speciesRatio = getSpeciesElevationRate(); - float benthosRatio = getBenthosElevationRate(); - - Float speciesInterWeight = TuttiEntities.getValueOrComputedValue( - catchBatch.getSpeciesTotalInertWeight(), - catchBatch.getSpeciesTotalInertComputedWeight()); - - if (speciesInterWeight != null) { - result.addSortedWeight(speciesInterWeight); - result.addTotalWeight(speciesInterWeight * speciesRatio); - } - - Float speciesLivingNotItemizedWeigth = TuttiEntities.getValueOrComputedValue( - catchBatch.getSpeciesTotalLivingNotItemizedWeight(), - catchBatch.getSpeciesTotalLivingNotItemizedComputedWeight()); - - if (speciesLivingNotItemizedWeigth != null) { - result.addSortedWeight(speciesLivingNotItemizedWeigth); - result.addTotalWeight(speciesLivingNotItemizedWeigth * speciesRatio); - } - - Float benthosInterWeight = TuttiEntities.getValueOrComputedValue( - catchBatch.getBenthosTotalInertWeight(), - catchBatch.getBenthosTotalInertComputedWeight()); - - if (benthosInterWeight != null) { - result.addSortedWeight(benthosInterWeight); - result.addTotalWeight(benthosInterWeight * benthosRatio); - } - - Float benthosLivingNotItemizedWeight = TuttiEntities.getValueOrComputedValue( - catchBatch.getBenthosTotalLivingNotItemizedWeight(), - catchBatch.getBenthosTotalLivingNotItemizedComputedWeight()); - - if (benthosLivingNotItemizedWeight != null) { - result.addSortedWeight(benthosLivingNotItemizedWeight); - result.addTotalWeight(benthosLivingNotItemizedWeight * benthosRatio); - } - - return result; - } - - public boolean isVracBatch(SpeciesAbleBatch batch) { - return vracPredicate.apply(batch); - } - - protected float getSpeciesElevationRate() { - - float globalRatio = (getCatchTotalWeight() - catchBatch.getCatchTotalUnsortedComputedWeight()) / catchBatch.getCatchTotalSortedComputedWeight(); - - float speciesTotalSortedWeight = TuttiEntities.getValueOrComputedValue( - catchBatch.getSpeciesTotalSortedWeight(), - catchBatch.getSpeciesTotalSortedComputedWeight()); - - // ratio total species weight / total sorted sampled species weight - float result = globalRatio * speciesTotalSortedWeight; - if (catchBatch.getSpeciesTotalSampleSortedComputedWeight() > 0) { - result /= catchBatch.getSpeciesTotalSampleSortedComputedWeight(); - } - return result; - } - - protected float getBenthosElevationRate() { - - float globalRatio = (getCatchTotalWeight() - catchBatch.getCatchTotalUnsortedComputedWeight()) / catchBatch.getCatchTotalSortedComputedWeight(); - - float benthosTotalSortedWeight = TuttiEntities.getValueOrComputedValue( - catchBatch.getBenthosTotalSortedWeight(), - catchBatch.getBenthosTotalSortedComputedWeight()); - - // ratio total benthos weight / total sorted sampled benthos weight - float result = globalRatio * benthosTotalSortedWeight; - if (catchBatch.getBenthosTotalSampleSortedComputedWeight() > 0) { - result /= catchBatch.getBenthosTotalSampleSortedComputedWeight(); - } - return result; - } - - protected void createExportBatchCatch(SpeciesAbleBatch batch, - Map<Species, ExportBatchEntry> catches, - float ratio, - boolean computeNumber) { - - Species species = batch.getSpecies(); - - ExportBatchEntry ktch = catches.get(species); - if (ktch == null) { - ktch = new ExportBatchEntry(batch); - catches.put(species, ktch); - } - - float sortedWeight = TuttiEntities.getValueOrComputedValue( - batch.getSampleCategoryWeight(), - batch.getSampleCategoryComputedWeight()); - - ktch.addSortedWeight(sortedWeight); - - boolean isVracBatch = isVracBatch(batch); - float speciesTotalWeight = sortedWeight; - if (isVracBatch) { - speciesTotalWeight *= ratio; - } - ktch.addTotalWeight(speciesTotalWeight); - - if (computeNumber) { - int number = Math.round(computeNumber(batch, 1.0f)); - if (isVracBatch) { - number *= ratio; - } - ktch.addNumber(number); - } - } - - protected float computeNumber(SpeciesAbleBatch batch, float rf) { - float result; - - float weight = TuttiEntities.getValueOrComputedValue( - batch.getSampleCategoryWeight(), - batch.getSampleCategoryComputedWeight()); - - if (batch.isChildBatchsEmpty()) { - - // on a leaf, get his weight - - Integer number = TuttiEntities.getValueOrComputedValue( - batch.getNumber(), - batch.getComputedNumber()); - if (number == null) { - - // no count - number = 0; - } - - // get the sample weight - Float subweight = TuttiEntities.getValueOrComputedValue( - batch.getWeight(), - batch.getComputedWeight()); - - if (subweight != null) { - - // with sub sample, update the raising factor - rf *= weight / subweight; - } - - result = number.floatValue() * rf; - } else { - - // get total weight of all childs - float totalWeight = 0.f; - for (SpeciesAbleBatch child : batch.getChildBatchs()) { - totalWeight += TuttiEntities.getValueOrComputedValue( - child.getSampleCategoryWeight(), - child.getSampleCategoryComputedWeight()); - } - - result = 0f; - - float rf2 = rf * weight / totalWeight; - // sum result of each child - for (SpeciesAbleBatch child : batch.getChildBatchs()) { - - result += computeNumber(child, rf2); - } - - } - return result; - } -} Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export.pdf; +/* + * #%L + * Tutti :: Service + * $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% + */ + import fr.ifremer.tutti.service.export.ExportBatchEntry; /** @@ -7,7 +31,7 @@ * his sorted weight, total weight and percentage amoong the total catch * weight. * - * @since 2.10 + * @since 3.0-rc-1 */ public class PdfExportBatchEntry extends ExportBatchEntry { Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/PdfExportBatchEntry.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -36,7 +36,7 @@ import fr.ifremer.tutti.service.TuttiServiceContext; import fr.ifremer.tutti.service.catches.WeightComputingService; import fr.ifremer.tutti.service.export.ExportBatchEntry; -import fr.ifremer.tutti.service.export.pdf.ExportCatchContext; +import fr.ifremer.tutti.service.export.ExportCatchContext; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export.pdf; +/* + * #%L + * Tutti :: Service + * $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% + */ + import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; @@ -16,7 +40,7 @@ * Created on 11/19/13. * * @author Tony Chemit <chemit(a)codelutin.com> - * @since 2.10 + * @since 3.0-rc-1 */ public class CatchesPdfExportServiceTest { Property changes on: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-ui-swing/pom.xml 2013-11-21 16:09:10 UTC (rev 1371) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.10-SNAPSHOT</version> + <version>3.0-rc-1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosBatchAction.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -56,7 +56,7 @@ /** * Rows to delete after all. * - * @since 2.10 + * @since 3.0-rc-1 */ protected Set<BenthosBatchRowModel> rowToRemove; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -56,14 +56,14 @@ /** * Rows to delete after all. * - * @since 2.10 + * @since 3.0-rc-1 */ protected Set<BenthosBatchRowModel> rowToRemove; /** * Parent batch of rows to delete. * - * @since 2.10 + * @since 3.0-rc-1 */ protected BenthosBatchRowModel parentBatch; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesBatchAction.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -49,7 +49,7 @@ /** * Rows to delete after all. * - * @since 2.10 + * @since 3.0-rc-1 */ protected Set<SpeciesBatchRowModel> rowToRemove; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-11-21 15:41:34 UTC (rev 1370) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-11-21 16:09:10 UTC (rev 1371) @@ -56,14 +56,14 @@ /** * Rows to delete after all. * - * @since 2.10 + * @since 3.0-rc-1 */ protected Set<SpeciesBatchRowModel> rowToRemove; /** * Parent batch of rows to delete. * - * @since 2.10 + * @since 3.0-rc-1 */ protected SpeciesBatchRowModel parentBatch;

1 0