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

Build failed in Jenkins: tutti » Tutti :: UI #1216
by admin+hudson＠codelutin.com 04 Feb '14

04 Feb '14

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/1216/> ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.2-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 17.4 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (3 KB at 8.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 58.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (3 KB at 12.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 52.9 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (3 KB at 12.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 58.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (3 KB at 11.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 70.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (3 KB at 15.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ap… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 43.3 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ap… (3 KB at 9.9 KB/sec) [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.8-SNAPSHOT:generate (default) @ tutti-ui-swing --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… (4 KB at 45.4 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… (4 KB at 17.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 36.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (3 KB at 12.6 KB/sec) [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 - org.nuiton.i18n.I18n.n_(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; java.lang.NoSuchMethodError: org.nuiton.i18n.I18n.n_(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; at fr.ifremer.tutti.type.WeightUnit.<clinit>(WeightUnit.java:16) at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:270) at jaxx.compiler.reflect.ClassDescriptorHelper.getClass(ClassDescriptorHelper.java:393) at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaClass.resolvDescriptor(ClassDescriptorResolverFromJavaClass.java:65) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor0(ClassDescriptorHelper.java:276) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor(ClassDescriptorHelper.java:237) at jaxx.compiler.tags.TagManager.getTagHandler(TagManager.java:474) at jaxx.compiler.tags.TagManager.getTagHandler(TagManager.java:225) at jaxx.compiler.JAXXCompiler$1.run(JAXXCompiler.java:597) at jaxx.compiler.JAXXCompiler.runInitializers(JAXXCompiler.java:398) at jaxx.compiler.tasks.CompileSecondPassTask.perform(CompileSecondPassTask.java:76) 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:106) 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: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: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:744) [WARNING] JAXX detects 1 warning : <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> Found a handler fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditorHandler which does not implements jaxx.runtime.spi.UIHandler

1 1

Build failed in Jenkins: tutti #1216
by admin+hudson＠codelutin.com 04 Feb '14

04 Feb '14

See <http://ci.nuiton.org/jenkins/job/tutti/1216/> ------------------------------------------ [...truncated 406 lines...] Running fr.ifremer.tutti.service.BeanValidatorDetectorTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.574 sec - in fr.ifremer.tutti.service.BeanValidatorDetectorTest Running fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-02-04 08:37:18,197 0 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.WeightComputingServiceTest 2014-02-04 08:37:18,232 35 [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.catches.WeightComputingServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.043 sec - in fr.ifremer.tutti.service.catches.WeightComputingServiceTest Running fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-02-04 08:37:18,236 39 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.catches.multipost.MultiPostExportServiceTest 2014-02-04 08:37:18,244 47 [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.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-02-04 08:37:18,244 47 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.UpdateSchemaTest 2014-02-04 08:37:18,250 53 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS_old.properties 2014-02-04 08:37:18,251 54 [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.006 sec - in fr.ifremer.tutti.service.UpdateSchemaTest Running fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-02-04 08:37:18,253 56 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportServiceTest 2014-02-04 08:37:18,258 61 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-02-04 08:37:18,259 62 [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-02-04 08:37:18,260 63 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest 2014-02-04 08:37:18,264 67 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-02-04 08:37:18,265 68 [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 sec - in fr.ifremer.tutti.service.pupitri.PupitriImportExportServiceTest Running fr.ifremer.tutti.service.ValidationServiceTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.629 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.196 sec - in fr.ifremer.tutti.service.DecoratorServiceTest Running fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-02-04 08:37:19,096 899 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.psionimport.PsionImportServiceTest 2014-02-04 08:37:19,099 902 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbExport.properties 2014-02-04 08:37:19,100 903 [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.012 sec - in fr.ifremer.tutti.service.psionimport.PsionImportServiceTest Running fr.ifremer.tutti.service.report.ReportServiceTest 2014-02-04 08:37:19,101 904 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.report.ReportServiceTest 2014-02-04 08:37:19,105 908 [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.report.ReportServiceTest] is skipped. Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in fr.ifremer.tutti.service.report.ReportServiceTest Running fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-02-04 08:37:19,107 910 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest 2014-02-04 08:37:19,110 913 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-02-04 08:37:19,111 914 [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.003 sec - in fr.ifremer.tutti.service.protocol.ProtocolImportExportServiceTest Running fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-02-04 08:37:19,113 916 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest 2014-02-04 08:37:19,117 920 [main] WARN fr.ifremer.tutti.persistence.test.DatabaseResource - No configuration file found in classpath at tutti-test-write-dbCGFS.properties 2014-02-04 08:37:19,117 920 [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.006 sec - in fr.ifremer.tutti.service.referential.ReferentialImportExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-02-04 08:37:19,120 923 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest 2014-02-04 08:37:19,124 927 [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.006 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportServiceTest Running fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-02-04 08:37:19,124 927 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.generic.TuttiExportService2Test 2014-02-04 08:37:19,128 931 [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.004 sec - in fr.ifremer.tutti.service.export.generic.TuttiExportService2Test Running fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-02-04 08:37:19,129 932 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest 2014-02-04 08:37:19,132 935 [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.003 sec - in fr.ifremer.tutti.service.export.sumatra.CatchesSumatraExportServiceTest Running fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-02-04 08:37:19,133 936 [main] INFO fr.ifremer.tutti.persistence.test.DatabaseResource - Prepare test class fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest 2014-02-04 08:37:19,136 939 [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.003 sec - in fr.ifremer.tutti.service.export.pdf.CatchesPdfExportServiceTest Results : Tests run: 25, Failures: 0, Errors: 0, Skipped: 14 [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.2-SNAPSHOT/tutti-service-3.2-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.2-SNAPSHOT/tutti-service-3.2-SNAPSHOT.pom [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 3.2-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 17.4 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (3 KB at 8.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 58.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (3 KB at 12.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 52.9 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (3 KB at 12.5 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 58.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (3 KB at 11.8 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 70.0 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (3 KB at 15.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ap… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 43.3 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ap… (3 KB at 9.9 KB/sec) [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.8-SNAPSHOT:generate (default) @ tutti-ui-swing --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… (4 KB at 45.4 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… (4 KB at 17.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (3 KB at 36.1 KB/sec) [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (3 KB at 12.6 KB/sec) [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 - org.nuiton.i18n.I18n.n_(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; java.lang.NoSuchMethodError: org.nuiton.i18n.I18n.n_(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; at fr.ifremer.tutti.type.WeightUnit.<clinit>(WeightUnit.java:16) at java.lang.Class.forName0(Native Method) at java.lang.Class.forName(Class.java:270) at jaxx.compiler.reflect.ClassDescriptorHelper.getClass(ClassDescriptorHelper.java:393) at jaxx.compiler.reflect.resolvers.ClassDescriptorResolverFromJavaClass.resolvDescriptor(ClassDescriptorResolverFromJavaClass.java:65) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor0(ClassDescriptorHelper.java:276) at jaxx.compiler.reflect.ClassDescriptorHelper.getClassDescriptor(ClassDescriptorHelper.java:237) at jaxx.compiler.tags.TagManager.getTagHandler(TagManager.java:474) at jaxx.compiler.tags.TagManager.getTagHandler(TagManager.java:225) at jaxx.compiler.JAXXCompiler$1.run(JAXXCompiler.java:597) at jaxx.compiler.JAXXCompiler.runInitializers(JAXXCompiler.java:398) at jaxx.compiler.tasks.CompileSecondPassTask.perform(CompileSecondPassTask.java:76) 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:106) 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: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: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:744) [WARNING] JAXX detects 1 warning : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…> Found a handler fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditorHandler which does not implements jaxx.runtime.spi.UIHandler [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.933s] [INFO] Tutti :: Persistence .............................. SUCCESS [11.618s] [INFO] Tutti :: Ichtyometer API .......................... SUCCESS [1.351s] [INFO] Tutti :: Service .................................. SUCCESS [11.490s] [INFO] Tutti :: UI ....................................... FAILURE [8.337s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 41.860s [INFO] Finished at: Tue Feb 04 08:37:28 CET 2014 [INFO] Final Memory: 90M/247M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.nuiton.jaxx:jaxx-maven-plugin:2.8-SNAPSHOT: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-SNAPSHOT: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: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: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:744) 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: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/MojoExecutionException [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.2-SNAPSHOT/tutti-ui-swing-3.2-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to fr.ifremer.tutti/tutti-persistence/3.2-SNAPSHOT/tutti-persistence-3.2-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to fr.ifremer.tutti/tutti-persistence/3.2-SNAPSHOT/tutti-persistence-3.2-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ichtyometer/pom.xml> to fr.ifremer.tutti/tutti-ichtyometer/3.2-SNAPSHOT/tutti-ichtyometer-3.2-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ichtyometer/target/tu…> to fr.ifremer.tutti/tutti-ichtyometer/3.2-SNAPSHOT/tutti-ichtyometer-3.2-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to fr.ifremer.tutti/tutti-service/3.2-SNAPSHOT/tutti-service-3.2-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to fr.ifremer.tutti/tutti-service/3.2-SNAPSHOT/tutti-service-3.2-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to fr.ifremer/tutti/3.2-SNAPSHOT/tutti-3.2-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-3.2-SNAPSHOT-s…> to fr.ifremer/tutti/3.2-SNAPSHOT/tutti-3.2-SNAPSHOT-site_fr.xml Sending e-mails to: tutti-commits(a)list.forge.codelutin.com channel stopped

1 1

r1566 - in trunk: . src/site tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data 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/pers
by tchemit＠users.forge.codelutin.com 04 Feb '14

04 Feb '14

Author: tchemit Date: 2014-02-04 09:31:02 +0100 (Tue, 04 Feb 2014) New Revision: 1566 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1566 Log: update nuiton-utils, nuiton-* to 3.0-SNAPSHOT Modified: trunk/pom.xml trunk/src/site/site_fr.xml trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.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/AttachmentPersistenceServiceImpl.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/CruisePersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.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/batch/BatchPersistenceHelper.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.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/WeightCleaningService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.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/export/pdf/CatchesPdfExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java 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/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.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/SaveProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java 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/category/EditSampleCategoryModelTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.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/db/DbManagerUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 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/FishingOperationsUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.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/MultiPostImportLogDialog.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 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/create/CreateAccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 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/create/CreateBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 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/split/SplitBenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 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/CreateIndividualObservationBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 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/create/CreateMarineLitterBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 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/create/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 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/split/SplitSpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 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/referential/ManageTemporaryReferentialUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.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/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.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/CaracteristicMapEditorTableModel.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/comment/ButtonComment.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/pom.xml 2014-02-04 08:31:02 UTC (rev 1566) @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.5</version> + <version>4.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -98,12 +98,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>https://forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:https://forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:https://forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> @@ -131,9 +131,9 @@ <signatureVersion>1.0</signatureVersion>  - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> - <eugenePluginVersion>2.7.2</eugenePluginVersion> + <nuitonI18nVersion>3.0-SNAPSHOT</nuitonI18nVersion> + <nuitonValidatorVersion>3.0-SNAPSHOT</nuitonValidatorVersion> + <eugenePluginVersion>2.7.4-SNAPSHOT</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> <jaxxVersion>2.8-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> @@ -214,22 +214,22 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>2.7.1</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-updater</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton</groupId> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/src/site/site_fr.xml 2014-02-04 08:31:02 UTC (rev 1566) @@ -65,10 +65,10 @@ name="ReStructuredText" img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + <logo href="${mavenpomSiteCommonResourcesUrl}/jrst" name="JRst" img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://maven-site.nuiton.org/jaxx" name="JAXX" + <logo href="${mavenpomSiteCommonResourcesUrl}/jaxx" name="JAXX" img="${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 1/14/14. @@ -90,7 +90,7 @@ this.delegate = new DatabaseMetadata(connection, dialect, true); this.meta = connection.getMetaData(); } catch (SQLException e) { - throw new ApplicationTechnicalException(_("tutti.persistence.dbMetadata.instanciation.error", connection), e); + throw new ApplicationTechnicalException(t("tutti.persistence.dbMetadata.instanciation.error", connection), e); } tables = Maps.newTreeMap(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -26,9 +26,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; -import com.google.common.io.Closeables; import fr.ifremer.adagio.core.service.technical.synchro.specific.ReferentialSynchroSpecificTableTask; import fr.ifremer.tutti.persistence.ProgressionModel; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,7 +58,7 @@ import java.util.ServiceLoader; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 1/14/14. @@ -140,12 +140,12 @@ try { ProgressionModel progressionModel = result.getProgressionModel(); - progressionModel.setMessage(_("tutti.persistence.synchronizeReferential.prepare.step1")); + progressionModel.setMessage(t("tutti.persistence.synchronizeReferential.prepare.step1")); // create local connection localConnection = createConnection(getLocalConnectionProperties()); - progressionModel.setMessage(_("tutti.persistence.synchronizeReferential.prepare.step2")); + progressionModel.setMessage(t("tutti.persistence.synchronizeReferential.prepare.step2")); // create remote Connection remoteConnection = createConnection(remoteConnectionProperties); @@ -157,7 +157,7 @@ ReferentialSynchroDatabaseMetadata remoteMeta = ReferentialSynchroDatabaseMetadata.loadDatabaseMetadata(remoteConnection, getLocalDialect()); - progressionModel.setMessage(_("tutti.persistence.synchronizeReferential.prepare.step3")); + progressionModel.setMessage(t("tutti.persistence.synchronizeReferential.prepare.step3")); // check schema try { @@ -176,7 +176,7 @@ String tableName = tuttiTable.name(); - progressionModel.setMessage(_("tutti.persistence.synchronizeReferential.prepare.step4", tableName)); + progressionModel.setMessage(t("tutti.persistence.synchronizeReferential.prepare.step4", tableName)); ReferentialSynchroTableMetadata table = remoteMeta.getTable(tableName); @@ -247,7 +247,7 @@ String tableName = tuttiTable.name(); - progressionModel.setMessage(_("tutti.persistence.synchronizeReferential.synchronize.step1", tableName)); + progressionModel.setMessage(t("tutti.persistence.synchronizeReferential.synchronize.step1", tableName)); ReferentialSynchroTableMetadata table = dbMetas.getTable(tableName); @@ -282,7 +282,7 @@ releaseSynch(localConnection); } - progressionModel.setMessage(_("tutti.persistence.synchronizeReferential.synchronize.step2")); + progressionModel.setMessage(t("tutti.persistence.synchronizeReferential.synchronize.step2")); localConnection.commit(); @@ -389,7 +389,7 @@ String tableName = table.getName(); - result.getProgressionModel().setMessage(_("tutti.persistence.synchronizeReferential.synchronizeTable", tableName)); + result.getProgressionModel().setMessage(t("tutti.persistence.synchronizeReferential.synchronizeTable", tableName)); String tablePrefix = table.getTableLogPrefix(); @@ -439,8 +439,8 @@ dataToUpdate.close(); } finally { - Closeables.closeQuietly(localDao); - Closeables.closeQuietly(remoteDao); + IOUtils.closeQuietly(localDao); + IOUtils.closeQuietly(remoteDao); JdbcUtils.closeResultSet(dataToUpdate); } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,7 +47,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Overrides of the {@link TableMetadata} with some improvements: @@ -121,7 +121,7 @@ Preconditions.checkNotNull(pkNames); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.persistence.tableMetadata.instanciation.error", this), e); + throw new ApplicationTechnicalException(t("tutti.persistence.tableMetadata.instanciation.error", this), e); } this.pkIndexs = createPkIndex(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -59,7 +59,7 @@ import java.util.Properties; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 11/24/13. @@ -121,7 +121,7 @@ applicationConfig.parse(args); } catch (ArgumentsParserException e) { - throw new ApplicationTechnicalException(_("tutti.config.parse.error"), e); + throw new ApplicationTechnicalException(t("tutti.config.parse.error"), e); } //TODO Review this, this is very dirty to do this... @@ -151,25 +151,25 @@ public void initConfig(RessourceClassLoader resourceLoader) { File directory = getDbDirectory(); - ApplicationIOUtil.forceMkdir(directory, _("tutti.io.mkDir.error", directory)); + ApplicationIOUtil.forceMkdir(directory, t("tutti.io.mkDir.error", directory)); directory = getDbAttachmentDirectory(); - ApplicationIOUtil.forceMkdir(directory, _("tutti.io.mkDir.error", directory)); + ApplicationIOUtil.forceMkdir(directory, t("tutti.io.mkDir.error", directory)); directory = getProtocolDirectory(); - ApplicationIOUtil.forceMkdir(directory, _("tutti.io.mkDir.error", directory)); + ApplicationIOUtil.forceMkdir(directory, t("tutti.io.mkDir.error", directory)); directory = getDbBackupDirectory(); - ApplicationIOUtil.forceMkdir(directory, _("tutti.io.mkDir.error", directory)); + ApplicationIOUtil.forceMkdir(directory, t("tutti.io.mkDir.error", directory)); File dataDirectory = getDataDirectory(); - ApplicationIOUtil.forceMkdir(dataDirectory, _("tutti.io.mkDir.error", dataDirectory)); + ApplicationIOUtil.forceMkdir(dataDirectory, t("tutti.io.mkDir.error", dataDirectory)); File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { - ApplicationIOUtil.deleteDirectory(tmpDirectory, _("tutti.io.deleteTempDirectory.error", tmpDirectory)); + ApplicationIOUtil.deleteDirectory(tmpDirectory, t("tutti.io.deleteTempDirectory.error", tmpDirectory)); } - ApplicationIOUtil.forceMkdir(tmpDirectory, _("tutti.io.mkDir.error", tmpDirectory)); + ApplicationIOUtil.forceMkdir(tmpDirectory, t("tutti.io.mkDir.error", tmpDirectory)); - ApplicationIOUtil.forceMkdir(getReportBackupDirectory(), _("tutti.io.mkDir.error", getReportBackupDirectory())); + ApplicationIOUtil.forceMkdir(getReportBackupDirectory(), t("tutti.io.mkDir.error", getReportBackupDirectory())); // add a predicate to search the configuration file from his directory instead of the class-path resourceLoader.addSearchInDirectoriesPredicate(new Predicate<String>() { @@ -205,22 +205,22 @@ File dataDirectory = getDataDirectory(); ApplicationIOUtil.forceMkdir( dataDirectory, - _("tutti.io.mkDir.error", dataDirectory)); + t("tutti.io.mkDir.error", dataDirectory)); File tmpDirectory = getTmpDirectory(); if (tmpDirectory.exists()) { ApplicationIOUtil.deleteDirectory( tmpDirectory, - _("tutti.io.deleteTempDirectory.error", tmpDirectory)); + t("tutti.io.deleteTempDirectory.error", tmpDirectory)); } ApplicationIOUtil.forceMkdir( tmpDirectory, - _("tutti.io.mkDir.error", tmpDirectory)); + t("tutti.io.mkDir.error", tmpDirectory)); ApplicationIOUtil.forceMkdir( getReportBackupDirectory(), - _("tutti.io.mkDir.error", getReportBackupDirectory())); + t("tutti.io.mkDir.error", getReportBackupDirectory())); } public void generateExternalDbFiles(boolean force) { @@ -231,14 +231,14 @@ generateDbConfiguration(true); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.persistence.config.generateFile.error")); + throw new ApplicationTechnicalException(t("tutti.persistence.config.generateFile.error")); } try { generateDbEnumerationConfiguration(force); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.persistence.config.generateEnumFile.error")); + throw new ApplicationTechnicalException(t("tutti.persistence.config.generateEnumFile.error")); } } @@ -279,7 +279,7 @@ applicationConfig.save(file, false, optionKeyToNotSave); } catch (IOException e) { throw new ApplicationTechnicalException( - _("tutti.config.save.error", file), e); + t("tutti.config.save.error", file), e); } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.net.URL; import java.util.Locale; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * All application configuration options. @@ -56,160 +56,160 @@ BASEDIR( "tutti.basedir", - n_("tutti.config.option.basedir.description"), + n("tutti.config.option.basedir.description"), "${user.home}/.tutti", File.class), DATA_DIRECTORY( "tutti.data.directory", - n_("tutti.config.option.data.directory.description"), + n("tutti.config.option.data.directory.description"), "${tutti.basedir}/data", File.class), I18N_DIRECTORY( "tutti.i18n.directory", - n_("tutti.config.option.i18n.directory.description"), + n("tutti.config.option.i18n.directory.description"), "${tutti.basedir}/i18n", File.class), HELP_DIRECTORY( "tutti.help.directory", - n_("tutti.config.option.help.directory.description"), + n("tutti.config.option.help.directory.description"), "${tutti.basedir}/help", File.class), TMP_DIRECTORY( "tutti.tmp.directory", - n_("tutti.config.option.tmp.directory.description"), + n("tutti.config.option.tmp.directory.description"), "${tutti.data.directory}/temp", File.class), REPORT_HOME_DIRECTORY( "tutti.report.home.directory", - n_("tutti.config.option.report.home.directory.description"), + n("tutti.config.option.report.home.directory.description"), "${tutti.basedir}/report", File.class), REPORT_DIRECTORY( "tutti.report.directory", - n_("tutti.config.option.report.directory.description"), + n("tutti.config.option.report.directory.description"), "${tutti.report.home.directory}/allegro-tutti/reports", File.class), REPORT_LOG_DIRECTORY( "tutti.report.log.directory", - n_("tutti.config.option.report.log.directory.description"), + n("tutti.config.option.report.log.directory.description"), "${tutti.data.directory}/reportlogs", File.class), DB_DIRECTORY( "tutti.persistence.db.directory", - n_("tutti.config.option.persistence.db.directory.description"), + n("tutti.config.option.persistence.db.directory.description"), "${tutti.data.directory}/db", File.class), DB_ATTACHMENT_DIRECTORY( "tutti.persistence.db.attachment.directory", - n_("tutti.config.option.persistence.db.attachment.directory.description"), + n("tutti.config.option.persistence.db.attachment.directory.description"), "${tutti.data.directory}/meas_files", File.class), DB_CACHE_DIRECTORY( "tutti.persistence.db.cache.directory", - n_("tutti.config.option.persistence.db.cache.directory.description"), + n("tutti.config.option.persistence.db.cache.directory.description"), "${tutti.data.directory}/dbcache", File.class), DB_PROTOCOL_DIRECTORY( "tutti.persistence.db.protocol.directory", - n_("tutti.config.option.persistence.db.protocol.directory.description"), + n("tutti.config.option.persistence.db.protocol.directory.description"), "${tutti.data.directory}/protocol", File.class), DB_CONFIGURATION_PATH( "tutti.persistence.db.configurationPath", - n_("tutti.config.option.persistence.db.configurationPath.description"), + n("tutti.config.option.persistence.db.configurationPath.description"), "${tutti.data.directory}/dbconf/conf.properties", File.class), DB_ENUMERATION_PATH( "tutti.persistence.db.enumerationPath", - n_("tutti.config.option.persistence.db.enumerationPath.description"), + n("tutti.config.option.persistence.db.enumerationPath.description"), "${tutti.data.directory}/dbconf/enumerations-v3.properties", File.class), DB_NAME( "tutti.persistence.db.name", - n_("tutti.config.option.persistence.db.name.description"), + n("tutti.config.option.persistence.db.name.description"), "allegro", String.class), DB_SANITY( "tutti.persistence.db.sanity", - n_("tutti.persistence.db.sanity.description"), + n("tutti.persistence.db.sanity.description"), "false", Boolean.class), JDBC_USERNAME( "tutti.persistence.jdbc.username", - n_("tutti.config.option.persistence.jdbc.username.description"), + n("tutti.config.option.persistence.jdbc.username.description"), "sa", String.class), JDBC_PASSWORD( "tutti.persistence.jdbc.password", - n_("tutti.config.option.persistence.jdbc.password.description"), + n("tutti.config.option.persistence.jdbc.password.description"), "", String.class), JDBC_URL( "tutti.persistence.jdbc.url", - n_("tutti.config.option.persistence.jdbc.url.description"), + n("tutti.config.option.persistence.jdbc.url.description"), "jdbc:hsqldb:file:${tutti.persistence.db.directory}/${tutti.persistence.db.name}", String.class), JDBC_DRIVER( "tutti.persistence.jdbc.driver", - n_("tutti.config.option.persistence.jdbc.driver.description"), + n("tutti.config.option.persistence.jdbc.driver.description"), jdbcDriver.class.getName(), Class.class), HIBERNATE_DIALECT( "tutti.persistence.hibernate.dialect", - n_("tutti.config.option.persistence.hibernate.dialect.description"), + n("tutti.config.option.persistence.hibernate.dialect.description"), HSQLDialect.class.getName(), Class.class), LAUNCH_MODE( "tutti.launch.mode", - n_("tutti.config.option.launch.mode.description"), + n("tutti.config.option.launch.mode.description"), null, String.class), START_ACTION_FILE( "tutti.startActionFile", - n_("tutti.config.option.startActionFile.description"), + n("tutti.config.option.startActionFile.description"), "${tutti.basedir}/tutti-start-action", File.class), VERSION( "tutti.version", - n_("tutti.config.option.version.description"), + n("tutti.config.option.version.description"), "", Version.class), SITE_URL( "tutti.site.url", - n_("tutti.config.option.site.url.description"), + n("tutti.config.option.site.url.description"), "http://maven-site.forge.codelutin.com/tutti", URL.class), ORGANIZATION_NAME( "tutti.organizationName", - n_("tutti.config.option.organizationName.description"), + n("tutti.config.option.organizationName.description"), "", String.class), INCEPTION_YEAR( "tutti.inceptionYear", - n_("tutti.config.option.inceptionYear.description"), + n("tutti.config.option.inceptionYear.description"), "2012", Integer.class), @@ -219,35 +219,35 @@ DB_BACKUP_DIRECTORY( "tutti.persistence.db.backup.directory", - n_("tutti.config.option.persistence.db.backup.directory.description"), + n("tutti.config.option.persistence.db.backup.directory.description"), "${tutti.data.directory}/dbbackup", File.class, false), HIBERNATE_SHOW_SQL( "tutti.persistence.hibernate.showSql", - n_("tutti.config.option.persistence.hibernate.showSql.description"), + n("tutti.config.option.persistence.hibernate.showSql.description"), Boolean.FALSE.toString(), boolean.class, false), HIBERNATE_USE_SQL_COMMENT( "tutti.persistence.hibernate.useSqlComment", - n_("tutti.config.option.persistence.hibernate.useSqlComment.description"), + n("tutti.config.option.persistence.hibernate.useSqlComment.description"), Boolean.FALSE.toString(), boolean.class, false), HIBERNATE_FORMAT_SQL( "tutti.persistence.hibernate.formatSql", - n_("tutti.config.option.persistence.hibernate.formatSql.description"), + n("tutti.config.option.persistence.hibernate.formatSql.description"), Boolean.FALSE.toString(), boolean.class, false), SAMPLE_CATEGORY_MODEL( "tutti.persistence.SampleCategoryModel", - n_("tutti.config.option.persistence.SampleCategoryModel.description"), + n("tutti.config.option.persistence.SampleCategoryModel.description"), "1428,V/HV|198,Class Tri.|196,Sexe|174,Maturité|1430,Age", SampleCategoryModel.class, false @@ -255,70 +255,70 @@ REPORT_BACKUP_DIRECTORY( "tutti.report.backup.directory", - n_("tutti.config.option.report.backup.directory.description"), + n("tutti.config.option.report.backup.directory.description"), "${tutti.data.directory}/reportbackup", File.class, false), CSV_SEPARATOR( "tutti.csv.separator", - n_("tutti.config.option.csv.separator.description"), + n("tutti.config.option.csv.separator.description"), ";", char.class, false), EXPORT_COUNTRY_ID( "tutti.export.countryId", - n_("tutti.config.option.export.countryId.description"), + n("tutti.config.option.export.countryId.description"), "12", String.class, false), SAMPLING_CATEGORY_ORDER_IDS( "tutti.samplingCategoryOrderIds", - n_("tutti.config.option.samplingCategoryOrderIds.description"), + n("tutti.config.option.samplingCategoryOrderIds.description"), "198,196,174,1430", Integer[].class, false), WEIGHT_UNIT_SPECIES( "tutti.weight.unit.species", - n_("tutti.config.option.weight.unit.species.description"), + n("tutti.config.option.weight.unit.species.description"), WeightUnit.KG.name(), WeightUnit.class, false), WEIGHT_UNIT_BENTHOS( "tutti.weight.unit.benthos", - n_("tutti.config.option.weight.unit.benthos.description"), + n("tutti.config.option.weight.unit.benthos.description"), WeightUnit.G.name(), WeightUnit.class, false), WEIGHT_UNIT_MARINE_LITTER( "tutti.weight.unit.marineLitter", - n_("tutti.config.option.weight.unit.marineLitter.description"), + n("tutti.config.option.weight.unit.marineLitter.description"), WeightUnit.KG.name(), WeightUnit.class, false), WEIGHT_UNIT_INDIVIDUAL_OBSERVATION( "tutti.weight.unit.individualObservation", - n_("tutti.config.option.weight.unit.individualObservation.description"), + n("tutti.config.option.weight.unit.individualObservation.description"), WeightUnit.G.name(), WeightUnit.class, false), WEIGHT_UNIT_ACCIDENTAL_CATCH( "tutti.weight.unit.accidentalCatch", - n_("tutti.config.option.weight.unit.accidentalCatch.description"), + n("tutti.config.option.weight.unit.accidentalCatch.description"), WeightUnit.KG.name(), WeightUnit.class, false), I18N_LOCALE( "tutti.i18n.locale", - n_("tutti.config.option.i18n.locale.description"), + n("tutti.config.option.i18n.locale.description"), Locale.FRANCE.getCountry(), Locale.class, false @@ -326,7 +326,7 @@ UPDATE_APPLICATION_URL( "tutti.update.application.url", - n_("tutti.config.option.update.application.url.description"), + n("tutti.config.option.update.application.url.description"), "http://appup.forge.codelutin.com/tutti/tutti-application.properties", String.class, false @@ -334,7 +334,7 @@ UPDATE_DATA_URL( "tutti.update.data.url", - n_("tutti.config.option.update.data.url.description"), + n("tutti.config.option.update.data.url.description"), "https://www.ifremer.fr/sih-resource-private/tutti/tutti-data.properties", String.class, false @@ -342,7 +342,7 @@ UI_CONFIG_FILE( "tutti.ui.config.file", - n_("tutti.config.option.ui.config.file.description"), + n("tutti.config.option.ui.config.file.description"), "${tutti.data.directory}/tuttiUI.xml", File.class, false @@ -350,7 +350,7 @@ TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE( "tutti.db.weights.rate.difference.totalAndSorted", - n_("tutti.config.option.weights.rate.difference.totalAndSorted.description"), + n("tutti.config.option.weights.rate.difference.totalAndSorted.description"), "1.0", Float.class, false @@ -358,7 +358,7 @@ TREMIE_CAROUSSEL_VESSEL_ID( "tutti.tremieCarousselVessel", - n_("tutti.config.option.tremieCarousselVessel.description"), + n("tutti.config.option.tremieCarousselVessel.description"), "", String.class, false @@ -366,7 +366,7 @@ PROGRAM_ID( "tutti.programId", - n_("tutti.config.option.programId.description"), + n("tutti.config.option.programId.description"), null, String.class, false @@ -374,7 +374,7 @@ CRUISE_ID( "tutti.cruiseId", - n_("tutti.config.option.cruiseId.description"), + n("tutti.config.option.cruiseId.description"), null, String.class, false @@ -382,7 +382,7 @@ PROTOCOL_ID( "tutti.protocolId", - n_("tutti.config.option.protocolId.description"), + n("tutti.config.option.protocolId.description"), null, String.class, false @@ -390,7 +390,7 @@ AUTO_POPUP_NUMBER_EDITOR( "tutti.ui.autoPopupNumberEditor", - n_("tutti.config.option.ui.autoPopupNumberEditor.description"), + n("tutti.config.option.ui.autoPopupNumberEditor.description"), String.valueOf(false), Boolean.class, false @@ -398,7 +398,7 @@ SHOW_NUMBER_EDITOR_BUTTON( "tutti.ui.showNumberEditorButton", - n_("tutti.config.option.ui.showNumberEditorButton.description"), + n("tutti.config.option.ui.showNumberEditorButton.description"), String.valueOf(true), Boolean.class, false @@ -406,7 +406,7 @@ COLOR_ROW_READ_ONLY( "tutti.ui.color.rowReadOnly", - n_("tutti.config.option.ui.color.rowReadOnly.description"), + n("tutti.config.option.ui.color.rowReadOnly.description"), new Color(192, 192, 192).toString(), Color.class, false @@ -414,7 +414,7 @@ COLOR_ROW_INVALID( "tutti.ui.color.rowInvalid", - n_("tutti.config.option.ui.color.rowInvalid.description"), + n("tutti.config.option.ui.color.rowInvalid.description"), new Color(255, 204, 153).toString(), Color.class, false @@ -422,7 +422,7 @@ COLOR_CELL_WITH_VALUE( "tutti.ui.color.cellWithValue", - n_("tutti.config.option.ui.color.cellWithValue.description"), + n("tutti.config.option.ui.color.cellWithValue.description"), new Color(128, 255, 128).toString(), Color.class, false @@ -430,7 +430,7 @@ COLOR_ROW_TO_CONFIRM( "tutti.ui.color.rowToConfirm", - n_("tutti.config.option.ui.color.rowToConfirm.description"), + n("tutti.config.option.ui.color.rowToConfirm.description"), Color.ORANGE.toString(), Color.class, false @@ -438,14 +438,14 @@ COLOR_ALTERNATE_ROW( "tutti.ui.color.alternateRow", - n_("tutti.config.option.ui.color.alternateRow.description"), + n("tutti.config.option.ui.color.alternateRow.description"), new Color(217, 217, 217).toString(), Color.class, false ), COLOR_SELECTED_ROW( "tutti.ui.color.selectedRow", - n_("tutti.config.option.ui.color.selectedRow.description"), + n("tutti.config.option.ui.color.selectedRow.description"), new Color(57, 105, 138).toString(), Color.class, false @@ -453,7 +453,7 @@ COLOR_BLOCKING_LAYER( "tutti.ui.color.blockingLayer", - n_("tutti.config.option.ui.color.blockingLayer.description"), + n("tutti.config.option.ui.color.blockingLayer.description"), new Color(200, 200, 200).toString(), Color.class, false @@ -461,7 +461,7 @@ COLOR_COMPUTED_WEIGHTS( "tutti.ui.color.computedWeights", - n_("tutti.config.option.ui.color.computedWeights.description"), + n("tutti.config.option.ui.color.computedWeights.description"), Color.BLUE.toString(), Color.class, false @@ -469,7 +469,7 @@ SHORTCUT_CLOSE_POPUP( "tutti.ui.shortcut.closePopup", - n_("tutti.config.option.ui.shortcut.closePopup.description"), + n("tutti.config.option.ui.shortcut.closePopup.description"), "alt pressed F", KeyStroke.class, false @@ -477,7 +477,7 @@ COORDINATE_EDITOR_TYPE( "tutti.ui.coordinateEditorType", - n_("tutti.config.option.ui.coordinateEditorType.description"), + n("tutti.config.option.ui.coordinateEditorType.description"), CoordinateEditorType.DD.toString(), CoordinateEditorType.class, false @@ -485,7 +485,7 @@ DATE_FORMAT( "tutti.ui.dateFormat", - n_("tutti.config.option.ui.dateFormat.description"), + n("tutti.config.option.ui.dateFormat.description"), "dd/MM/yyyy", String.class, false @@ -493,7 +493,7 @@ ADMIN_PASSWORD( "tutti.admin.password", - n_("tutti.config.option.ui.adminPassword.description"), + n("tutti.config.option.ui.adminPassword.description"), // "ifremer" by default "ef399a6e6ec62c6e142440241a5b98f8", String.class, @@ -502,14 +502,14 @@ MAX_INDIVIDUAL_OBSERVATION_ROW_TO_CREATE( "tutti.ui.max.individualObservationRowsToCreate", - n_("tutti.config.option.ui.individualObservationRowsToCreate.description"), + n("tutti.config.option.ui.individualObservationRowsToCreate.description"), "10", Integer.class, false ), FULL_BLUETOOTH_SCAN( "tutti.ichtyometer.fullBluetoothScan", - n_("tutti.ichtyometer.fullBluetoothScan.description"), + n("tutti.ichtyometer.fullBluetoothScan.description"), "false", Boolean.class, false Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationProvider.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -30,7 +30,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Tutti config provider (for site generation). @@ -48,7 +48,7 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "tutti.config"); + return l(locale, "tutti.config"); } @Override Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import java.util.Enumeration; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A class loader that search first in a given directory before in parent @@ -84,7 +84,7 @@ this.directories.add(directory); // force to create directory - ApplicationIOUtil.forceMkdir(directory, _("tutti.io.mkDir.error", directory)); + ApplicationIOUtil.forceMkdir(directory, t("tutti.io.mkDir.error", directory)); } } loader = null; @@ -182,7 +182,7 @@ directories.toArray(new File[directories.size()])); loader = URLClassLoader.newInstance(urls, null); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.persistence.loader.error", directories), e); + throw new ApplicationTechnicalException(t("tutti.persistence.loader.error", directories), e); } } return loader; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To convert to a {@link SampleCategoryModel} from a string representation. @@ -81,7 +81,7 @@ } } throw new ConversionException( - _("tutti.persistence.error.no.convertor", aClass.getName(), value)); + t("tutti.persistence.error.no.convertor", aClass.getName(), value)); } protected boolean isEnabled(Class<?> aClass) { 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -57,7 +57,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Helper class around {@link TuttiProtocol}. @@ -82,7 +82,7 @@ writer.close(); fileWriter.close(); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.persistence.protocol.fromFile.error", id, file), e);//"Could not transform protocol " + to file + throw new ApplicationTechnicalException(t("tutti.persistence.protocol.fromFile.error", id, file), e);//"Could not transform protocol " + to file } finally { IOUtils.closeQuietly(fileWriter); } @@ -148,7 +148,7 @@ fileReader.close(); return result; } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.persistence.protocol.fromFile.error", file), e); + throw new ApplicationTechnicalException(t("tutti.persistence.protocol.fromFile.error", file), e); } finally { IOUtils.closeQuietly(fileReader); } @@ -221,11 +221,11 @@ if (log.isWarnEnabled()) { log.warn("Could not find caracteristic with id: " + id); } - caracteristicStr = _("tutti.persistence.error.caracteristic.notFound"); + caracteristicStr = t("tutti.persistence.error.caracteristic.notFound"); } badCategoriesStr.add("<li>" + id + " : " + caracteristicStr + "</li>"); } - String message = _("tutti.persistence.error.protocol.categories.not.compatible", Joiner.on("").join(badCategoriesStr)); + String message = t("tutti.persistence.error.protocol.categories.not.compatible", Joiner.on("").join(badCategoriesStr)); return message; } @@ -235,7 +235,7 @@ for (Map.Entry<Integer, String> id : badSpecies.entrySet()) { badCategoriesStr.add("<li>" + id.getKey() + " : " + (id.getValue() == null ? "" : id.getValue()) + "</li>"); } - String message = _("tutti.persistence.error.protocol.species.not.found", Joiner.on("").join(badCategoriesStr)); + String message = t("tutti.persistence.error.protocol.species.not.found", Joiner.on("").join(badCategoriesStr)); return message; } @@ -245,7 +245,7 @@ for (Map.Entry<Integer, String> id : badSpecies.entrySet()) { badCategoriesStr.add("<li>" + id.getKey() + " : " + (id.getValue() == null ? "" : id.getValue()) + "</li>"); } - String message = _("tutti.persistence.error.protocol.benthos.not.found", Joiner.on("").join(badCategoriesStr)); + String message = t("tutti.persistence.error.protocol.benthos.not.found", Joiner.on("").join(badCategoriesStr)); return message; } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -50,7 +50,7 @@ import java.util.Iterator; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Default implementation of the service {@link AttachmentPersistenceService}. @@ -185,7 +185,7 @@ ApplicationIOUtil.copyFile( file, targetFile, - _("tutti.persistence.attachment.copyFile.error", file, targetFile)); + t("tutti.persistence.attachment.copyFile.error", file, targetFile)); return attachment; } @@ -286,7 +286,7 @@ measurementFileDao.remove(target.getIdAsInt()); File file = getFile(target); - ApplicationIOUtil.deleteFile(file, _("tutti.persistence.attachment.deleteFile.error", file)); + ApplicationIOUtil.deleteFile(file, t("tutti.persistence.attachment.deleteFile.error", file)); } } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -60,7 +60,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Default implementation of {@link BenthosBatchPersistenceService}. @@ -121,7 +121,7 @@ Preconditions.checkNotNull(referenceTaxon, "Can't have a rootBenthosBatch with a null taxon, but was for " + batch.getId()); Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(_("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); } BenthosBatch target = BenthosBatchs.newBenthosBatch(); target.setSpecies(species); @@ -147,7 +147,7 @@ Preconditions.checkNotNull(referenceTaxon, "Can't have a rootSpeciesBatch with a null taxon, but was for " + source.getId()); Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(_("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); } BenthosBatch target = BenthosBatchs.newBenthosBatch(); 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -96,7 +96,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -690,7 +690,7 @@ boolean gearRemoved = isOperationUseGears(target.getId(), gears); if (gearRemoved) { - throw new ApplicationBusinessException(_("tutti.persistence.cruise.gearUsedInOperations.error")); + throw new ApplicationBusinessException(t("tutti.persistence.cruise.gearUsedInOperations.error")); } for (GearPhysicalFeatures guf : notChangedGearPhysicalFeatures) { 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -44,7 +44,7 @@ import java.util.List; import java.util.UUID; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -183,7 +183,7 @@ if (file.exists()) { ApplicationIOUtil.deleteFile( file, - _("tutti.persistence.protocol.delete.error", protocolId, file)); + t("tutti.persistence.protocol.delete.error", protocolId, file)); } } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -60,7 +60,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Default implementation of {@link SpeciesBatchPersistenceService}. @@ -128,7 +128,7 @@ } Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(_("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); } SpeciesBatch target = SpeciesBatchs.newSpeciesBatch(); target.setSpecies(species); @@ -157,7 +157,7 @@ } Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(_("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); } SpeciesBatch target = SpeciesBatchs.newSpeciesBatch(); target.setSpecies(species); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/BatchPersistenceHelper.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -69,7 +69,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Helper around batches. @@ -134,7 +134,7 @@ } if (!errorsStr.isEmpty()) { String join = Joiner.on("<br/>").join(errorsStr); - throw new InvalidBatchModelException(_("tutti.persistence.batch.validation.bad.sample.categories", join)); + throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.bad.sample.categories", join)); } } @@ -151,7 +151,7 @@ } if (!errorsStr.isEmpty()) { String join = Joiner.on("<br/>").join(errorsStr); - throw new InvalidBatchModelException(_("tutti.persistence.batch.validation.bad.sample.categories", join)); + throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.bad.sample.categories", join)); } } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/batch/ScientificCruiseCatchBatchValidator.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,8 +47,8 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; @Component(value = "scientificCruiseCatchBatchValidator") public class ScientificCruiseCatchBatchValidator implements TuttiCatchBatchValidator { @@ -106,7 +106,7 @@ sampleCategoryModel, errors, speciesBatch, - n_("tutti.persistence.batch.validation.invalid.species.sampleCategoryId")); + n("tutti.persistence.batch.validation.invalid.species.sampleCategoryId")); if (errors.isEmpty()) { @@ -118,7 +118,7 @@ errors, speciesBatch, null, - n_("tutti.persistence.batch.validation.invalid.species.sampleCategoryId.order")); + n("tutti.persistence.batch.validation.invalid.species.sampleCategoryId.order")); } } return errors; @@ -140,7 +140,7 @@ sampleCategoryModel, errors, benthosBatch, - n_("tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId")); + n("tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId")); if (errors.isEmpty()) { @@ -151,7 +151,7 @@ errors, benthosBatch, null, - n_("tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId.order")); + n("tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId.order")); } } return errors; @@ -176,7 +176,7 @@ } if (vracBatch == null) { - addError(errors, n_("tutti.persistence.batch.validation.vracNotFound")); + addError(errors, n("tutti.persistence.batch.validation.vracNotFound")); } else { // Vrac > Species SortingBatch speciesBatch = batchHelper.getSortingBatch( @@ -195,9 +195,9 @@ if (speciesBatch == null) { if (benthosBatch == null) { - addError(errors, n_("tutti.persistence.batch.validation.vracSpeciesNotFound")); + addError(errors, n("tutti.persistence.batch.validation.vracSpeciesNotFound")); } else { - addWarning(errors, n_("tutti.persistence.batch.validation.vracSpeciesNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracSpeciesNotFound")); } } else { // Vrac > Species > Alive not itemized @@ -207,7 +207,7 @@ enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_NOT_ITEMIZED); if (livingNotItemizedBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.vracSpeciesLifeNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracSpeciesLifeNotFound")); } // Vrac > Species > Inert @@ -217,7 +217,7 @@ enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_INERT); if (inertBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.vracSpeciesInertNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracSpeciesInertNotFound")); } // Vrac > Species > Alive itemized @@ -227,7 +227,7 @@ enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_ITEMIZED); if (aliveItemizedBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.vracSpeciesAliveItemizedNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracSpeciesAliveItemizedNotFound")); } // TODO verifier que les espèces en haut de grappe ont bien la catégorie voulue (sorted-unsorted) @@ -235,9 +235,9 @@ if (benthosBatch == null) { if (speciesBatch == null) { - addError(errors, n_("tutti.persistence.batch.validation.vracBenthosNotFound")); + addError(errors, n("tutti.persistence.batch.validation.vracBenthosNotFound")); } else { - addWarning(errors, n_("tutti.persistence.batch.validation.vracBenthosNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracBenthosNotFound")); } } else { @@ -248,7 +248,7 @@ enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_NOT_ITEMIZED); if (livingNotItemizedBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.vracBenthosLifeNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracBenthosLifeNotFound")); } // Vrac > Benthos > Inert @@ -258,7 +258,7 @@ enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_INERT); if (inertBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.vracBenthosInertNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracBenthosInertNotFound")); } // Vrac > Benthos > Alive itemized @@ -268,7 +268,7 @@ enumeration.PMFM_ID_SORTING_TYPE_2, enumeration.QUALITATIVE_ID_SORTING_TYPE_2_ALIVE_ITEMIZED); if (aliveItemizedBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound")); } } } @@ -280,7 +280,7 @@ enumeration.PMFM_ID_SORTED_UNSORTED, enumeration.QUALITATIVE_HORS_VRAC_ID); if (horsVracBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.horsVracNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.horsVracNotFound")); } else { // Hors Vrac > Species SortingBatch speciesBatch = batchHelper.getSortingBatch( @@ -289,7 +289,7 @@ enumeration.PMFM_ID_SORTING_TYPE, enumeration.QUALITATIVE_ID_SORTING_TYPE_SPECIES); if (speciesBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.horsVracSpeciesNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.horsVracSpeciesNotFound")); } // Hors Vrac > Benthos @@ -299,7 +299,7 @@ enumeration.PMFM_ID_SORTING_TYPE, enumeration.QUALITATIVE_ID_SORTING_TYPE_BENTHOS); if (benthosBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.horsVracBenthosNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.horsVracBenthosNotFound")); } // Hors Vrac > Marine Litter SortingBatch marineLitterBatch = batchHelper.getSortingBatch( @@ -309,7 +309,7 @@ enumeration.QUALITATIVE_ID_SORTING_TYPE_MARINE_LITTER); if (marineLitterBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.horsVracMarineLitterNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.horsVracMarineLitterNotFound")); } } @@ -320,7 +320,7 @@ enumeration.PMFM_ID_SORTED_UNSORTED, enumeration.QUALITATIVE_UNSORTED_ID); if (unsortedBatch == null) { - addWarning(errors, n_("tutti.persistence.batch.validation.unsortedNotFound")); + addWarning(errors, n("tutti.persistence.batch.validation.unsortedNotFound")); } } @@ -407,7 +407,7 @@ String messageKey) { CatchBatchValidationError error = new CatchBatchValidationError( messageKey, - _(messageKey), + t(messageKey), CatchBatchValidationError.GRAVITY_ERROR); errors.add(error); } @@ -416,7 +416,7 @@ String messageKey, Object... params) { CatchBatchValidationError error = new CatchBatchValidationError( messageKey, - _(messageKey, params), + t(messageKey, params), CatchBatchValidationError.GRAVITY_ERROR); errors.add(error); } @@ -425,7 +425,7 @@ String messageKey) { CatchBatchValidationError error = new CatchBatchValidationError( messageKey, - _(messageKey), + t(messageKey), CatchBatchValidationError.GRAVITY_WARNING); errors.add(error); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -1,7 +1,7 @@ package fr.ifremer.tutti.type; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Different types of weight unit. @@ -13,7 +13,7 @@ */ public enum WeightUnit { - G(n_("application.common.unit.g"), n_("application.common.unit.short.g"), 1, "\\d{0,6}(\\.\\d{0,1})?") { + G(n("application.common.unit.g"), n("application.common.unit.short.g"), 1, "\\d{0,6}(\\.\\d{0,1})?") { @Override public Float fromEntity(Float weight) { return weight == null ? null : weight * 1000; @@ -24,7 +24,7 @@ return weight == null ? null : weight / 1000.0f; } }, - KG(n_("application.common.unit.kg"), n_("application.common.unit.short.kg"), 4, "\\d{0,6}(\\.\\d{0,4})?") { + KG(n("application.common.unit.kg"), n("application.common.unit.short.kg"), 4, "\\d{0,6}(\\.\\d{0,4})?") { @Override public Float fromEntity(Float weight) { return weight; @@ -52,11 +52,11 @@ } public String getLabel() { - return _(i18nKey); + return t(i18nKey); } public String getShortLabel() { - return _(i18nShortKey); + return t(i18nShortKey); } public int getNumberDigits() { @@ -88,7 +88,7 @@ } public String decorateTip(String tip) { - String unit = _("application.common.unit"); + String unit = t("application.common.unit"); return String.format("%s (%s %s)", tip, unit, getLabel()); } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -31,7 +31,7 @@ import java.io.File; import java.io.IOException; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Sammoa service support. @@ -75,7 +75,7 @@ } } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.service.compressZipFile.error", directory, zipFile), e); + throw new ApplicationTechnicalException(t("tutti.service.compressZipFile.error", directory, zipFile), e); } } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -46,8 +46,8 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Tutti decorator service. @@ -160,43 +160,43 @@ } static { - n_("tutti.property.protocol"); - n_("tutti.property.label"); - n_("tutti.property.name"); - n_("tutti.property.person"); - n_("tutti.property.firstName"); - n_("tutti.property.lastName"); - n_("tutti.property.department"); - n_("tutti.property.stationNumber"); - n_("tutti.property.fishingOperationNumber"); - n_("tutti.property.gearShootingStartDate"); - n_("tutti.property.internationalRegistrationCode"); - n_("tutti.property.date"); - n_("tutti.property.program"); - n_("tutti.property.parameterName"); - n_("tutti.property.matrixName"); - n_("tutti.property.fractionName"); - n_("tutti.property.methodName"); - n_("tutti.property.cruise"); - n_("tutti.property.fishingOperation"); - n_("tutti.property.fishingOperationLocation"); - n_("tutti.property.tuttiLocation"); - n_("tutti.property.zone"); - n_("tutti.property.vessel"); - n_("tutti.property.country"); - n_("tutti.property.gear"); - n_("tutti.property.user"); - n_("tutti.property.strata"); - n_("tutti.property.refTaxCode"); - n_("tutti.property.surveyCode"); - n_("tutti.property.rankOrder"); - n_("tutti.property.species"); - n_("tutti.property.genusSpecies"); - n_("tutti.property.sortedUnsortedCategory"); - n_("tutti.property.marineLitterCategory"); - n_("tutti.property.attachment"); - n_("tutti.property.multirigAggregation"); - n_("tutti.property.caracteristic"); + n("tutti.property.protocol"); + n("tutti.property.label"); + n("tutti.property.name"); + n("tutti.property.person"); + n("tutti.property.firstName"); + n("tutti.property.lastName"); + n("tutti.property.department"); + n("tutti.property.stationNumber"); + n("tutti.property.fishingOperationNumber"); + n("tutti.property.gearShootingStartDate"); + n("tutti.property.internationalRegistrationCode"); + n("tutti.property.date"); + n("tutti.property.program"); + n("tutti.property.parameterName"); + n("tutti.property.matrixName"); + n("tutti.property.fractionName"); + n("tutti.property.methodName"); + n("tutti.property.cruise"); + n("tutti.property.fishingOperation"); + n("tutti.property.fishingOperationLocation"); + n("tutti.property.tuttiLocation"); + n("tutti.property.zone"); + n("tutti.property.vessel"); + n("tutti.property.country"); + n("tutti.property.gear"); + n("tutti.property.user"); + n("tutti.property.strata"); + n("tutti.property.refTaxCode"); + n("tutti.property.surveyCode"); + n("tutti.property.rankOrder"); + n("tutti.property.species"); + n("tutti.property.genusSpecies"); + n("tutti.property.sortedUnsortedCategory"); + n("tutti.property.marineLitterCategory"); + n("tutti.property.attachment"); + n("tutti.property.multirigAggregation"); + n("tutti.property.caracteristic"); } public static class SpeciesDecorator extends TuttiDecorator<Species> implements Cloneable { @@ -211,7 +211,7 @@ protected Object onNullValue(Species bean, String token) { Object result = null; if (Species.PROPERTY_REF_TAX_CODE.equals(token)) { - result = _("tutti.propety.no.species.speciesCode"); + result = t("tutti.propety.no.species.speciesCode"); } return result; } @@ -258,7 +258,7 @@ protected Object onNullValue(Species bean, String token) { Object result; if (Species.PROPERTY_SURVEY_CODE.equals(token)) { - result = _("tutti.propety.no.species.speciesCode"); + result = t("tutti.propety.no.species.speciesCode"); } else { result = super.onNullValue(bean, token); @@ -288,7 +288,7 @@ protected Object onNullValue(Program bean, String token) { Object result = null; if (Program.PROPERTY_ZONE.equals(token)) { - result = _("tutti.propety.no.zone"); + result = t("tutti.propety.no.zone"); } return result; } @@ -309,7 +309,7 @@ Object result = super.getValue(bean, token); if (Vessel.PROPERTY_INTERNATIONAL_REGISTRATION_CODE.equals(token) && result == null) { // use national registration code - result = _("tutti.propety.vessel.nation.registrationCode", bean.getRegistrationCode()); + result = t("tutti.propety.vessel.nation.registrationCode", bean.getRegistrationCode()); } return result; } @@ -318,7 +318,7 @@ protected Object onNullValue(Vessel bean, String token) { Object result = null; if (Vessel.PROPERTY_NAME.equals(token)) { - result = _("tutti.propety.no.vessel.name"); + result = t("tutti.propety.no.vessel.name"); } return result; } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -88,7 +88,7 @@ import java.util.Map; import java.util.concurrent.Callable; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Persistence service. @@ -249,7 +249,7 @@ try { ApplicationIOUtil.forceMkdir(structureDirectory, - _("tutti.io.mkDir.error", structureDirectory)); + t("tutti.io.mkDir.error", structureDirectory)); if (log.isInfoEnabled()) { log.info("Export directory: " + structureDirectory); @@ -257,22 +257,22 @@ ApplicationIOUtil.copyDirectory(config.getDbDirectory(), new File(structureDirectory, "db"), - _("tutti.service.persistence.copyDirectory.db.error")); + t("tutti.service.persistence.copyDirectory.db.error")); ApplicationIOUtil.copyDirectory(config.getDbAttachmentDirectory(), new File(structureDirectory, "meas_files"), - _("tutti.service.persistence.copyDirectory.attachment.error")); + t("tutti.service.persistence.copyDirectory.attachment.error")); // create zip ApplicationIOUtil.zip(structureDirectory, file, - _("tutti.service.persistence.exportDb.zip.error", file)); + t("tutti.service.persistence.exportDb.zip.error", file)); } finally { // delete temp files ApplicationIOUtil.forceDeleteOnExit( structureDirectory, - _("tutti.service.persistence.exportDb.deleteTempDir.error", structureDirectory)); + t("tutti.service.persistence.exportDb.deleteTempDir.error", structureDirectory)); } } @@ -284,24 +284,24 @@ public ImportStructureType checkImportStructure(File file) { if (!file.exists()) { - throw new ApplicationBusinessException(_("tutti.service.persistence.checkImportstructure.fileNotExist", file)); + throw new ApplicationBusinessException(t("tutti.service.persistence.checkImportstructure.fileNotExist", file)); } // check zip structure FileObject fileObject = ApplicationIOUtil.resolveFile( - "zip:" + file.getAbsolutePath(), _("tutti.service.persistence.getArchive.error", file)); + "zip:" + file.getAbsolutePath(), t("tutti.service.persistence.getArchive.error", file)); - FileObject[] children = ApplicationIOUtil.getChildren(fileObject, _("tutti.service.persistence.openArchive.error", file)); + FileObject[] children = ApplicationIOUtil.getChildren(fileObject, t("tutti.service.persistence.openArchive.error", file)); if (children.length != 1) { - throw new ApplicationBusinessException(_("tutti.service.persistence.checkImportstructure.tooManyChildren", file)); + throw new ApplicationBusinessException(t("tutti.service.persistence.checkImportstructure.tooManyChildren", file)); } ImportStructureType result; fileObject = children[0]; - children = ApplicationIOUtil.getChildren(fileObject, _("tutti.service.persistence.openArchive.error", file)); + children = ApplicationIOUtil.getChildren(fileObject, t("tutti.service.persistence.openArchive.error", file)); // try to detect a db directory boolean dbDirectoyDetected = false; @@ -329,7 +329,7 @@ for (FileObject child : children) { FileType type = ApplicationIOUtil.getType(child, "Could not get type of " + child); if (FileType.FOLDER.equals(type)) { - throw new ApplicationBusinessException(_("tutti.service.persistence.checkImportstructure.inlineForbidDirectory")); + throw new ApplicationBusinessException(t("tutti.service.persistence.checkImportstructure.inlineForbidDirectory")); } } } @@ -345,10 +345,10 @@ FileObject fileObject, String dir, boolean required) { - FileObject directory = ApplicationIOUtil.getChild(fileObject, dir, _("tutti.service.persistence.getChild.error", dir)); + FileObject directory = ApplicationIOUtil.getChild(fileObject, dir, t("tutti.service.persistence.getChild.error", dir)); if (directory == null) { - String message = _("tutti.service.persistence.checkArchiveDb.error", file, dir); + String message = t("tutti.service.persistence.checkArchiveDb.error", file, dir); if (required) { throw new ApplicationBusinessException(message); } @@ -383,11 +383,11 @@ } FileObject fileObject = ApplicationIOUtil.resolveFile( "zip:" + file.getAbsolutePath(), - _("tutti.service.persistence.getArchive.error", file)); + t("tutti.service.persistence.getArchive.error", file)); FileObject[] children = ApplicationIOUtil.getChildren( fileObject, - _("tutti.service.persistence.openArchive.error", file)); + t("tutti.service.persistence.openArchive.error", file)); fileObject = children[0]; @@ -401,7 +401,7 @@ target = new File(target, "db"); ApplicationIOUtil.forceMkdir( target, - _("tutti.service.persistence.createDbDirectory.error", file)); + t("tutti.service.persistence.createDbDirectory.error", file)); break; @@ -410,7 +410,7 @@ ApplicationIOUtil.explode(fileObject, target, new AllFileSelector(), - _("tutti.service.persistence.extractArchive.error", file)); + t("tutti.service.persistence.extractArchive.error", file)); } public boolean isDbLoaded() { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -64,7 +64,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Helper around csv import / export in Tutti. @@ -411,7 +411,7 @@ if (result == null) { // can not find entity this is a big problem for us... - throw new ImportRuntimeException(_("tutti.service.csv.parse.entityNotFound", entityType.getSimpleName(), propertyName, value)); + throw new ImportRuntimeException(t("tutti.service.csv.parse.entityNotFound", entityType.getSimpleName(), propertyName, value)); } } return result; @@ -523,7 +523,7 @@ if (existingValues.contains(value)) { // entity already defined - throw new ImportRuntimeException(_(errorMessage, propertyName, value)); + throw new ImportRuntimeException(t(errorMessage, propertyName, value)); } } return value; @@ -581,7 +581,7 @@ try { return (String) BeanUtilsBean.getInstance().getPropertyUtils().getNestedProperty(value, propertyName); } catch (Exception e) { - throw new ImportRuntimeException(_("tutti.service.cvs.format.error"), e);//"Could not format value" + throw new ImportRuntimeException(t("tutti.service.cvs.format.error"), e);//"Could not format value" } } } @@ -610,7 +610,7 @@ try { return decorator.toString(value); } catch (Exception e) { - throw new ImportRuntimeException(_("tutti.service.cvs.format.error", value), e); + throw new ImportRuntimeException(t("tutti.service.cvs.format.error", value), e); } } } @@ -656,7 +656,7 @@ result = Enum.valueOf(enumType, value); } if (mandatory && result == null) { - throw new NullPointerException(_("tutti.service.cvs.mandatory.value")); + throw new NullPointerException(t("tutti.service.cvs.mandatory.value")); } return result; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -45,7 +45,7 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Tutti application context. @@ -123,7 +123,7 @@ S s = (S) services.get(serviceType); return s; } catch (ExecutionException e) { - throw new ApplicationTechnicalException(_("tutti.service.context.serviceInstanciation.error", serviceType), e); + throw new ApplicationTechnicalException(t("tutti.service.context.serviceInstanciation.error", serviceType), e); } } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -62,7 +62,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Service to validate the operations of a cruise @@ -109,7 +109,7 @@ Decorator<FishingOperation> decorator = decoratorService.getDecoratorByType(FishingOperation.class); for (FishingOperation operation : operations) { operation = persistenceService.getFishingOperation(operation.getId()); - progressionModel.setMessage(_("tutti.service.validateCruise.operations.progress", decorator.toString(operation))); + progressionModel.setMessage(t("tutti.service.validateCruise.operations.progress", decorator.toString(operation))); NuitonValidatorResult validator = validationService.validateFishingOperation(operation, ValidationService.VALIDATION_CONTEXT_VALIDATE); checkOperation(operation, validator); @@ -158,7 +158,7 @@ FileUtils.writeLines(file, lines); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.service.validateCruise.exportResult.error", file)); + throw new ApplicationTechnicalException(t("tutti.service.validateCruise.exportResult.error", file)); } } @@ -174,7 +174,7 @@ FileUtils.writeLines(file, lines); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.service.validateCruise.exportResult.error", file)); + throw new ApplicationTechnicalException(t("tutti.service.validateCruise.exportResult.error", file)); } } @@ -203,7 +203,7 @@ " since no catchBatch associated."); } Map<String, List<String>> errorMap = Maps.newHashMap(); - errorMap.put("catches", Lists.newArrayList(_("tutti.validator.warning.fishingOperation.batch.notFound"))); + errorMap.put("catches", Lists.newArrayList(t("tutti.validator.warning.fishingOperation.batch.notFound"))); validator.addMessagesForScope(NuitonValidatorScope.WARNING, errorMap); } else { try { @@ -218,7 +218,7 @@ log.debug("Invalid batch model", e); } Map<String, List<String>> errorMap = Maps.newHashMap(); - errorMap.put("catches", Lists.newArrayList(_("tutti.validator.warning.fishingOperation.invalid.batch.model"))); + errorMap.put("catches", Lists.newArrayList(t("tutti.validator.warning.fishingOperation.invalid.batch.model"))); validator.addMessagesForScope(NuitonValidatorScope.WARNING, errorMap); } } @@ -327,7 +327,7 @@ String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) .toString(batch.getSampleCategoryValue()); warningMap.put("species", - Lists.newArrayList(_("tutti.validator.warning.species.protocolNotRespected", + Lists.newArrayList(t("tutti.validator.warning.species.protocolNotRespected", species, categoryValue))); break; } @@ -341,7 +341,7 @@ String categoryValue = decoratorService.getDecorator(batch.getSampleCategoryValue()) .toString(batch.getSampleCategoryValue()); warningMap.put("benthos", - Lists.newArrayList(_("tutti.validator.warning.benthos.protocolNotRespected", + Lists.newArrayList(t("tutti.validator.warning.benthos.protocolNotRespected", species, categoryValue))); break; } @@ -440,16 +440,16 @@ protected List<String> getExportLines(FishingOperation operation, NuitonValidatorResult validationResult) { List<String> lines = Lists.newArrayList(); - lines.add(_("tutti.validator.export.operation", + lines.add(t("tutti.validator.export.operation", decoratorService.getDecoratorByType(FishingOperation.class).toString(operation))); List<String> messages = validationResult.getMessagesForScope(NuitonValidatorScope.ERROR); for (String message : messages) { - lines.add(_("tutti.validator.export.message.error", _(message))); + lines.add(t("tutti.validator.export.message.error", t(message))); } messages = validationResult.getMessagesForScope(NuitonValidatorScope.WARNING); for (String message : messages) { - lines.add(_("tutti.validator.export.message.warning", _(message))); + lines.add(t("tutti.validator.export.message.warning", t(message))); } return lines; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -56,7 +56,7 @@ import java.util.Set; import static fr.ifremer.tutti.service.PersistenceService.FrequencyFunction; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A service to check and clean species and benthos batches redundant weights. @@ -99,8 +99,8 @@ benthosFrequencyFunction = persistenceService.newBenthosFrequenciesFunction(); benthosWeightUnit = context.getConfig().getBenthosWeightUnit(); speciesWeightUnit = context.getConfig().getSpeciesWeightUnit(); - speciesBatchPrefix = _("tutti.service.operations.cleanWeights.species.batch"); - benthosBatchPrefix = _("tutti.service.operations.cleanWeights.benthos.batch"); + speciesBatchPrefix = t("tutti.service.operations.cleanWeights.species.batch"); + benthosBatchPrefix = t("tutti.service.operations.cleanWeights.benthos.batch"); } /** @@ -485,7 +485,7 @@ if (sampleCategoryWeight != null && ObjectUtils.equals(parentSampleCategoryWeight, sampleCategoryWeight)) { - result = _("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", + result = t("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", weightUnit.fromEntity(sampleCategoryWeight), weightUnit.getShortLabel(), getCategoryLabel(batch), @@ -515,7 +515,7 @@ persistenceService.countFrequenciesWeight(frequencies, true); if (ObjectUtils.equals(weight, frequenciesWeigth)) { - result = _("tutti.service.operations.cleanWeights.error.redundant.frequencyWeight", + result = t("tutti.service.operations.cleanWeights.error.redundant.frequencyWeight", weightUnit.fromEntity(weight), weightUnit.getShortLabel(), getCategoryLabel(batch)); @@ -537,7 +537,7 @@ Float sampleCategoryWeight = batch.getSampleCategoryWeight(); if (weight != null && ObjectUtils.equals(weight, sampleCategoryWeight)) { - result = _("tutti.service.operations.cleanWeights.error.redundant.weight", + result = t("tutti.service.operations.cleanWeights.error.redundant.weight", weightUnit.fromEntity(weight), weightUnit.getShortLabel(), getCategoryLabel(batch)); 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -52,7 +52,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -226,7 +226,7 @@ TuttiEntities.roundKiloGram(speciesTotalSortedWeight)); } else if (speciesTotalSortedWeight < speciesTotalComputedSortedWeight) { - throw new ApplicationBusinessException(_("tutti.service.operations.computeWeights.error.species.incoherentTotalSorted")); + throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.species.incoherentTotalSorted")); } catchBatch.setSpeciesTotalUnsortedComputedWeight( TuttiEntities.roundKiloGram(speciesTotalComputedUnsortedWeight)); @@ -284,7 +284,7 @@ TuttiEntities.roundKiloGram(benthosTotalSortedWeight)); } else if (benthosTotalSortedWeight < benthosTotalComputedSortedWeight) { - throw new ApplicationBusinessException(_("tutti.service.operations.computeWeights.error.benthos.incoherentTotalSorted")); + throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.benthos.incoherentTotalSorted")); } catchBatch.setBenthosTotalUnsortedComputedWeight( TuttiEntities.roundKiloGram(benthosTotalComputedUnsortedWeight)); @@ -320,7 +320,7 @@ marineLitterTotalWeight = marineLitterTotalComputedWeight; } else if (marineLitterTotalComputedWeight != null && marineLitterTotalWeight < marineLitterTotalComputedWeight) { - throw new ApplicationBusinessException(_("tutti.service.operations.computeWeights.error.marineLitter.incoherentTotal")); + throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.marineLitter.incoherentTotal")); } // nothing to do with the marine litter weight, it is an isolated weight @@ -339,7 +339,7 @@ if (rejectedWeight == null && totalWeight != null) { if (!totalWeight.equals(totalUnsortedWeight + totalSortedWeight)) { - throw new ApplicationBusinessException(_("tutti.service.operations.computeWeights.error.incoherentTotal")); + throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.incoherentTotal")); } else { catchBatch.setCatchTotalRejectedComputedWeight( @@ -359,7 +359,7 @@ + rejectedWeight)); } else if (!totalWeight.equals(totalUnsortedWeight + totalSortedWeight + rejectedWeight)) { - throw new ApplicationBusinessException(_("tutti.service.operations.computeWeights.error.incoherentTotal")); + throw new ApplicationBusinessException(t("tutti.service.operations.computeWeights.error.incoherentTotal")); } } @@ -405,7 +405,7 @@ if (!validation.isValid()) { List<String> messages = validation.getErrorMessages(SpeciesBatch.PROPERTY_WEIGHT); String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); - throw new TuttiWeightComputingException(_(messages.get(0), + throw new TuttiWeightComputingException(t(messages.get(0), species, categoryLabel, categoryValue, @@ -436,7 +436,7 @@ } else if (categoryWeight < sum) { String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight", + t("tutti.service.operations.computeWeights.error.species.incoherentParentCategoryWeight", species, categoryLabel, categoryValue, @@ -476,7 +476,7 @@ } if (categoryWeight == null && rowWeight != null) { -// throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); +// throw new TuttiBusinessException(t("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); } else if (rowWeight != null && frequencyWeight != null && !rowWeight.equals(frequencyWeight)) { @@ -484,7 +484,7 @@ String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency", + t("tutti.service.operations.computeWeights.error.species.incoherentRowWeightFrequency", species, categoryLabel, categoryValue, @@ -509,7 +509,7 @@ String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight", + t("tutti.service.operations.computeWeights.error.species.incoherentCategoryWeight", species, categoryLabel, categoryValue, @@ -545,7 +545,7 @@ String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.species.noWeight", + t("tutti.service.operations.computeWeights.error.species.noWeight", species, categoryLabel, categoryValue), @@ -592,7 +592,7 @@ List<String> messages = validation.getErrorMessages(BenthosBatch.PROPERTY_WEIGHT); String categoryLabel = getCategoryLabel(batch.getSampleCategoryId()); - throw new TuttiWeightComputingException(_(messages.get(0), + throw new TuttiWeightComputingException(t(messages.get(0), species, categoryLabel, categoryValue, @@ -625,7 +625,7 @@ getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight", + t("tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight", species, categoryLabel, categoryValue, @@ -666,7 +666,7 @@ } if (categoryWeight == null && rowWeight != null) { -// throw new TuttiBusinessException(_("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); +// throw new TuttiBusinessException(t("tutti.service.operations.computeWeights.error.incoherentRowWeightCategory")); } else if (rowWeight != null && frequencyWeight != null && !rowWeight.equals(frequencyWeight)) { @@ -675,7 +675,7 @@ getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency", + t("tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightFrequency", species, categoryLabel, categoryValue, @@ -701,7 +701,7 @@ getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight", + t("tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight", species, categoryLabel, categoryValue, @@ -737,7 +737,7 @@ getCategoryLabel(batch.getSampleCategoryId()); throw new TuttiWeightComputingException( - _("tutti.service.operations.computeWeights.error.benthos.noWeight", + t("tutti.service.operations.computeWeights.error.benthos.noWeight", species, categoryLabel, categoryValue), @@ -762,7 +762,7 @@ MarineLitterBatch batch = children.get(i); if (checkWeight && batch.getWeight() == null) { throw new TuttiWeightComputingException( - _("tutti.validator.warning.marineLitter.weight.required"), + t("tutti.validator.warning.marineLitter.weight.required"), MarineLitterBatch.PROPERTY_WEIGHT, i); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -59,8 +59,8 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Service to export batches from a satellite post into a master post. @@ -264,7 +264,7 @@ export(marineLitterFile, marineLitterRowModel, rows, - n_("tutti.service.multipost.export.batches.error")); + n("tutti.service.multipost.export.batches.error")); // export weights @@ -280,7 +280,7 @@ export(weightFile, weightModel, Lists.newArrayList(weight), - n_("tutti.service.multipost.export.weight.error")); + n("tutti.service.multipost.export.weight.error")); // export attachments + create final zip @@ -347,7 +347,7 @@ export(individualObservationFile, csvModel, rows, - n_("tutti.service.multipost.export.batches.error")); + n("tutti.service.multipost.export.batches.error")); // export caracteristics @@ -357,7 +357,7 @@ export(caracteristicFile, caracteristicCsvModel, caracteristicRows, - n_("tutti.service.multipost.export.batches.error")); + n("tutti.service.multipost.export.batches.error")); // export operation @@ -371,7 +371,7 @@ export(weightFile, foRowModel, Lists.newArrayList(foRow), - n_("tutti.service.multipost.export.operation.error")); + n("tutti.service.multipost.export.operation.error")); // export attachments + create final zip @@ -437,7 +437,7 @@ export(accidentalCatchesFile, csvModel, rows, - n_("tutti.service.multipost.export.batches.error")); + n("tutti.service.multipost.export.batches.error")); // export caracteristics @@ -447,7 +447,7 @@ export(caracteristicFile, caracteristicCsvModel, caracteristicRows, - n_("tutti.service.multipost.export.batches.error")); + n("tutti.service.multipost.export.batches.error")); // export operation @@ -461,7 +461,7 @@ export(weightFile, foRowModel, Lists.newArrayList(foRow), - n_("tutti.service.multipost.export.operation.error")); + n("tutti.service.multipost.export.operation.error")); // export attachments + create final zip @@ -493,21 +493,21 @@ export(weightsFile, catchWeightsModel, Lists.newArrayList(weights), - n_("tutti.service.multipost.export.weights.error")); + n("tutti.service.multipost.export.weights.error")); File speciesFile = new File(directory, batchFile); file2zip.add(speciesFile); export(speciesFile, csvModel, rows, - n_("tutti.service.multipost.export.batches.error")); + n("tutti.service.multipost.export.batches.error")); File frequencyFile = new File(directory, FREQUENCIES_FILE); file2zip.add(frequencyFile); export(frequencyFile, csvFrequencyModel, frequencyRows, - n_("tutti.service.multipost.export.frequencies.error")); + n("tutti.service.multipost.export.frequencies.error")); // export attachments + create final zip @@ -623,14 +623,14 @@ String errorMessage) { Writer writer = ApplicationIOUtil.newWriter( file, - n_("tutti.service.multipost.export.file.writer.error")); + n("tutti.service.multipost.export.file.writer.error")); try { Export export = Export.newExport(exportModel, rows); export.write(writer); writer.close(); } catch (Exception e) { - throw new ApplicationTechnicalException(_(errorMessage, file), e); + throw new ApplicationTechnicalException(t(errorMessage, file), e); } finally { IOUtils.closeQuietly(writer); } @@ -643,14 +643,14 @@ AttachmentRowModel csvAttachmentModel = new AttachmentRowModel(csvSeparator); File attachmentDirectory = new File(directory, ATTACHMENTS_DIRECTORY); - ApplicationIOUtil.forceMkdir(attachmentDirectory, _("tutti.service.multipost.attachment.mkdir.error", attachmentDirectory)); + ApplicationIOUtil.forceMkdir(attachmentDirectory, t("tutti.service.multipost.attachment.mkdir.error", attachmentDirectory)); file2zip.add(attachmentDirectory); for (AttachmentRow attachmentRow : attachmentRows) { File attachmentFile = attachmentRow.getFile(); File destFile = new File(attachmentDirectory, attachmentFile.getName()); ApplicationIOUtil.copyFile(attachmentFile, destFile, - _("tutti.service.multipost.attachment.copy.error", attachmentFile)); + t("tutti.service.multipost.attachment.copy.error", attachmentFile)); file2zip.add(destFile); } @@ -659,7 +659,7 @@ export(attachmentFile, csvAttachmentModel, attachmentRows, - n_("tutti.service.multipost.export.attachments.error")); + n("tutti.service.multipost.export.attachments.error")); } @@ -673,9 +673,9 @@ ApplicationIOUtil.zip(directory, file, file2zip, - n_("tutti.service.multipost.export.error")); + n("tutti.service.multipost.export.error")); } finally { - ApplicationIOUtil.deleteDirectory(directory, _("tutti.service.multipost.export.deleteTempDirectory.error", file)); + ApplicationIOUtil.deleteDirectory(directory, t("tutti.service.multipost.export.deleteTempDirectory.error", file)); } } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -81,8 +81,8 @@ import java.util.Map; import java.util.concurrent.Callable; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Service to export batches from a satellite post or import batches @@ -173,7 +173,7 @@ File tempDir = ApplicationIOUtil.explodeZip( context.getConfig().getTmpDirectory(), file, - n_("tutti.service.multipost.uncompress.error")); + n("tutti.service.multipost.uncompress.error")); //check operation CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); @@ -242,7 +242,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, SPECIES_FILE), - n_("tutti.service.multipost.import.batches.error")); + n("tutti.service.multipost.import.batches.error")); try { CatchRowModel csvModel = new CatchRowModel(csvSeparator, @@ -331,7 +331,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, FREQUENCIES_FILE), - n_("tutti.service.multipost.import.frequencies.error")); + n("tutti.service.multipost.import.frequencies.error")); try { @@ -376,7 +376,7 @@ Map<String, Object> notImportedData) { Reader reader = ApplicationIOUtil.newReader( new File(file, WEIGHTS_FILE), - n_("tutti.service.multipost.import.weights.error")); + n("tutti.service.multipost.import.weights.error")); try { Import<CatchWeightsRow> importer = Import.newImport(weightsModel, reader); @@ -443,7 +443,7 @@ File tempDir = ApplicationIOUtil.explodeZip( context.getConfig().getTmpDirectory(), file, - n_("tutti.service.multipost.uncompress.error")); + n("tutti.service.multipost.uncompress.error")); //check operation CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); @@ -506,7 +506,7 @@ final Map<String, BenthosBatch> batches = Maps.newHashMap(); Reader reader = ApplicationIOUtil.newReader( new File(file, BENTHOS_FILE), - n_("tutti.service.multipost.import.batches.error")); + n("tutti.service.multipost.import.batches.error")); try { CatchRowModel csvModel = new CatchRowModel(csvSeparator, @@ -595,7 +595,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, FREQUENCIES_FILE), - n_("tutti.service.multipost.import.frequencies.error")); + n("tutti.service.multipost.import.frequencies.error")); try { CatchFrequencyRowModel frequencyModel = new CatchFrequencyRowModel(csvSeparator, caracteristics); @@ -639,7 +639,7 @@ Map<String, Object> notImportedData) { Reader reader = ApplicationIOUtil.newReader( new File(file, WEIGHTS_FILE), - n_("tutti.service.multipost.import.weights.error")); + n("tutti.service.multipost.import.weights.error")); try { Import<CatchWeightsRow> importer = Import.newImport(weightsModel, reader); @@ -706,7 +706,7 @@ File tempDir = ApplicationIOUtil.explodeZip( context.getConfig().getTmpDirectory(), file, - n_("tutti.service.multipost.uncompress.error")); + n("tutti.service.multipost.uncompress.error")); //check operation MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); @@ -767,7 +767,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, MARINE_LITTER_FILE), - n_("tutti.service.multipost.import.batches.error")); + n("tutti.service.multipost.import.batches.error")); try { @@ -833,7 +833,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, WEIGHTS_FILE), - n_("tutti.service.multipost.import.weights.error")); + n("tutti.service.multipost.import.weights.error")); Import<MarineLitterWeightRow> weight = Import.newImport(weightModel, reader); @@ -874,7 +874,7 @@ File tempDir = ApplicationIOUtil.explodeZip( context.getConfig().getTmpDirectory(), file, - n_("tutti.service.multipost.uncompress.error")); + n("tutti.service.multipost.uncompress.error")); //check operation FishingOperationRowModel operationModel = @@ -926,7 +926,7 @@ caracteristics); Reader reader = ApplicationIOUtil.newReader( new File(file, INDIVIDUAL_OBSERVATION_FILE), - n_("tutti.service.multipost.import.batches.error")); + n("tutti.service.multipost.import.batches.error")); try { Import<IndividualObservationRow> importer = Import.newImport(csvModel, reader); @@ -969,7 +969,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, CARACTERISTIC_FILE), - n_("tutti.service.multipost.import.caracteristics.error")); + n("tutti.service.multipost.import.caracteristics.error")); try { Import<CaracteristicRow> importer = Import.newImport(caracteristicModel, reader); @@ -1026,7 +1026,7 @@ File tempDir = ApplicationIOUtil.explodeZip( context.getConfig().getTmpDirectory(), file, - n_("tutti.service.multipost.uncompress.error")); + n("tutti.service.multipost.uncompress.error")); //check operation FishingOperationRowModel operationModel = @@ -1082,7 +1082,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, ACCIDENTAL_CATCHES_FILE), - n_("tutti.service.multipost.import.batches.error")); + n("tutti.service.multipost.import.batches.error")); try { @@ -1134,7 +1134,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(file, CARACTERISTIC_FILE), - n_("tutti.service.multipost.import.caracteristics.error")); + n("tutti.service.multipost.import.caracteristics.error")); try { Import<CaracteristicRow> importer = Import.newImport(caracteristicModel, reader); @@ -1199,7 +1199,7 @@ FishingOperation operation) { Reader reader = ApplicationIOUtil.newReader( new File(directory, WEIGHTS_FILE), - n_("tutti.service.multipost.import.operation.error")); + n("tutti.service.multipost.import.operation.error")); try { Import<FO> importer = Import.newImport(fishingOperationRowModel, reader); @@ -1215,7 +1215,7 @@ || ObjectUtils.notEqual(row.getMultirigAggregation(), operation.getMultirigAggregation()) || ObjectUtils.notEqual(rowDate, operationDate)) { - throw new ApplicationBusinessException(_("tutti.service.multipost.import.wrongOperation.error", + throw new ApplicationBusinessException(t("tutti.service.multipost.import.wrongOperation.error", decoratorService.getDecoratorByType(FishingOperation.class) .toString(operation))); } @@ -1249,7 +1249,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(directory, ATTACHMENTS_FILE), - n_("tutti.service.multipost.import.attachments.error")); + n("tutti.service.multipost.import.attachments.error")); try { AttachmentRowModel attachmentModel = @@ -1311,7 +1311,7 @@ Reader reader = ApplicationIOUtil.newReader( new File(directory, ATTACHMENTS_FILE), - n_("tutti.service.multipost.import.attachments.error")); + n("tutti.service.multipost.import.attachments.error")); try { AttachmentRowModel attachmentModel = 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -72,7 +72,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export data in the generic format. @@ -153,7 +153,7 @@ File basedir = new File(context.getConfig().newTempFile( "exportProgram"), "exportProgram-" + programId); - ApplicationIOUtil.forceMkdir(basedir, _("tutti.io.mkDir.error", basedir)); + ApplicationIOUtil.forceMkdir(basedir, t("tutti.io.mkDir.error", basedir)); ExportContext exportContext = createExportContext(basedir); @@ -163,12 +163,12 @@ cruise = persistenceService.getCruise(cruise.getId()); exportCruise(cruise, exportContext, progressionModel); } - ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); + ApplicationIOUtil.close(exportContext, t("tutti.service.export.closeContext.error")); increments(progressionModel, - _("tutti.service.exportCruise.buildZip", exportFile)); + t("tutti.service.exportCruise.buildZip", exportFile)); - ApplicationIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); + ApplicationIOUtil.zip(basedir, exportFile, t("tutti.service.export.zip.error", exportFile)); } finally { IOUtils.closeQuietly(exportContext); } @@ -203,18 +203,18 @@ File basedir = new File(context.getConfig().newTempFile( "exportCruise"), "exportCruise-" + cruiseId); - ApplicationIOUtil.forceMkdir(basedir, _("tutti.io.mkDir.error", basedir)); + ApplicationIOUtil.forceMkdir(basedir, t("tutti.io.mkDir.error", basedir)); ExportContext exportContext = createExportContext(basedir); try { exportCruise(cruise, exportContext, progressionModel); - ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); + ApplicationIOUtil.close(exportContext, t("tutti.service.export.closeContext.error")); progressionModel.increments( - _("tutti.service.exportCruise.buildZip", exportFile)); + t("tutti.service.exportCruise.buildZip", exportFile)); - ApplicationIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); + ApplicationIOUtil.zip(basedir, exportFile, t("tutti.service.export.zip.error", exportFile)); } finally { IOUtils.closeQuietly(exportContext); } @@ -261,7 +261,7 @@ File basedir = new File(context.getConfig().newTempFile( "exportCruise"), "exportCruise-" + cruiseId); - ApplicationIOUtil.forceMkdir(basedir, _("tutti.io.mkDir.error", basedir)); + ApplicationIOUtil.forceMkdir(basedir, t("tutti.io.mkDir.error", basedir)); ExportContext exportContext = createExportContext(basedir); @@ -273,7 +273,7 @@ Lists.newArrayList(fishingOperation), exportContext, null); - ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); + ApplicationIOUtil.close(exportContext, t("tutti.service.export.closeContext.error")); } finally { IOUtils.closeQuietly(exportContext); } @@ -309,7 +309,7 @@ Preconditions.checkNotNull(cruise); increments(progressionModel, - _("tutti.service.exportCruise.checkCruise", cruise.getName())); + t("tutti.service.exportCruise.checkCruise", cruise.getName())); // check cruise fishing operations Map<String, String> errors = @@ -330,11 +330,11 @@ String operationId = entry.getKey(); FishingOperation fishingOperation = persistenceService.getFishingOperation(operationId); String fishingOperationStr = fishingOperationDecorator.toString(fishingOperation); - sb.append(_("tutti.service.export.invalid.fishingOperation", fishingOperationStr, entry.getValue())); + sb.append(t("tutti.service.export.invalid.fishingOperation", fishingOperationStr, entry.getValue())); } String cruiseStr = cruiseDecorator.toString(cruise); throw new ApplicationBusinessException( - _("tutti.service.export.invalid.cruise", cruiseStr, sb.toString())); + t("tutti.service.export.invalid.cruise", cruiseStr, sb.toString())); } } @@ -371,39 +371,39 @@ String cruiseName = cruise.getName(); increments(progressionModel, - _("tutti.service.exportCruise.exportSurvey", cruiseName)); + t("tutti.service.exportCruise.exportSurvey", cruiseName)); exportSurvey(exportContext, cruise); increments(progressionModel, - _("tutti.service.exportCruise.exportGearCaracteristics", cruiseName)); + t("tutti.service.exportCruise.exportGearCaracteristics", cruiseName)); exportGearCaracteristics(exportContext, cruise); increments(progressionModel, - _("tutti.service.exportCruise.exportOperations", cruiseName)); + t("tutti.service.exportCruise.exportOperations", cruiseName)); exportOperations(exportContext, cruise, loadedOperations); increments(progressionModel, - _("tutti.service.exportCruise.exportParameters", cruiseName)); + t("tutti.service.exportCruise.exportParameters", cruiseName)); exportParameters(exportContext, cruise, loadedOperations); increments(progressionModel, - _("tutti.service.exportCruise.exportMarineLitters", cruiseName)); + t("tutti.service.exportCruise.exportMarineLitters", cruiseName)); exportMarineLitters(exportContext, cruise, loadedOperations); increments(progressionModel, - _("tutti.service.exportCruise.exportIndividualObservations", cruiseName)); + t("tutti.service.exportCruise.exportIndividualObservations", cruiseName)); exportIndividualObservations(exportContext, cruise, loadedOperations); increments(progressionModel, - _("tutti.service.exportCruise.exportAccidentalCatches", cruiseName)); + t("tutti.service.exportCruise.exportAccidentalCatches", cruiseName)); exportAccidentalCatch(exportContext, cruise, loadedOperations); increments(progressionModel, - _("tutti.service.exportCruise.exportCatches", cruiseName)); + t("tutti.service.exportCruise.exportCatches", cruiseName)); exportCatches(exportContext, cruise, loadedOperations); increments(progressionModel, - _("tutti.service.exportCruise.exportSpecies", cruiseName)); + t("tutti.service.exportCruise.exportSpecies", cruiseName)); exportSpecies(exportContext, exportContext.getSpeciesToExport()); } @@ -415,7 +415,7 @@ exportContext.surveyModel.prepareRows(rows, cruise, country); exportContext.surveyExport.write(rows, exportContext.surveyWriter); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.survey.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.survey.error"), e); } } @@ -440,7 +440,7 @@ exportContext.gearCaracteristicsExport.write(rows, exportContext.gearCaracteristicsWriter); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.survey.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.survey.error"), e); } } @@ -464,7 +464,7 @@ exportContext.operationExport.write(rows, exportContext.operationWriter); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.operations.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.operations.error"), e); } } @@ -481,7 +481,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.parameters.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.parameters.error"), e); } } @@ -504,7 +504,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.marineLitters.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.marineLitters.error"), e); } } @@ -530,7 +530,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.individualObservations.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.individualObservations.error"), e); } } @@ -549,7 +549,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.accidentalCatch.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.accidentalCatch.error"), e); } } @@ -640,7 +640,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("tutti.service.export.catches.error"), e); + t("tutti.service.export.catches.error"), e); } } @@ -653,7 +653,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("tutti.service.export.species.error"), e); + t("tutti.service.export.species.error"), e); } } @@ -780,7 +780,7 @@ } catch (FileNotFoundException e) { // should never happen - throw new ApplicationTechnicalException(_("tutti.service.export.context.error"), e); + throw new ApplicationTechnicalException(t("tutti.service.export.context.error"), e); } surveyModel = new SurveyExportModel(csvSeparator); 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 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -54,7 +54,7 @@ import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -206,9 +206,9 @@ } PdfExportBatchEntry pdfEntry = new PdfExportBatchEntry( - _("tutti.service.operations.exportCatchesReport.specialRows.benthos.code"), + t("tutti.service.operations.exportCatchesReport.specialRows.benthos.code"), "", - _("tutti.service.operations.exportCatchesReport.specialRows.benthos.name"), + t("tutti.service.operations.exportCatchesReport.specialRows.benthos.name"), sortedWeight, benthosTotalWeight, totalWeight); @@ -222,9 +222,9 @@ PdfExportBatchEntry pdfExportBatchEntry = new PdfExportBatchEntry( - _("tutti.service.operations.exportCatchesReport.specialRows.inertAndLivinngNotItemized.code"), + t("tutti.service.operations.exportCatchesReport.specialRows.inertAndLivinngNotItemized.code"), "", - _("tutti.service.operations.exportCatchesReport.specialRows.inertAndLivinngNotItemized.name"), + t("tutti.service.operations.exportCatchesReport.specialRows.inertAndLivinngNotItemized.name"), inertLivingNotItemizedCatch.getSortedWeight(), inertLivingNotItemizedCatch.getTotalWeight(), totalWeight); @@ -274,7 +274,7 @@ os.close(); } catch (Exception ex) { - throw new ApplicationTechnicalException(_("tutti.service.operations.exportCatchesReport.error"), ex); + throw new ApplicationTechnicalException(t("tutti.service.operations.exportCatchesReport.error"), ex); } finally { IOUtils.closeQuietly(os); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -31,7 +31,7 @@ import org.nuiton.csv.Common; import org.nuiton.csv.ValueFormatter; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -44,22 +44,22 @@ // export definition - newColumnForExport(_("tutti.service.exportSumatra.header.station"), CatchRow.PROPERTY_FISHING_OPERATION, new ValueFormatter<FishingOperation>() { + newColumnForExport(t("tutti.service.exportSumatra.header.station"), CatchRow.PROPERTY_FISHING_OPERATION, new ValueFormatter<FishingOperation>() { @Override public String format(FishingOperation o) { - Preconditions.checkNotNull(o, _("tutti.service.exportSumatra.error.station.null")); + Preconditions.checkNotNull(o, t("tutti.service.exportSumatra.error.station.null")); return o.getStationNumber(); } }); - newColumnForExport(_("tutti.service.exportSumatra.header.species"), CatchRow.PROPERTY_SPECIES, new ValueFormatter<Species>() { + newColumnForExport(t("tutti.service.exportSumatra.header.species"), CatchRow.PROPERTY_SPECIES, new ValueFormatter<Species>() { @Override public String format(Species s) { - Preconditions.checkNotNull(s, _("tutti.service.exportSumatra.error.species.null")); + Preconditions.checkNotNull(s, t("tutti.service.exportSumatra.error.species.null")); return s.getName(); } }); - newColumnForExport(_("tutti.service.exportSumatra.header.weight"), CatchRow.PROPERTY_WEIGHT, Common.PRIMITIVE_FLOAT); - newColumnForExport(_("tutti.service.exportSumatra.header.number"), CatchRow.PROPERTY_NUMBER, Common.PRIMITIVE_INTEGER); + newColumnForExport(t("tutti.service.exportSumatra.header.weight"), CatchRow.PROPERTY_WEIGHT, Common.PRIMITIVE_FLOAT); + newColumnForExport(t("tutti.service.exportSumatra.header.number"), CatchRow.PROPERTY_NUMBER, Common.PRIMITIVE_INTEGER); } @Override 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 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,7 +47,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -87,12 +87,12 @@ log.info("Will export cruise " + cruiseId + " to file: " + file); } - progressionModel.increments(_("tutti.service.sumatra.export.step.load.cruise", cruiseId)); + progressionModel.increments(t("tutti.service.sumatra.export.step.load.cruise", cruiseId)); Cruise cruise = persistenceService.getCruise(cruiseId); Preconditions.checkNotNull(cruise, "Cruise [" + cruiseId + "] not found"); - progressionModel.increments(_("tutti.service.sumatra.export.step.load.fishingOperationIds")); + progressionModel.increments(t("tutti.service.sumatra.export.step.load.fishingOperationIds")); List<String> operations = persistenceService.getAllFishingOperationIds(cruiseId); @@ -128,7 +128,7 @@ fishingOperationId + " to file: " + file); } - progressionModel.increments(_("tutti.service.sumatra.export.step.load.cruise", cruiseId)); + progressionModel.increments(t("tutti.service.sumatra.export.step.load.cruise", cruiseId)); Cruise cruise = persistenceService.getCruise(cruiseId); Preconditions.checkNotNull(cruise, "Cruise [" + cruiseId + "] not found"); @@ -147,7 +147,7 @@ if (operations != null) { for (String operationId : operations) { - progressionModel.increments(_("tutti.service.sumatra.export.step.load.fishingOperation", operationId)); + progressionModel.increments(t("tutti.service.sumatra.export.step.load.fishingOperation", operationId)); if (!persistenceService.isFishingOperationWithCatchBatch(operationId)) { if (log.isWarnEnabled()) { @@ -160,7 +160,7 @@ } } - progressionModel.increments(_("tutti.service.sumatra.export.step.export", file)); + progressionModel.increments(t("tutti.service.sumatra.export.step.export", file)); CatchRowModel csvModel = new CatchRowModel(context.getConfig().getCsvSeparator()); @@ -172,7 +172,7 @@ writer.close(); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.sumatra.export.error", file), e); + throw new ApplicationTechnicalException(t("tutti.service.sumatra.export.error", file), e); } finally { IOUtils.closeQuietly(writer); } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -62,7 +62,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import / export {@link TuttiProtocol} to {@code Yaml} file formats. @@ -177,7 +177,7 @@ export.write(writer); writer.close(); } catch (Exception e) { - throw new ImportRuntimeException(_("tutti.service.protocol.export.caracteristics.all.error", file), e); + throw new ImportRuntimeException(t("tutti.service.protocol.export.caracteristics.all.error", file), e); } finally { IOUtils.closeQuietly(writer); } @@ -221,7 +221,7 @@ export.write(writer); writer.close(); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.protocol.export.caracteristics.protocol.error", protocol.getName(), file), e); + throw new ApplicationTechnicalException(t("tutti.service.protocol.export.caracteristics.protocol.error", protocol.getName(), file), e); } finally { IOUtils.closeQuietly(writer); } @@ -290,7 +290,7 @@ } catch (ImportRuntimeException e) { throw e; } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.protocol.import.species.error", protocol.getName(), file), e); + throw new ApplicationTechnicalException(t("tutti.service.protocol.import.species.error", protocol.getName(), file), e); } finally { IOUtils.closeQuietly(reader); @@ -360,7 +360,7 @@ } catch (ImportRuntimeException e) { throw e; } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.protocol.import.benthos.error", protocol.getName(), file), e); + throw new ApplicationTechnicalException(t("tutti.service.protocol.import.benthos.error", protocol.getName(), file), e); } finally { IOUtils.closeQuietly(reader); } @@ -397,7 +397,7 @@ export.write(writer); writer.close(); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.protocol.export.species.error", file), e); + throw new ApplicationTechnicalException(t("tutti.service.protocol.export.species.error", file), e); } finally { IOUtils.closeQuietly(writer); } @@ -431,7 +431,7 @@ export.write(writer); writer.close(); } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.protocol.export.benthos.error", file), e); + throw new ApplicationTechnicalException(t("tutti.service.protocol.export.benthos.error", file), e); } finally { IOUtils.closeQuietly(writer); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Model to import / export {@link SpeciesRow}. @@ -66,7 +66,7 @@ if (taxonIds.contains(referenceTaxonId)) { // duplicate reference taxon id used - throw new ImportRuntimeException(_("tutti.service.protocol.import.taxonUsed.error", referenceTaxonId)); + throw new ImportRuntimeException(t("tutti.service.protocol.import.taxonUsed.error", referenceTaxonId)); } taxonIds.add(referenceTaxonId); return species; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -74,7 +74,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import some psion files. @@ -183,7 +183,7 @@ TuttiProtocol protocol = persistenceService.getProtocol(); if (protocol == null) { - throw new ApplicationBusinessException(_("tutti.service.psionimport.error.no.protocol")); + throw new ApplicationBusinessException(t("tutti.service.psionimport.error.no.protocol")); } List<Species> allReferentSpecies = persistenceService.getAllReferentSpecies(); @@ -248,7 +248,7 @@ if (!missingCategories.isEmpty()) { result.addError( - _("tutti.service.psionimport.error.invalidSampleCategoryModel.message", + t("tutti.service.psionimport.error.invalidSampleCategoryModel.message", Joiner.on("").join(missingCategories))); } else { @@ -281,14 +281,14 @@ operationDate = df.parse(operationDateStr); } catch (ParseException e) { - throw new IOException(_("tutti.service.psionimport.error.invalid.date.format")); + throw new IOException(t("tutti.service.psionimport.error.invalid.date.format")); } boolean correctOperation = ObjectUtils.equals(operationCode, operation.getStationNumber()) && ObjectUtils.equals(operationDate, operation.getGearShootingStartDate()); if (!correctOperation) { - throw new IOException(_("tutti.service.psionimport.error.invalid.operation")); + throw new IOException(t("tutti.service.psionimport.error.invalid.operation")); } reader.readLine(); // Heure de création du fichier @@ -303,7 +303,7 @@ while ((line = reader.readLine()) != null) { lineNumber++; if (!line.contains(":")) { - throw new IOException(_("tutti.service.psionimport.error.invalid.line.syntax", lineNumber, line)); + throw new IOException(t("tutti.service.psionimport.error.invalid.line.syntax", lineNumber, line)); } int endIndex = line.indexOf(':'); String commandStr = StringUtils.trim(line.substring(0, endIndex)); @@ -314,7 +314,7 @@ try { command = PsionImportKeyword.valueOf(commandStr); } catch (IllegalArgumentException e) { - throw new IOException(_("tutti.service.psionimport.error.invalid.command.syntax", commandStr, lineNumber)); + throw new IOException(t("tutti.service.psionimport.error.invalid.command.syntax", commandStr, lineNumber)); } String value = StringUtils.trim(line.substring(endIndex + 1)); @@ -335,7 +335,7 @@ // could not load this species badSpecies = value; batch = null; - String error = _("tutti.service.psionimport.error.species.not.found", lineNumber, value); + String error = t("tutti.service.psionimport.error.species.not.found", lineNumber, value); if (log.isWarnEnabled()) { log.warn(error); } @@ -348,7 +348,7 @@ // can't use an already used species badSpecies = value; batch = null; - String error = _("tutti.service.psionimport.error.species.already.used", lineNumber, value); + String error = t("tutti.service.psionimport.error.species.already.used", lineNumber, value); if (log.isWarnEnabled()) { log.warn(error); } @@ -365,7 +365,7 @@ if (StringUtils.isBlank(lengthStepCaracteristicId)) { badSpecies = value; batch = null; - String error = _("tutti.service.psionimport.error.no.lengthClass.caracteristic", lineNumber, value); + String error = t("tutti.service.psionimport.error.no.lengthClass.caracteristic", lineNumber, value); if (log.isWarnEnabled()) { log.warn(error); } @@ -387,7 +387,7 @@ // check batch exists if (batch == null) { throw new IOException( - _("tutti.service.psionimport.error.invalid.firstLine", line, lineNumber)); + t("tutti.service.psionimport.error.invalid.firstLine", line, lineNumber)); } switch (command) { @@ -410,7 +410,7 @@ if (StringUtils.isBlank(value)) { badSpecies = batch.getSpecies().getSurveyCode(); batch = null; - String error = _("tutti.service.psionimport.error.invalid.category.syntax", lineNumber, value, badSpecies); + String error = t("tutti.service.psionimport.error.invalid.category.syntax", lineNumber, value, badSpecies); if (log.isWarnEnabled()) { log.warn(error); @@ -435,7 +435,7 @@ if (category == null) { badSpecies = batch.getSpecies().getSurveyCode(); batch = null; - String error = _("tutti.service.psionimport.error.invalid.category.syntax", lineNumber, categoryCode, badSpecies); + String error = t("tutti.service.psionimport.error.invalid.category.syntax", lineNumber, categoryCode, badSpecies); if (log.isWarnEnabled()) { log.warn(error); } @@ -680,7 +680,7 @@ attachment.setObjectId(Integer.valueOf(catchBatch.getId())); attachment.setName(f.getName()); String date = DateFormat.getDateTimeInstance().format(context.currentDate()); - String comment = _("tutti.service.psion.import.attachment.comment", date); + String comment = t("tutti.service.psion.import.attachment.comment", date); attachment.setComment(comment); persistenceService.createAttachment(attachment, f); } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -74,8 +74,8 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin <kmorin(a)codelutin.com> @@ -188,7 +188,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("tutti.service.pupitri.export.species.error", target), e); + t("tutti.service.pupitri.export.species.error", target), e); } } @@ -198,7 +198,7 @@ attachment.setObjectId(Integer.valueOf(catchBatch.getId())); attachment.setName(f.getName()); String date = DateFormat.getDateTimeInstance().format(context.currentDate()); - String comment = _("tutti.service.pupitri.import.attachment.comment", date); + String comment = t("tutti.service.pupitri.import.attachment.comment", date); attachment.setComment(comment); persistenceService.createAttachment(attachment, f); } @@ -225,7 +225,7 @@ Reader reader = ApplicationIOUtil.newReader( fileWithHeaders, - n_("tutti.service.puttiri.carroussel.import.error")); + n("tutti.service.puttiri.carroussel.import.error")); try { importer = Import.newImport(csvModel, reader); @@ -250,7 +250,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("tutti.service.pupitri.import.trunk.error", operation.toString(), file), e); + t("tutti.service.pupitri.import.trunk.error", operation.toString(), file), e); } finally { IOUtils.closeQuietly(importer); @@ -306,7 +306,7 @@ carrouselFile); Reader reader = ApplicationIOUtil.newReader( fileWithHeaders, - n_("tutti.service.puttiri.carroussel.import.error")); + n("tutti.service.puttiri.carroussel.import.error")); try { importer = Import.newImport(carrouselCsvModel, reader); @@ -357,7 +357,7 @@ } catch (Exception e) { DecoratorService service = getService(DecoratorService.class); throw new ApplicationTechnicalException( - _("tutti.service.pupitri.import.carrousel.error", carrouselFile, service.getDecorator(operation).toString(operation)), e); + t("tutti.service.pupitri.import.carrousel.error", carrouselFile, service.getDecorator(operation).toString(operation)), e); } finally { IOUtils.closeQuietly(importer); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -31,7 +31,7 @@ import java.util.Set; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Model to import / export {@link Gear} in csv format. @@ -46,7 +46,7 @@ // import definition - newNotExistingValueColumn(Gear.PROPERTY_NAME, existingGearName, n_("tutti.service.referential.import.gear.existingName.error")); + newNotExistingValueColumn(Gear.PROPERTY_NAME, existingGearName, n("tutti.service.referential.import.gear.existingName.error")); newMandatoryColumn(Gear.PROPERTY_LABEL); newMandatoryColumn(Gear.PROPERTY_SCIENTIFIC_GEAR, Common.PRIMITIVE_BOOLEAN); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -56,7 +56,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Service to import or export referential. @@ -111,7 +111,7 @@ reader.close(); } catch (IOException e) { - throw new IOException(_("tutti.service.referential.import.species.error", file), e); + throw new IOException(t("tutti.service.referential.import.species.error", file), e); } catch (ImportRuntimeException e) { String message; @@ -168,7 +168,7 @@ // id was already in universe throw new ApplicationTechnicalException( - _("tutti.service.referential.import.vessels.existingValue.error", + t("tutti.service.referential.import.vessels.existingValue.error", bean.getName(), bean.getInternationalRegistrationCode())); } @@ -180,7 +180,7 @@ } reader.close(); } catch (IOException e) { - throw new IOException(_("tutti.service.referential.import.vessels.error", file), e); + throw new IOException(t("tutti.service.referential.import.vessels.error", file), e); } finally { IOUtils.closeQuietly(reader); @@ -213,7 +213,7 @@ } reader.close(); } catch (IOException e) { - throw new IOException(_("tutti.service.referential.import.persons.error", file), e); + throw new IOException(t("tutti.service.referential.import.persons.error", file), e); } finally { IOUtils.closeQuietly(reader); @@ -261,7 +261,7 @@ } reader.close(); } catch (IOException e) { - throw new IOException(_("tutti.service.referential.import.gears.error", file), e); + throw new IOException(t("tutti.service.referential.import.gears.error", file), e); } catch (ImportRuntimeException e) { String message; @@ -308,7 +308,7 @@ } catch (IOException e) { throw e; } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.referential.export.species.error", file), e); + throw new ApplicationTechnicalException(t("tutti.service.referential.export.species.error", file), e); } finally { IOUtils.closeQuietly(writer); } @@ -354,7 +354,7 @@ } catch (IOException e) { throw e; } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.referential.export.vessel.error", file), e); + throw new ApplicationTechnicalException(t("tutti.service.referential.export.vessel.error", file), e); } finally { IOUtils.closeQuietly(writer); } @@ -391,7 +391,7 @@ } catch (IOException e) { throw e; } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.referential.export.person.error", file), e); + throw new ApplicationTechnicalException(t("tutti.service.referential.export.person.error", file), e); } finally { IOUtils.closeQuietly(writer); } @@ -434,7 +434,7 @@ } catch (IOException e) { throw e; } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.referential.export.gear.error", file), e); + throw new ApplicationTechnicalException(t("tutti.service.referential.export.gear.error", file), e); } finally { IOUtils.closeQuietly(writer); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -30,7 +30,7 @@ import java.util.Set; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Model to import / export {@link Species} in csv format. @@ -45,7 +45,7 @@ // import definition - newNotExistingValueColumn(Species.PROPERTY_NAME, existingSpeciesName, n_("tutti.service.referential.import.species.existingName.error")); + newNotExistingValueColumn(Species.PROPERTY_NAME, existingSpeciesName, n("tutti.service.referential.import.species.existingName.error")); // export definition Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -57,7 +57,7 @@ import java.util.Map; import java.util.logging.Level; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To generate some reports. @@ -170,12 +170,12 @@ Preconditions.checkNotNull(model.getOutputFile()); // load fishing operation - progressionModel.increments(_("tutti.report.step.load.fishingOperation")); + progressionModel.increments(t("tutti.report.step.load.fishingOperation")); FishingOperation operation = getService(PersistenceService.class). getFishingOperation(model.getFishingOperationId()); // export fishing operation - progressionModel.increments(_("tutti.report.step.export.fishingOperation")); + progressionModel.increments(t("tutti.report.step.export.fishingOperation")); File exportDirectory = getService(TuttiExportService.class). exportFishingOperation(model.getCruiseId(), model.getFishingOperationId()); @@ -202,7 +202,7 @@ reportContext.getReport().getName()); } - progressionModel.increments(_("tutti.report.step.generateReport", reportContext.getReport().getName())); + progressionModel.increments(t("tutti.report.step.generateReport", reportContext.getReport().getName())); IReportEngine engine = factory.createReportEngine(engineConfig); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -65,7 +65,7 @@ import java.text.ParseException; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -139,7 +139,7 @@ p.setName("pName"); String s; s = d.toString(p); - Assert.assertEquals("pName - " + _("tutti.propety.no.zone"), s); + Assert.assertEquals("pName - " + t("tutti.propety.no.zone"), s); TuttiLocation z = TuttiLocations.newTuttiLocation(); z.setLabel("pLabel"); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import org.apache.commons.lang3.reflect.ConstructorUtils; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 11/24/13. @@ -56,7 +56,7 @@ A result = ConstructorUtils.invokeConstructor(actionName, (AbstractTuttiUIHandler) handler); return result; } catch (Exception e) { - throw new ApplicationTechnicalException(_("application.action.create.error", actionName), e); + throw new ApplicationTechnicalException(t("application.action.create.error", actionName), e); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -43,8 +43,8 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * CallBack to update jre, application, i18n. @@ -59,10 +59,10 @@ LogFactory.getLog(TuttiApplicationUpdaterCallBack.class); public enum UpdateType implements LabelAware { - JRE(n_("tutti.update.jre")), - TUTTI(n_("tutti.update.tutti")), - I18N(n_("tutti.update.i18n")), - HELP(n_("tutti.update.help")); + JRE(n("tutti.update.jre")), + TUTTI(n("tutti.update.tutti")), + I18N(n("tutti.update.i18n")), + HELP(n("tutti.update.help")); private final String i18nKey; @@ -72,7 +72,7 @@ @Override public String getLabel() { - return _(i18nKey); + return t(i18nKey); } } @@ -117,18 +117,18 @@ @Override public void startUpdate(ApplicationInfo info) { if (UpdateType.JRE.name().toLowerCase().equals(info.name)) { - progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.jre", info.newVersion)); + progressionModel.setMessage(t("tutti.applicationUpdater.startUpdate.jre", info.newVersion)); } if (UpdateType.TUTTI.name().toLowerCase().equals(info.name)) { - progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.tutti", info.newVersion)); + progressionModel.setMessage(t("tutti.applicationUpdater.startUpdate.tutti", info.newVersion)); } if (UpdateType.I18N.name().toLowerCase().equals(info.name)) { - progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.i18n", info.newVersion)); + progressionModel.setMessage(t("tutti.applicationUpdater.startUpdate.i18n", info.newVersion)); } if (UpdateType.HELP.name().toLowerCase().equals(info.name)) { - progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.help", info.newVersion)); + progressionModel.setMessage(t("tutti.applicationUpdater.startUpdate.help", info.newVersion)); } } @@ -165,7 +165,7 @@ // something bad while updating jre throw ApplicationActionException.propagateError( - action, new ApplicationTechnicalException(_("tutti.applicationUpdater.jre.error"), error)); + action, new ApplicationTechnicalException(t("tutti.applicationUpdater.jre.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.JRE, appToUpdate); if (info != null) { @@ -189,7 +189,7 @@ // something bad while updating application throw ApplicationActionException.propagateError( - action, new ApplicationTechnicalException(_("tutti.applicationUpdater.tutti.error"), error)); + action, new ApplicationTechnicalException(t("tutti.applicationUpdater.tutti.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.TUTTI, appToUpdate); if (info != null) { @@ -207,14 +207,14 @@ File enumerationPath = config.getDbEnumerationPath(); ApplicationIOUtil.forceDeleteOnExit( enumerationPath, - _("tutti.applicationUpdater.updateDone.deleteDirectory.enum.error", enumerationPath) + t("tutti.applicationUpdater.updateDone.deleteDirectory.enum.error", enumerationPath) ); // must remove the db conf file at exit File dbConfPath = config.getDbConfigurationPath(); ApplicationIOUtil.forceDeleteOnExit( dbConfPath, - _("tutti.applicationUpdater.updateDone.deleteDirectory.dbConf.error", dbConfPath) + t("tutti.applicationUpdater.updateDone.deleteDirectory.dbConf.error", dbConfPath) ); //FIXME-check this is necessary: i18n is no more generated ? @@ -222,14 +222,14 @@ File i18nDirectory = context.getConfig().getI18nDirectory(); ApplicationIOUtil.forceDeleteOnExit( i18nDirectory, - _("tutti.applicationUpdater.updateDone.deleteDirectory.i18n.error", i18nDirectory) + t("tutti.applicationUpdater.updateDone.deleteDirectory.i18n.error", i18nDirectory) ); // must remove db cache directory File cacheDirectory = config.getCacheDirectory(); ApplicationIOUtil.forceDeleteOnExit( cacheDirectory, - _("tutti.applicationUpdater.updateDone.deleteDirectory.caches.error", cacheDirectory) + t("tutti.applicationUpdater.updateDone.deleteDirectory.caches.error", cacheDirectory) ); } } @@ -244,7 +244,7 @@ // something bad while updating i18n throw ApplicationActionException.propagateError( - action, new ApplicationTechnicalException(_("tutti.applicationUpdater.i18n.error"), error)); + action, new ApplicationTechnicalException(t("tutti.applicationUpdater.i18n.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.I18N, appToUpdate); if (info != null) { @@ -268,7 +268,7 @@ // something bad while updating help throw ApplicationActionException.propagateError( - action, new ApplicationTechnicalException(_("tutti.applicationUpdater.help.error"), error)); + action, new ApplicationTechnicalException(t("tutti.applicationUpdater.help.error"), error)); } else { ApplicationInfo info = getInfo(UpdateType.HELP, appToUpdate); if (info != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -48,8 +48,8 @@ import java.io.IOException; import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * CallBack to update db. @@ -66,7 +66,7 @@ public static final String DB_UPDATE_NAME = "db"; static { - n_("tutti.update.db"); + n("tutti.update.db"); } protected final TuttiUIContext context; @@ -132,9 +132,9 @@ public void startUpdate(ApplicationInfo info) { if (dbInstalled) { - progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.db.installation", info.newVersion)); + progressionModel.setMessage(t("tutti.applicationUpdater.startUpdate.db.installation", info.newVersion)); } else if (dbUpdated) { - progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.db.update", info.newVersion)); + progressionModel.setMessage(t("tutti.applicationUpdater.startUpdate.db.update", info.newVersion)); } } @@ -152,9 +152,9 @@ } String errorMessage; if (info != null && info.needAuthentication) { - errorMessage = _("tutti.updateDb.error.with.auth"); + errorMessage = t("tutti.updateDb.error.with.auth"); } else { - errorMessage = _("tutti.updateDb.error.with.noauth"); + errorMessage = t("tutti.updateDb.error.with.noauth"); } throw ApplicationActionException.propagateError( action, new ApplicationTechnicalException(errorMessage, error)); @@ -223,12 +223,12 @@ try { FileUtils.copyDirectory(source, target); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.applicationUpdater.prepareFirstDB.copyDirectory.error", source, target), e); + throw new ApplicationTechnicalException(t("tutti.applicationUpdater.prepareFirstDB.copyDirectory.error", source, target), e); } try { FileUtils.deleteDirectory(source.getParentFile()); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error", target), e); + throw new ApplicationTechnicalException(t("tutti.applicationUpdater.prepareFirstDB.deleteDirectory.error", target), e); } } @@ -245,13 +245,13 @@ service.prepare(dbDirectory, result); if (!result.isSuccess()) { - throw new ApplicationTechnicalException(_("tutti.applicationUpdater.synchroDB.prepare.error"), result.getError()); + throw new ApplicationTechnicalException(t("tutti.applicationUpdater.synchroDB.prepare.error"), result.getError()); } service.synchronize(dbDirectory, result); if (!result.isSuccess()) { - throw new ApplicationTechnicalException(_("tutti.applicationUpdater.synchroDB.synchro.error"), result.getError()); + throw new ApplicationTechnicalException(t("tutti.applicationUpdater.synchroDB.synchro.error"), result.getError()); } // reset cache @@ -280,7 +280,7 @@ ApplicationUpdater.storeVersionFile(target, info.newVersion); } catch (IOException e) { throw new ApplicationTechnicalException( - _("tutti.applicationUpdater.synchroDB.writeVersion.error", versionFile)); + t("tutti.applicationUpdater.synchroDB.writeVersion.error", versionFile)); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,8 +37,8 @@ import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * CallBack to update db. @@ -55,7 +55,7 @@ public static final String REPORT_UPDATE_NAME = "report"; static { - n_("tutti.update.report"); + n("tutti.update.report"); } protected final TuttiUIContext context; @@ -100,7 +100,7 @@ @Override public void startUpdate(ApplicationInfo info) { - progressionModel.setMessage(_("tutti.applicationUpdater.startUpdate.report", info.newVersion)); + progressionModel.setMessage(t("tutti.applicationUpdater.startUpdate.report", info.newVersion)); } @Override @@ -133,9 +133,9 @@ // something bad while updating jre String errorMessage; if (info != null && info.needAuthentication) { - errorMessage = _("tutti.updateReport.error.with.auth"); + errorMessage = t("tutti.updateReport.error.with.auth"); } else { - errorMessage = _("tutti.updateReport.error.with.noauth"); + errorMessage = t("tutti.updateReport.error.with.noauth"); } throw ApplicationActionException.propagateError( action, new ApplicationTechnicalException(errorMessage, error)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -100,8 +100,8 @@ import java.util.Properties; import java.util.Set; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * UI application context. @@ -327,7 +327,7 @@ public void showWarningDialog(String message) { JOptionPane.showMessageDialog(context.getActionUI(), "<html><body>" + message + "</body></html>", - _("application.error.ui.business.warning"), + t("application.error.ui.business.warning"), JOptionPane.WARNING_MESSAGE); } @@ -419,7 +419,7 @@ // // clean cache directory (fix soem headaches...) // TuttiIOUtil.cleanDirectory( // cacheDirectory, -// _("tutti.db.deleteCache.error", cacheDirectory)); +// t("tutti.db.deleteCache.error", cacheDirectory)); // } //--------------------------------------------------------------------// @@ -434,12 +434,12 @@ // clean i18n cache ApplicationIOUtil.cleanDirectory( i18nDirectory, - _("tutti.i18n.deleteCache.error", i18nDirectory)); + t("tutti.i18n.deleteCache.error", i18nDirectory)); } } ApplicationIOUtil.forceMkdir(i18nDirectory, - _("tutti.i18n.mkDir.error", i18nDirectory)); + t("tutti.i18n.mkDir.error", i18nDirectory)); if (log.isDebugEnabled()) { log.debug("I18N directory: " + i18nDirectory); @@ -473,7 +473,7 @@ } ApplicationIOUtil.forceMkdir( helpDirectory, - _("tutti.help.mkDir.error", helpDirectory)); + t("tutti.help.mkDir.error", helpDirectory)); // load help mapping String mappingProperties = "/tutti-help-fr.properties"; @@ -675,7 +675,7 @@ try { serviceContext.close(); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.context.service.close.error"), e); + throw new ApplicationTechnicalException(t("tutti.context.service.close.error"), e); } dataContext.close(); @@ -925,7 +925,7 @@ String value = (String) helpMapping.get(helpId); if (value == null) { - throw new ApplicationTechnicalException(_("tutti.context.helpPage.notFound", helpId)); + throw new ApplicationTechnicalException(t("tutti.context.helpPage.notFound", helpId)); } String helpDirectory = getConfig().getHelpResourceWithLocale(value); @@ -948,7 +948,7 @@ } TuttiUIUtil.openLink(resolvedUri); } catch (URISyntaxException e) { - throw new ApplicationTechnicalException(_("tutti.context.helpPage.notFound", resolvedUri)); + throw new ApplicationTechnicalException(t("tutti.context.helpPage.notFound", resolvedUri)); } } @@ -1038,9 +1038,9 @@ try { TuttiUIUtil.tryToConnectToUpdateUrl( url, - n_("tutti.error.update.bad.url.syntax"), - n_("tutti.error.update.could.not.reach.url"), - n_("tutti.error.update.could.not.found.url") + n("tutti.error.update.bad.url.syntax"), + n("tutti.error.update.could.not.reach.url"), + n("tutti.error.update.could.not.found.url") ); } catch (ApplicationBusinessException e) { if (showErrorInPopup) { @@ -1063,9 +1063,9 @@ try { TuttiUIUtil.tryToConnectToUpdateUrl( url, - n_("tutti.error.update.bad.url.syntax"), - n_("tutti.error.update.could.not.reach.url"), - n_("tutti.error.update.could.not.found.url") + n("tutti.error.update.bad.url.syntax"), + n("tutti.error.update.could.not.reach.url"), + n("tutti.error.update.could.not.found.url") ); } catch (ApplicationBusinessException e) { if (showErrorInPopup) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddBenthosProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import java.util.Collection; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To add a new benthos protocol. @@ -101,7 +101,7 @@ // add notification String speciesStr = decorate(species); - sendMessage(_("tutti.flash.info.benthos.add.to.protocol", + sendMessage(t("tutti.flash.info.benthos.add.to.protocol", speciesStr)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddSpeciesProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import java.util.Collection; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To add a new species protocol. @@ -99,7 +99,7 @@ // add notification String speciesStr = decorate(species); - sendMessage(_("tutti.flash.info.species.add.to.protocol", + sendMessage(t("tutti.flash.info.species.add.to.protocol", speciesStr)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CleanBatchWeightsAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ import javax.swing.JOptionPane; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove weight in double for species and benthos rows. @@ -78,7 +78,7 @@ // no errors - sendMessage(_("tutti.editCatchBatch.action.cleanWeights.no.double.weight.detected")); + sendMessage(t("tutti.editCatchBatch.action.cleanWeights.no.double.weight.detected")); doAction = false; } else { @@ -87,13 +87,13 @@ String errorsStr = cleaningService.errorsToString(errors); String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.cleanWeights.double.weight.detected", errorsStr), - _("tutti.editCatchBatch.action.cleanWeights.help")); + t("tutti.editCatchBatch.action.cleanWeights.double.weight.detected", errorsStr), + t("tutti.editCatchBatch.action.cleanWeights.help")); int answer = JOptionPane.showConfirmDialog( getContext().getActionUI(), htmlMessage, - _("tutti.editCatchBatch.action.cleanWieghts.resume.title"), + t("tutti.editCatchBatch.action.cleanWieghts.resume.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -139,7 +139,7 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editCatchBatch.action.cleanWeights.done", nbErrors)); + sendMessage(t("tutti.editCatchBatch.action.cleanWeights.done", nbErrors)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloneProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import javax.swing.UIManager; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Opens the protocol creation screen with the data of an already existing protocol. @@ -104,16 +104,16 @@ String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.common.askBeforeCloneProtocol.help")); + t("tutti.common.askBeforeCloneProtocol.help")); int response = JOptionPane.showOptionDialog( getContext().getActionUI(), htmlMessage, - _("tutti.common.askBeforeEditProtocol.title"), + t("tutti.common.askBeforeEditProtocol.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, UIManager.getIcon("warning"), - new Object[]{_("tutti.option.cleanAndClone"), _("tutti.option.clone"), _("tutti.option.cancel")}, - _("tutti.option.cancel") + new Object[]{t("tutti.option.cleanAndClone"), t("tutti.option.clone"), t("tutti.option.cancel")}, + t("tutti.option.cancel") ); switch (response) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseApplicationAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To close Tutti Application. @@ -42,7 +42,7 @@ public CloseApplicationAction(MainUIHandler handler) { super(handler, false, null); setSkipCheckCurrentScreen(true); - setActionDescription(_("tutti.main.action.exit.tip")); + setActionDescription(t("tutti.main.action.exit.tip")); } public void setExitCode(int exitCode) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CloseDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -26,7 +26,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To close a db. @@ -72,7 +72,7 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.flash.info.db.closed", jdbcUrl)); + sendMessage(t("tutti.flash.info.db.closed", jdbcUrl)); // make sure title is reloaded handler.reloadDbManagerText(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -51,7 +51,7 @@ import javax.swing.SwingUtilities; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -79,17 +79,17 @@ // no errors - sendMessage(_("tutti.editCatchBatch.action.computeWeights.no.double.weight.detected")); + sendMessage(t("tutti.editCatchBatch.action.computeWeights.no.double.weight.detected")); } else { // show errors to user as warning String errorsStr = cleaningService.errorsToString(errors); - String htmlMessage = _("tutti.editCatchBatch.action.computeWeights.double.weight.detected", errorsStr); + String htmlMessage = t("tutti.editCatchBatch.action.computeWeights.double.weight.detected", errorsStr); JOptionPane.showMessageDialog(getContext().getActionUI(), htmlMessage, - _("tutti.editCatchBatch.action.computeWeights.double.weight.detected.title"), + t("tutti.editCatchBatch.action.computeWeights.double.weight.detected.title"), JOptionPane.WARNING_MESSAGE); @@ -197,12 +197,12 @@ String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species", rate), - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); + t("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.species", rate), + t("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), htmlMessage, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title"), + t("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -230,12 +230,12 @@ String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos", rate), - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); + t("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message.benthos", rate), + t("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), htmlMessage, - _("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title"), + t("tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import javax.swing.JOptionPane; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Establish a connection to an ichtyometer. @@ -62,8 +62,8 @@ public String chooseRemoteDevice(Set<String> remoteDeviceNames) { String selectedDevice = (String) JOptionPane.showInputDialog( getContext().getMainUI(), - _("tutti.ichtyometer.choose.remote.device.found"), - _("tutti.ichtyometer.title.choose.remote.device"), + t("tutti.ichtyometer.choose.remote.device.found"), + t("tutti.ichtyometer.title.choose.remote.device"), JOptionPane.QUESTION_MESSAGE, null, remoteDeviceNames.toArray(new String[remoteDeviceNames.size()]), @@ -75,11 +75,11 @@ try { client.open(remoteDeviceChooser, getConfig().isFullBluetoothScan()); } catch (LocalDeviceNotFoundException e) { - throw new ApplicationBusinessException(_("tutti.ichtyometer.error.no.local.device")); + throw new ApplicationBusinessException(t("tutti.ichtyometer.error.no.local.device")); } catch (RemoteDeviceNotFoundException e) { - throw new ApplicationBusinessException(_("tutti.ichtyometer.error.no.remote.device")); + throw new ApplicationBusinessException(t("tutti.ichtyometer.error.no.remote.device")); } catch (RemoteDeviceServiceNotFoundException e) { - throw new ApplicationBusinessException(_("tutti.ichtyometer.error.no.remote.device.service")); + throw new ApplicationBusinessException(t("tutti.ichtyometer.error.no.remote.device.service")); } FeedReader ichtyometerReader = new FeedReader(); ichtyometerReader.start(client); @@ -93,11 +93,11 @@ FeedReader ichtyometerReader = getContext().getIchtyometerReader(); String clientName = ichtyometerReader.getClientName(); - sendMessage(_("tutti.ichtyometer.connection.establish", clientName)); + sendMessage(t("tutti.ichtyometer.connection.establish", clientName)); displayInfoMessage( - _("tutti.ichtyometer.connection.establish.title"), - _("tutti.ichtyometer.connection.establish.message", clientName) + t("tutti.ichtyometer.connection.establish.title"), + t("tutti.ichtyometer.connection.establish.message", clientName) ); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -40,7 +40,7 @@ import java.awt.Frame; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -108,8 +108,8 @@ if (sampleWeight == 0f) { JOptionPane.showMessageDialog( getUI(), - _("tutti.createBenthosMelag.error.message", selectedRowIndex + 1), - _("tutti.createBenthosMelag.error.title"), + t("tutti.createBenthosMelag.error.message", selectedRowIndex + 1), + t("tutti.createBenthosMelag.error.title"), JOptionPane.ERROR_MESSAGE); SwingUtil.setSelectionInterval(handler.getTable(), selectedRowIndex); @@ -157,16 +157,16 @@ @Override public void doAction() throws Exception { String unitLabel = weightUnit.getShortLabel(); - String melagComment = _("tutti.createBenthosMelag.comment.part1") + "\n"; + String melagComment = t("tutti.createBenthosMelag.comment.part1") + "\n"; for (BenthosBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } - melagComment += _("tutti.createBenthosMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; + melagComment += t("tutti.createBenthosMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; } - melagComment += _("tutti.createBenthosMelag.comment.part3", melagWeight, unitLabel); + melagComment += t("tutti.createBenthosMelag.comment.part3", melagWeight, unitLabel); for (BenthosBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -40,7 +40,7 @@ import java.awt.Frame; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -108,8 +108,8 @@ if (sampleWeight == 0f) { JOptionPane.showMessageDialog( getUI(), - _("tutti.createSpeciesMelag.error.message", selectedRowIndex + 1), - _("tutti.createSpeciesMelag.error.title"), + t("tutti.createSpeciesMelag.error.message", selectedRowIndex + 1), + t("tutti.createSpeciesMelag.error.title"), JOptionPane.ERROR_MESSAGE); SwingUtil.setSelectionInterval(handler.getTable(), selectedRowIndex); @@ -159,16 +159,16 @@ @Override public void doAction() throws Exception { String unitLabel = weightUnit.getShortLabel(); - String melagComment = _("tutti.createSpeciesMelag.comment.part1") + "\n"; + String melagComment = t("tutti.createSpeciesMelag.comment.part1") + "\n"; for (SpeciesBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } - melagComment += _("tutti.createSpeciesMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; + melagComment += t("tutti.createSpeciesMelag.comment.part2", sampleWeight, unitLabel, decorate(batch.getSpecies())) + "\n"; } - melagComment += _("tutti.createSpeciesMelag.comment.part3", melagWeight, unitLabel); + melagComment += t("tutti.createSpeciesMelag.comment.part3", melagWeight, unitLabel); for (SpeciesBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteFishingOperationAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To delete a fishing operation. @@ -49,7 +49,7 @@ public DeleteFishingOperationAction(FishingOperationsUIHandler handler) { super(handler, true); setActionDescription( - _("tutti.editFishingOperation.action.deleteFishingOperation.tip")); + t("tutti.editFishingOperation.action.deleteFishingOperation.tip")); } @Override @@ -59,8 +59,8 @@ canContinue &= fishingOperation != null && !TuttiEntities.isNew(fishingOperation) && askBeforeDelete( - _("tutti.editFishingOperation.action.deleteFishingOperation.title"), - _("tutti.editFishingOperation.action.deleteFishingOperation.message", decorate(fishingOperation)) + t("tutti.editFishingOperation.action.deleteFishingOperation.title"), + t("tutti.editFishingOperation.action.deleteFishingOperation.message", decorate(fishingOperation)) ); return canContinue; } @@ -85,6 +85,6 @@ // remove it from selection model model.removeFishingOperation(fishingOperation); - sendMessage(_("tutti.editFishingOperation.message.operation.deleted", decorate(fishingOperation))); + sendMessage(t("tutti.editFishingOperation.message.operation.deleted", decorate(fishingOperation))); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DeleteProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To delete the selected protocol. @@ -60,8 +60,8 @@ result &= askBeforeDelete( - _("tutti.selectCruise.action.deleteProtocol.title"), - _("tutti.selectCruise.action.deleteProtocol.message", protocol.getName()) + t("tutti.selectCruise.action.deleteProtocol.title"), + t("tutti.selectCruise.action.deleteProtocol.message", protocol.getName()) ); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/DisconnectIchtyometerAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.io.IOUtils; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Close the connection to ichtyometer. @@ -53,6 +53,6 @@ IOUtils.closeQuietly(ichtyometerReader); getContext().setIchtyometerReader(null); - sendMessage(_("tutti.ichtyometer.connection.stop", ichtyometerReader.getClientName())); + sendMessage(t("tutti.ichtyometer.connection.stop", ichtyometerReader.getClientName())); } } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseFishingOperationAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -40,7 +40,7 @@ import java.beans.PropertyChangeListener; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To edit the given fishing operation. @@ -137,7 +137,7 @@ public EditCruiseFishingOperationAction(ValidateCruiseUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.editFishingOperation.action.editFishingOperation.tip")); + setActionDescription(t("tutti.editFishingOperation.action.editFishingOperation.tip")); validationService = getContext().getValidateCruiseOperationsService(); } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -68,7 +68,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To edit the given fishing operation. @@ -193,7 +193,7 @@ public EditFishingOperationAction(FishingOperationsUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.editFishingOperation.action.editFishingOperation.tip")); + setActionDescription(t("tutti.editFishingOperation.action.editFishingOperation.tip")); } public void setFishingOperation(FishingOperation fishingOperation) { @@ -277,11 +277,11 @@ String message; if (create) { - message = _("tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation"); + message = t("tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation"); } else if (fishingOperationModified) { - message = _("tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation"); + message = t("tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation"); } else { - message = _("tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch"); + message = t("tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch"); } int answer = getHandler().askSaveBeforeLeaving(message); @@ -318,9 +318,9 @@ String message; if (fishingOperationValid) { - message = _("tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch"); + message = t("tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch"); } else { - message = _("tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation"); + message = t("tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation"); } // ok will revert any modification by Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import javax.swing.UIManager; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Opens the protocol edition screen. @@ -95,16 +95,16 @@ String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.common.askBeforeEditProtocol.help")); + t("tutti.common.askBeforeEditProtocol.help")); int response = JOptionPane.showOptionDialog( getContext().getActionUI(), htmlMessage, - _("tutti.common.askBeforeEditProtocol.title"), + t("tutti.common.askBeforeEditProtocol.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, UIManager.getIcon("warning"), - new Object[]{_("tutti.option.cleanAndEdit"), _("tutti.option.edit"), _("tutti.option.cancel")}, - _("tutti.option.cancel") + new Object[]{t("tutti.option.cleanAndEdit"), t("tutti.option.edit"), t("tutti.option.cancel")}, + t("tutti.option.cancel") ); switch (response) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditSampleCategoryModelAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To show {@link TuttiScreen#EDIT_SAMPLE_CATEGORY_MODEL} config screen. @@ -46,10 +46,10 @@ boolean result = super.prepareAction(); if (result) { result = askAdminPassword( - _("tutti.editSampleCategoryModel.passwordDialog.message"), - _("tutti.editSampleCategoryModel.passwordDialog.title"), - _("tutti.editSampleCategoryModel.passwordDialog.error.message"), - _("tutti.editSampleCategoryModel.passwordDialog.error.title") + t("tutti.editSampleCategoryModel.passwordDialog.message"), + t("tutti.editSampleCategoryModel.passwordDialog.title"), + t("tutti.editSampleCategoryModel.passwordDialog.error.message"), + t("tutti.editSampleCategoryModel.passwordDialog.error.title") ); } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAccidentalMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -48,17 +48,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiAccidental"); + return t("tutti.common.file.tuttiAccidental"); } @Override protected String getFileChooserTitle() { - return _("tutti.editAccidentalBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editAccidentalBatch.action.exportMultiPost.destinationFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editAccidentalBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editAccidentalBatch.action.exportMultiPost.destinationFile.button"); } @Override @@ -69,6 +69,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editAccidentalBatch.action.exportMultiPost.success", file)); + sendMessage(t("tutti.editAccidentalBatch.action.exportMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAllCaracteristicAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export all caracteristics. @@ -65,9 +65,9 @@ file = saveFile( "tuttiProtocol-" + getModel().getName() + "-allCaracteristics", "csv", - _("tutti.editProtocol.title.choose.caracteristicExportFile"), - _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.editProtocol.title.choose.caracteristicExportFile"), + t("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -93,6 +93,6 @@ service.exportAllCaracteristic(file, getModel().getAllCaracteristic()); - sendMessage(_("tutti.flash.info.all.caractristic.exported", file)); + sendMessage(t("tutti.flash.info.all.caractristic.exported", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportAndCleanDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import java.text.SimpleDateFormat; import java.util.Date; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export a db attached to Tutti. @@ -71,9 +71,9 @@ file = saveFile( "tutti-db-" + df.format(new Date()), "zip", - _("tutti.dbManager.title.choose.dbExportFile"), - _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.common.file.zip") + t("tutti.dbManager.title.choose.dbExportFile"), + t("tutti.dbManager.action.chooseDbExportFile"), + "^.*\\.zip", t("tutti.common.file.zip") ); doAction = file != null; } @@ -93,7 +93,7 @@ // close db - progressionModel.setMessage(_("tutti.exportDb.step.closeDb")); + progressionModel.setMessage(t("tutti.exportDb.step.closeDb")); // clear all caches getContext().getPersistenceService().clearAllCaches(); @@ -110,14 +110,14 @@ // export db progressionModel.increments(1); - progressionModel.setMessage(_("tutti.exportDb.step.createArchive", file)); + progressionModel.setMessage(t("tutti.exportDb.step.createArchive", file)); getContext().getPersistenceService().exportDb(file); // clean files progressionModel.increments(1); - progressionModel.setMessage(_("tutti.exportDb.step.reloadApplication")); + progressionModel.setMessage(t("tutti.exportDb.step.reloadApplication")); // Close the application, will exit and restart application RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); @@ -127,7 +127,7 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.flash.info.db.exported.and.clean", file)); + sendMessage(t("tutti.flash.info.db.exported.and.clean", file)); // make sure title is reloaded getUI().getHandler().changeTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportBenthosMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -47,17 +47,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiBenthos"); + return t("tutti.common.file.tuttiBenthos"); } @Override protected String getFileChooserTitle() { - return _("tutti.editBenthosBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editBenthosBatch.action.exportMultiPost.destinationFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editBenthosBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editBenthosBatch.action.exportMultiPost.destinationFile.button"); } @Override @@ -68,6 +68,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editBenthosBatch.action.exportMultiPost.success", file)); + sendMessage(t("tutti.editBenthosBatch.action.exportMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export a selected cruise. @@ -69,9 +69,9 @@ file = saveFile( "exportCruise-" + cruise.getName(), "zip", - _("tutti.selectCruise.title.choose.exportCruiseFile"), - _("tutti.selectCruise.action.chooseCruiseExportFile"), - "^.+\\.zip$", _("tutti.common.file.zip") + t("tutti.selectCruise.title.choose.exportCruiseFile"), + t("tutti.selectCruise.action.chooseCruiseExportFile"), + "^.+\\.zip$", t("tutti.common.file.zip") ); doAction = file != null; } @@ -116,11 +116,11 @@ } catch (ApplicationBusinessException e) { String errorMessage; - errorMessage = _("tutti.exportCruise.action.exportErrors", cruise.getName(), e.getMessage()); + errorMessage = t("tutti.exportCruise.action.exportErrors", cruise.getName(), e.getMessage()); exportError = new ApplicationBusinessException(errorMessage); } - sendMessage(_("tutti.exportCruise.action.success", + sendMessage(t("tutti.exportCruise.action.success", cruise.getName(), file.getName())); handler.resetEditCruiseAction(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseForSumatraAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import java.io.File; import java.util.Date; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Opens a file chooser, exports the cruise catches into the selected file and open the default email editor. @@ -68,9 +68,9 @@ file = saveFile( String.format("sumatra_%s_%s", getDataContext().getCruise().getName(), date), "csv", - _("tutti.exportCruiseForSumatra.title.choose.exportFile"), - _("tutti.exportCruiseForSumatra.action.chooseFile"), - "^.+\\.csv$", _("tutti.common.file.csv") + t("tutti.exportCruiseForSumatra.title.choose.exportFile"), + t("tutti.exportCruiseForSumatra.action.chooseFile"), + "^.+\\.csv$", t("tutti.common.file.csv") ); doAction = file != null; } @@ -107,6 +107,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.exportCruiseForSumatra.action.success", file)); + sendMessage(t("tutti.exportCruiseForSumatra.action.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseValidationMessagesAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -31,7 +31,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -46,7 +46,7 @@ public ExportCruiseValidationMessagesAction(ValidateCruiseUIHandler handler) { super(handler, false); - setActionDescription(_("tutti.validateCruise.action.export.all.tip")); + setActionDescription(t("tutti.validateCruise.action.export.all.tip")); } @Override @@ -58,8 +58,8 @@ file = saveFile( String.format("validation_%s", getDataContext().getCruise().getName()), "txt", - _("tutti.validateCruise.action.export.all.chooseFile.title"), - _("tutti.validateCruise.action.export.all.chooseFile.label") + t("tutti.validateCruise.action.export.all.chooseFile.title"), + t("tutti.validateCruise.action.export.all.chooseFile.label") ); doAction = file != null; } @@ -81,6 +81,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.validateCruise.action.export.all.success", file)); + sendMessage(t("tutti.validateCruise.action.export.all.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.text.SimpleDateFormat; import java.util.Date; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export a db attached to Tutti. @@ -73,9 +73,9 @@ file = saveFile( "tutti-db-" + df.format(new Date()), "zip", - _("tutti.dbManager.title.choose.dbExportFile"), - _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.common.file.zip") + t("tutti.dbManager.title.choose.dbExportFile"), + t("tutti.dbManager.action.chooseDbExportFile"), + "^.*\\.zip", t("tutti.common.file.zip") ); doAction = file != null; } @@ -100,20 +100,20 @@ // close db - progressionModel.setMessage(_("tutti.exportDb.step.closeDb")); + progressionModel.setMessage(t("tutti.exportDb.step.closeDb")); getContext().setDbLoaded(false); getContext().reloadPersistenceService(); // export - progressionModel.increments(_("tutti.exportDb.step.createArchive", file)); + progressionModel.increments(t("tutti.exportDb.step.createArchive", file)); getContext().getPersistenceService().exportDb(file); // reopen db - progressionModel.increments(_("tutti.exportDb.step.openDb")); + progressionModel.increments(t("tutti.exportDb.step.openDb")); getContext().setDbLoaded(true); getContext().reloadPersistenceService(); @@ -122,7 +122,7 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.flash.info.db.exported", file)); + sendMessage(t("tutti.flash.info.db.exported", file)); // make sure title is reloaded getUI().getHandler().changeTitle(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import java.io.File; import java.util.Date; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 10/1/13. @@ -73,9 +73,9 @@ file = saveFile( String.format("sumatra_%s_%s_%s", getDataContext().getCruise().getName(), fishingOperation.getId(), date), "csv", - _("tutti.exportFishingOperationForSumatra.title.choose.exportFile"), - _("tutti.exportFishingOperationForSumatra.action.chooseFile"), - "^.+\\.csv$", _("tutti.common.file.csv") + t("tutti.exportFishingOperationForSumatra.title.choose.exportFile"), + t("tutti.exportFishingOperationForSumatra.action.chooseFile"), + "^.+\\.csv$", t("tutti.common.file.csv") ); doAction = file != null; } @@ -118,6 +118,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.exportFishingOperationForSumatra.action.success", file)); + sendMessage(t("tutti.exportFishingOperationForSumatra.action.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationReportAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Opens a file chooser, exports the cruise catches into the selected file and open the default email editor. @@ -69,9 +69,9 @@ file = saveFile( "exportFishingOperation-" + cruise.getName() + "-" + fishingOperation.getStationNumber(), "pdf", - _("tutti.exportFishingOperationReport.title.choose.exportFile"), - _("tutti.exportFishingOperationReport.action.chooseFile"), - "^.+\\.pdf$", _("tutti.common.file.pdf") + t("tutti.exportFishingOperationReport.title.choose.exportFile"), + t("tutti.exportFishingOperationReport.action.chooseFile"), + "^.+\\.pdf$", t("tutti.common.file.pdf") ); doAction = file != null; } @@ -107,6 +107,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.exportFishingOperationReport.action.success", file)); + sendMessage(t("tutti.exportFishingOperationReport.action.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportIndividualObservationMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -48,17 +48,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiIndividualObservation"); + return t("tutti.common.file.tuttiIndividualObservation"); } @Override protected String getFileChooserTitle() { - return _("tutti.editIndividualObservationBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editIndividualObservationBatch.action.exportMultiPost.destinationFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editIndividualObservationBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editIndividualObservationBatch.action.exportMultiPost.destinationFile.button"); } @Override @@ -69,6 +69,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editIndividualObservationBatch.action.exportMultiPost.success", file)); + sendMessage(t("tutti.editIndividualObservationBatch.action.exportMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMarineLitterMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -47,17 +47,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiMarineLitter"); + return t("tutti.common.file.tuttiMarineLitter"); } @Override protected String getFileChooserTitle() { - return _("tutti.editMarineLitterBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editMarineLitterBatch.action.exportMultiPost.destinationFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editMarineLitterBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editMarineLitterBatch.action.exportMultiPost.destinationFile.button"); } @Override @@ -68,6 +68,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editMarineLitterBatch.action.exportMultiPost.success", file)); + sendMessage(t("tutti.editMarineLitterBatch.action.exportMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportOperationValidationMessagesAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -33,7 +33,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -48,7 +48,7 @@ public ExportOperationValidationMessagesAction(ValidateCruiseUIHandler handler) { super(handler, false); - setActionDescription(_("tutti.validateCruise.action.export.operation.tip")); + setActionDescription(t("tutti.validateCruise.action.export.operation.tip")); } @Override @@ -62,8 +62,8 @@ String.format("validation_%s", decorate(getModel().getSelectedFishingOperation(), DecoratorService.FILE_NAME_COMPATIBLE)), "txt", - _("tutti.validateCruise.action.export.operation.chooseFile.title"), - _("tutti.validateCruise.action.export.operation.chooseFile.label") + t("tutti.validateCruise.action.export.operation.chooseFile.title"), + t("tutti.validateCruise.action.export.operation.chooseFile.label") ); doAction = file != null; } @@ -86,6 +86,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.validateCruise.action.export.operation.success", file)); + sendMessage(t("tutti.validateCruise.action.export.operation.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export a selected program. @@ -69,9 +69,9 @@ // choose file to export file = saveFile( "exportProgram-" + program.getName(), "zip", - _("tutti.selectCruise.title.choose.exportProgramFile"), - _("tutti.selectCruise.action.chooseProgramExportFile"), - "^.+\\.zip$", _("tutti.common.file.zip") + t("tutti.selectCruise.title.choose.exportProgramFile"), + t("tutti.selectCruise.action.chooseProgramExportFile"), + "^.+\\.zip$", t("tutti.common.file.zip") ); doAction = file != null; } @@ -118,14 +118,14 @@ } catch (ApplicationBusinessException e) { String errorMessage; - errorMessage = _("tutti.exportProgram.action.exportErrors", program.getName(), e.getMessage()); + errorMessage = t("tutti.exportProgram.action.exportErrors", program.getName(), e.getMessage()); exportError = new ApplicationBusinessException(errorMessage); } handler.resetEditProgramAction(); - sendMessage(_("tutti.exportProgram.action.success", program.getName(), + sendMessage(t("tutti.exportProgram.action.success", program.getName(), file.getName())); if (exportError != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Opens a file chooser and exports the protocol into the selected file. @@ -67,9 +67,9 @@ file = saveFile( "protocol-" + protocol.getName().replaceAll(" ", "_"), "tuttiProtocol", - _("tutti.selectCruise.title.choose.exportFile"), - _("tutti.selectCruise.action.exportProtocol"), - "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") + t("tutti.selectCruise.title.choose.exportFile"), + t("tutti.selectCruise.action.exportProtocol"), + "^.+\\.tuttiProtocol$", t("tutti.common.file.protocol") ); doAction = file != null; } @@ -105,6 +105,6 @@ public void postSuccessAction() { super.postSuccessAction(); TuttiProtocol protocol = getModel().getProtocol(); - sendMessage(_("tutti.exportProtocol.action.success", protocol.getName(), file.getName())); + sendMessage(t("tutti.exportProtocol.action.success", protocol.getName(), file.getName())); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolBenthosAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export protocol benthos. @@ -69,9 +69,9 @@ file = saveFile( "tuttiProtocol-" + getModel().getName() + "-benthos", "csv", - _("tutti.editProtocol.title.choose.benthosExportFile"), - _("tutti.editProtocol.action.chooseProtocolBenthosFile"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.editProtocol.title.choose.benthosExportFile"), + t("tutti.editProtocol.action.chooseProtocolBenthosFile"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -111,7 +111,7 @@ model.getAllCaracteristic(), model.getAllReferentSpeciesByTaxonId()); - sendMessage(_("tutti.flash.info.species.exported.from.protocol", + sendMessage(t("tutti.flash.info.species.exported.from.protocol", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolCaracteristicAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import protocol caracteristics. @@ -66,9 +66,9 @@ file = saveFile( "tuttiProtocol-" + getModel().getName() + "-caracteristics", "csv", - _("tutti.editProtocol.title.choose.caracteristicExportFile"), - _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.editProtocol.title.choose.caracteristicExportFile"), + t("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -99,7 +99,7 @@ protocol, getModel().getAllCaracteristic()); - sendMessage(_("tutti.flash.info.caractristic.exported.from.protocol", + sendMessage(t("tutti.flash.info.caractristic.exported.from.protocol", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProtocolSpeciesAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export protocol species. @@ -69,9 +69,9 @@ file = saveFile( "tuttiProtocol-" + getModel().getName() + "-species", "csv", - _("tutti.editProtocol.title.choose.speciesExportFile"), - _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.editProtocol.title.choose.speciesExportFile"), + t("tutti.editProtocol.action.chooseProtocolSpeciesFile"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -111,7 +111,7 @@ model.getAllCaracteristic(), model.getAllReferentSpeciesByTaxonId()); - sendMessage(_("tutti.flash.info.species.exported.from.protocol", + sendMessage(t("tutti.flash.info.species.exported.from.protocol", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportPupitriAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To export protocol species. @@ -69,8 +69,8 @@ file = saveFile( "tuttiProtocol-" + getModel().getName() + "-pupitri", "csv", - _("tutti.editProtocol.title.choose.speciesExportFile"), - _("tutti.editProtocol.action.chooseProtocolSpeciesFile") + t("tutti.editProtocol.title.choose.speciesExportFile"), + t("tutti.editProtocol.action.chooseProtocolSpeciesFile") ); doAction = file != null; } @@ -113,7 +113,7 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.flash.info.species.exported.from.protocol", + sendMessage(t("tutti.flash.info.species.exported.from.protocol", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportSpeciesMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -47,17 +47,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpecies"); } @Override protected String getFileChooserTitle() { - return _("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button"); } @Override @@ -68,6 +68,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editSpeciesBatch.action.exportMultiPost.success", file)); + sendMessage(t("tutti.editSpeciesBatch.action.exportMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryGearExampleAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Export an example file of temporary gears referential. @@ -65,9 +65,9 @@ file = saveFile( "exportGearExample", "csv", - _("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -97,6 +97,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.export.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryPersonExampleAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Export an example file of temporary person referential. @@ -66,9 +66,9 @@ file = saveFile( "exportPersonExample", "csv", - _("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -98,6 +98,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.export.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporarySpeciesExampleAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Export an example file of temporary species referential. @@ -65,9 +65,9 @@ file = saveFile( "exportSpeciesExample", "csv", - _("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -97,6 +97,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.export.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportTemporaryVesselExampleAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Export an example file of temporary species referential. @@ -65,9 +65,9 @@ file = saveFile( "exportVesselExample", "csv", - _("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; } @@ -97,6 +97,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.content.report.ReportUIHandler; import fr.ifremer.tutti.ui.swing.content.report.ReportUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To generate the selected report. @@ -73,7 +73,7 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.report.generated", getModel().getOutputFile())); + sendMessage(t("tutti.report.generated", getModel().getOutputFile())); getModel().reloadOuputFile(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GoToPreviousScreenAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -26,7 +26,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To return on previous screen. @@ -41,6 +41,6 @@ true, PREVIOUS_SCREEN.getContextValue(handler.getUI()) ); - setActionDescription(_("tutti.main.action.goto.previousScreen.tip")); + setActionDescription(t("tutti.main.action.goto.previousScreen.tip")); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportAccidentalMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -49,17 +49,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiAccidental"); + return t("tutti.common.file.tuttiAccidental"); } @Override protected String getFileChooserTitle() { - return _("tutti.editAccidentalBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editAccidentalBatch.action.importMultiPost.sourceFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editAccidentalBatch.action.importMultiPost.sourceFile.button"); + return t("tutti.editAccidentalBatch.action.importMultiPost.sourceFile.button"); } @Override @@ -71,6 +71,6 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editAccidentalBatch.action.importMultiPost.success", file)); + sendMessage(t("tutti.editAccidentalBatch.action.importMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.util.Collection; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -59,17 +59,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiBenthos"); + return t("tutti.common.file.tuttiBenthos"); } @Override protected String getFileChooserTitle() { - return _("tutti.editBenthosBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editBenthosBatch.action.importMultiPost.sourceFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editBenthosBatch.action.importMultiPost.sourceFile.button"); + return t("tutti.editBenthosBatch.action.importMultiPost.sourceFile.button"); } @Override @@ -96,18 +96,18 @@ StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + t("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + t("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + t("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (BenthosBatch sb : notImportedBenthosBatches) { @@ -123,6 +123,6 @@ } } - sendMessage(_("tutti.editBenthosBatch.action.importMultiPost.success", file)); + sendMessage(t("tutti.editBenthosBatch.action.importMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import javax.swing.JOptionPane; import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import a db and use it. @@ -67,7 +67,7 @@ public ImportDbAction(MainUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.dbManager.action.importDb.tip")); + setActionDescription(t("tutti.dbManager.action.importDb.tip")); } public void setImportFile(File importFile) { @@ -92,16 +92,16 @@ // choose file to import importFile = chooseFile( - _("tutti.dbManager.title.choose.dbImportFile"), - _("tutti.dbManager.action.chooseDbFile"), - "^.*\\.zip", _("tutti.common.file.zip") + t("tutti.dbManager.title.choose.dbImportFile"), + t("tutti.dbManager.action.chooseDbFile"), + "^.*\\.zip", t("tutti.common.file.zip") ); if (importFile == null) { displayWarningMessage( - _("tutti.dbManager.title.choose.dbImportFile"), - _("tutti.dbManager.action.importdb.no.import.file.choosen") + t("tutti.dbManager.title.choose.dbImportFile"), + t("tutti.dbManager.action.importdb.no.import.file.choosen") ); doAction = false; @@ -141,7 +141,7 @@ // --- import db // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.importDb.step.unzipArchive")); + progressionModel.increments(t("tutti.importDb.step.unzipArchive")); getContext().getPersistenceService().importDb(importStructureType, importFile); @@ -149,7 +149,7 @@ // --- open db // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.importDb.step.openDb", jdbcUrl)); + progressionModel.increments(t("tutti.importDb.step.openDb", jdbcUrl)); try { getContext().setDbExist(true); getContext().setDbLoaded(true); @@ -164,14 +164,14 @@ getContext().reloadPersistenceService(); // could not load db - throw new ApplicationBusinessException(_("tutti.dbManager.action.importdb.couldNotOpen"), e); + throw new ApplicationBusinessException(t("tutti.dbManager.action.importdb.couldNotOpen"), e); } // ------------------------------------------------------------------ // // --- check schema version // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.importDb.step.checkSchemaVersion")); + progressionModel.increments(t("tutti.importDb.step.checkSchemaVersion")); TuttiPersistence persistenceService = getContext().getPersistenceService(); @@ -190,8 +190,8 @@ if (dbVersion == null) { // no database version filled (can not migrate schema) - String message = _("tutti.dbManager.action.upgradeDb.schema.version.not.found"); - displayWarningMessage(_("tutti.dbManager.title.schema.toupdate"), message); + String message = t("tutti.dbManager.action.upgradeDb.schema.version.not.found"); + displayWarningMessage(t("tutti.dbManager.title.schema.toupdate"), message); closeDb = true; } else if (dbVersion.equals(applicationVersion)) { @@ -205,16 +205,16 @@ // database schema need to migrate // ask user to migrate or not (if not will close db) - String message = _("tutti.dbManager.action.upgradeDb.schema.to.update.message", dbVersion, applicationVersion); + String message = t("tutti.dbManager.action.upgradeDb.schema.to.update.message", dbVersion, applicationVersion); String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.dbManager.action.upgradeDb.schema.to.update.message.help")); + t("tutti.dbManager.action.upgradeDb.schema.to.update.message.help")); int i = JOptionPane.showConfirmDialog( handler.getTopestUI(), htmlMessage, - _("tutti.dbManager.title.schema.toupdate"), + t("tutti.dbManager.title.schema.toupdate"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); boolean continueAction = i == JOptionPane.OK_OPTION; @@ -233,16 +233,16 @@ } else { // database schema version is higher than application one - String message = _("tutti.dbManager.action.upgradeDb.schema.too.high", dbVersion, applicationVersion); + String message = t("tutti.dbManager.action.upgradeDb.schema.too.high", dbVersion, applicationVersion); String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.dbManager.action.upgradeDb.schema.too.high.help")); + t("tutti.dbManager.action.upgradeDb.schema.too.high.help")); int i = JOptionPane.showConfirmDialog( handler.getTopestUI(), htmlMessage, - _("tutti.dbManager.title.schema.toupdate"), + t("tutti.dbManager.title.schema.toupdate"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); boolean continueAction = i == JOptionPane.OK_OPTION; @@ -260,7 +260,7 @@ // --- close db // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.importDb.step.closeDb")); + progressionModel.increments(t("tutti.importDb.step.closeDb")); getActionEngine().runInternalAction(handler, CloseDbAction.class); return; @@ -275,21 +275,21 @@ // --- update schema // // ------------------------------------------------------------------ // - String message = _("tutti.importDb.step.will.migrateSchema", + String message = t("tutti.importDb.step.will.migrateSchema", dbVersion, applicationVersion); progressionModel.increments(message); sendMessage(message); getContext().getPersistenceService().updateSchema(); - sendMessage(_("tutti.flash.info.db.schema.updated", dbVersion, applicationVersion)); + sendMessage(t("tutti.flash.info.db.schema.updated", dbVersion, applicationVersion)); } // ------------------------------------------------------------------ // // --- check db context // // ------------------------------------------------------------------ // - String message = _("tutti.importDb.step.check.dbContext", + String message = t("tutti.importDb.step.check.dbContext", dbVersion, applicationVersion); progressionModel.increments(message); @@ -313,9 +313,9 @@ super.postSuccessAction(); if (closeDb) { - sendMessage(_("tutti.flash.info.db.imported.but.closed", jdbcUrl)); + sendMessage(t("tutti.flash.info.db.imported.but.closed", jdbcUrl)); } else { - sendMessage(_("tutti.flash.info.db.imported", jdbcUrl)); + sendMessage(t("tutti.flash.info.db.imported", jdbcUrl)); } // make sure title is reloaded Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportIndividualObservationMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -49,17 +49,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiIndividualObservation"); + return t("tutti.common.file.tuttiIndividualObservation"); } @Override protected String getFileChooserTitle() { - return _("tutti.editIndividualObservationBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editIndividualObservationBatch.action.importMultiPost.sourceFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editIndividualObservationBatch.action.importMultiPost.sourceFile.button"); + return t("tutti.editIndividualObservationBatch.action.importMultiPost.sourceFile.button"); } @Override @@ -71,6 +71,6 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.editIndividualObservationBatch.action.importMultiPost.success", file)); + sendMessage(t("tutti.editIndividualObservationBatch.action.importMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMarineLitterMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.util.Collection; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -59,17 +59,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiMarineLitter"); + return t("tutti.common.file.tuttiMarineLitter"); } @Override protected String getFileChooserTitle() { - return _("tutti.editMarineLitterBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editMarineLitterBatch.action.importMultiPost.sourceFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editMarineLitterBatch.action.importMultiPost.sourceFile.button"); + return t("tutti.editMarineLitterBatch.action.importMultiPost.sourceFile.button"); } @Override @@ -96,7 +96,7 @@ StringBuffer stringBuffer = new StringBuffer(); Float totalWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); if (totalWeight != null) { - stringBuffer.append("- " + _("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); + stringBuffer.append("- " + t("tutti.multiPostImportLog.totalWeight", totalWeight) + "\n"); } for (MarineLitterBatch mlb : notImportedMarineLitterBatches) { @@ -112,6 +112,6 @@ } } - sendMessage(_("tutti.editMarineLitterBatch.action.importMultiPost.success", file)); + sendMessage(t("tutti.editMarineLitterBatch.action.importMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -49,7 +49,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Opens a file chooser and imports the protocol from the selected file. @@ -84,9 +84,9 @@ if (doAction) { // choose file to import file = chooseFile( - _("tutti.selectCruise.title.choose.importFile"), - _("tutti.selectCruise.action.importProtocol"), - "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") + t("tutti.selectCruise.title.choose.importFile"), + t("tutti.selectCruise.action.importProtocol"), + "^.+\\.tuttiProtocol$", t("tutti.common.file.protocol") ); doAction = file != null; @@ -107,7 +107,7 @@ // remove id protocol.setId((String) null); - sendMessage(_("tutti.importProtocol.action.success", protocol.getName())); + sendMessage(t("tutti.importProtocol.action.success", protocol.getName())); } if (doAction) { @@ -175,16 +175,16 @@ String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.common.askBeforeImportProtocol.help")); + t("tutti.common.askBeforeImportProtocol.help")); int response = JOptionPane.showOptionDialog( getContext().getActionUI(), htmlMessage, - _("tutti.common.askBeforeEditProtocol.title"), + t("tutti.common.askBeforeEditProtocol.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, UIManager.getIcon("warning"), - new Object[]{_("tutti.option.cleanAndImport"), _("tutti.option.import"), _("tutti.option.cancel")}, - _("tutti.option.cancel") + new Object[]{t("tutti.option.cleanAndImport"), t("tutti.option.import"), t("tutti.option.cancel")}, + t("tutti.option.cancel") ); switch (response) { @@ -235,17 +235,17 @@ String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.common.askBeforeImportProtocolSpecies.help")); + t("tutti.common.askBeforeImportProtocolSpecies.help")); int response = JOptionPane.showOptionDialog( getContext().getActionUI(), htmlMessage, - _("tutti.common.askBeforeEditProtocolSpecies.title"), + t("tutti.common.askBeforeEditProtocolSpecies.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, UIManager.getIcon("warning"), - new Object[]{_("tutti.option.cleanAndImport"), _("tutti.option.cancel")}, - _("tutti.option.cancel") + new Object[]{t("tutti.option.cleanAndImport"), t("tutti.option.cancel")}, + t("tutti.option.cancel") ); switch (response) { @@ -291,17 +291,17 @@ String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.common.askBeforeImportProtocolBenthos.help")); + t("tutti.common.askBeforeImportProtocolBenthos.help")); int response = JOptionPane.showOptionDialog( getContext().getActionUI(), htmlMessage, - _("tutti.common.askBeforeEditProtocolBenthos.title"), + t("tutti.common.askBeforeEditProtocolBenthos.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, UIManager.getIcon("warning"), - new Object[]{_("tutti.option.cleanAndImport"), _("tutti.option.cancel")}, - _("tutti.option.cancel") + new Object[]{t("tutti.option.cleanAndImport"), t("tutti.option.cancel")}, + t("tutti.option.cancel") ); switch (response) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import protocol benthos. @@ -67,9 +67,9 @@ // choose file to import file = chooseFile( - _("tutti.editProtocol.title.choose.benthosImportFile"), - _("tutti.editProtocol.action.chooseProtocolBenthosFile"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.editProtocol.title.choose.benthosImportFile"), + t("tutti.editProtocol.action.chooseProtocolBenthosFile"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; @@ -130,17 +130,17 @@ String message; switch (nbSynonym) { case 0: - message = _("tutti.flash.info.benthos.imported.in.protocol", + message = t("tutti.flash.info.benthos.imported.in.protocol", file); break; case 1: - message = _("tutti.flash.info.benthos.imported.in.protocol.oneReplaced", + message = t("tutti.flash.info.benthos.imported.in.protocol.oneReplaced", file); break; default: - message = _("tutti.flash.info.benthos.imported.in.protocol.severalReplaced", + message = t("tutti.flash.info.benthos.imported.in.protocol.severalReplaced", file, nbSynonym); } sendMessage(message); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolCaracteristicAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import protocol caracteristics. @@ -64,9 +64,9 @@ // choose file to import file = chooseFile( - _("tutti.editProtocol.title.choose.caracteristicImportFile"), - _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.editProtocol.title.choose.caracteristicImportFile"), + t("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; @@ -109,7 +109,7 @@ } sendMessage( - _("tutti.flash.info.caracteristic.imported.in.protocol", + t("tutti.flash.info.caracteristic.imported.in.protocol", file)); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import protocol species. @@ -67,9 +67,9 @@ // choose file to import file = chooseFile( - _("tutti.editProtocol.title.choose.speciesImportFile"), - _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), - "^.*\\.csv", _("tutti.common.file.csv") + t("tutti.editProtocol.title.choose.speciesImportFile"), + t("tutti.editProtocol.action.chooseProtocolSpeciesFile"), + "^.*\\.csv", t("tutti.common.file.csv") ); doAction = file != null; @@ -130,17 +130,17 @@ String message; switch (nbSynonym) { case 0: - message = _("tutti.flash.info.species.imported.in.protocol", + message = t("tutti.flash.info.species.imported.in.protocol", file); break; case 1: - message = _("tutti.flash.info.species.imported.in.protocol.oneReplaced", + message = t("tutti.flash.info.species.imported.in.protocol.oneReplaced", file); break; default: - message = _("tutti.flash.info.species.imported.in.protocol.severalReplaced", + message = t("tutti.flash.info.species.imported.in.protocol.severalReplaced", file, nbSynonym); } sendMessage(message); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 1/21/14. @@ -81,9 +81,9 @@ if (result) { // choose file to import importedTrunkFile = chooseFile( - _("tutti.editSpeciesBatch.action.title.choose.importPsionFile"), - _("tutti.editSpeciesBatch.action.choosePsionFile.import"), - "^.*\\.IWA", _("tutti.common.file.iwa")); + t("tutti.editSpeciesBatch.action.title.choose.importPsionFile"), + t("tutti.editSpeciesBatch.action.choosePsionFile.import"), + "^.*\\.IWA", t("tutti.common.file.iwa")); result = importedTrunkFile != null; } @@ -124,7 +124,7 @@ if (importResult.isDone()) { - sendMessage(_("tutti.editSpeciesBatch.action.importPsion.success", + sendMessage(t("tutti.editSpeciesBatch.action.importPsion.success", importResult.getNbImported())); } else { @@ -133,12 +133,12 @@ sb.append("<li>").append(s).append("</li>"); } displayWarningMessage( - _("tutti.editSpeciesBatch.action.importPsion.no.matching.fishingOperation.title"), + t("tutti.editSpeciesBatch.action.importPsion.no.matching.fishingOperation.title"), "<html><body>" + - _("tutti.editSpeciesBatch.action.importPsion.no.matching.fishingOperation", sb.toString()) + + t("tutti.editSpeciesBatch.action.importPsion.no.matching.fishingOperation", sb.toString()) + "</body></html>" ); - sendMessage(_("tutti.editSpeciesBatch.action.importPsion.no.matching.data")); + sendMessage(t("tutti.editSpeciesBatch.action.importPsion.no.matching.data")); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPupitriAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,7 +47,7 @@ import java.io.File; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -103,8 +103,8 @@ result = false; JOptionPane.showMessageDialog( getContext().getActionUI(), - _("tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.message", Joiner.on("").join(missingCategories)), - _("tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.title"), + t("tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.message", Joiner.on("").join(missingCategories)), + t("tutti.editSpeciesBatch.action.importPupitri.invalidSampleCategoryModel.title"), JOptionPane.ERROR_MESSAGE, UIManager.getIcon("error") ); @@ -115,12 +115,12 @@ if (speciesBatchUIModel.getRowCount() > 0) { String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editSpeciesBatch.action.importPupitri.existingData.message"), - _("tutti.editSpeciesBatch.action.importPupitri.existingData.help")); + t("tutti.editSpeciesBatch.action.importPupitri.existingData.message"), + t("tutti.editSpeciesBatch.action.importPupitri.existingData.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), htmlMessage, - _("tutti.editSpeciesBatch.action.importPupitri.existingData.title"), + t("tutti.editSpeciesBatch.action.importPupitri.existingData.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); @@ -177,17 +177,17 @@ if (importResult.isFishingOperationFound()) { int rejectedSpeciesNb = importResult.getNbCarrousselNotImported(); - sendMessage(_("tutti.editSpeciesBatch.action.importPupitri.success", + sendMessage(t("tutti.editSpeciesBatch.action.importPupitri.success", getModel().getRootNumber(), rejectedSpeciesNb)); } else { displayWarningMessage( - _("tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title"), + t("tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation.title"), "<html><body>" + - _("tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation") + + t("tutti.editSpeciesBatch.action.importPupitri.no.matching.fishingOperation") + "</body></html>" ); - sendMessage(_("tutti.editSpeciesBatch.action.importPupitri.no.matching.data")); + sendMessage(t("tutti.editSpeciesBatch.action.importPupitri.no.matching.data")); } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.util.Collection; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -59,17 +59,17 @@ @Override protected String getFileExtensionDescription() { - return _("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpecies"); } @Override protected String getFileChooserTitle() { - return _("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title"); } @Override protected String getFileChooserButton() { - return _("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button"); + return t("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button"); } @Override @@ -96,18 +96,18 @@ StringBuffer stringBuffer = new StringBuffer(); Float totalSortedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT); if (totalSortedWeight != null) { - stringBuffer.append("- " + _("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); + stringBuffer.append("- " + t("tutti.multiPostImportLog.totalSortedWeight", totalSortedWeight) + "\n"); } Float inertWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT); if (inertWeight != null) { - stringBuffer.append("- " + _("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); + stringBuffer.append("- " + t("tutti.multiPostImportLog.inertWeight", inertWeight) + "\n"); } Float livingNotItemizedWeight = (Float) notImportedData.get(CatchBatch.PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_WEIGHT); if (livingNotItemizedWeight != null) { - stringBuffer.append("- " + _("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); + stringBuffer.append("- " + t("tutti.multiPostImportLog.livingNotItemizedWeight", livingNotItemizedWeight) + "\n"); } for (SpeciesBatch sb : notImportedSpeciesBatches) { @@ -123,6 +123,6 @@ } } - sendMessage(_("tutti.editSpeciesBatch.action.importMultiPost.success", file)); + sendMessage(t("tutti.editSpeciesBatch.action.importMultiPost.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Import temporary gear referential. @@ -63,9 +63,9 @@ // choose file to import file = chooseFile( - _("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), - "^.*\\.csv", _("tutti.common.file.csv")); + t("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); doAction = file != null; } @@ -100,6 +100,6 @@ public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Import temporary person referential. @@ -63,9 +63,9 @@ // choose file to import file = chooseFile( - _("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), - "^.*\\.csv", _("tutti.common.file.csv")); + t("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); doAction = file != null; } @@ -99,6 +99,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryReferentialAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import javax.swing.SwingUtilities; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Open screen to import referential @@ -48,10 +48,10 @@ boolean result = super.prepareAction(); if (result) { result = askAdminPassword( - _("tutti.manageTemporaryReferential.passwordDialog.message"), - _("tutti.manageTemporaryReferential.passwordDialog.title"), - _("tutti.manageTemporaryReferential.passwordDialog.error.message"), - _("tutti.manageTemporaryReferential.passwordDialog.error.title") + t("tutti.manageTemporaryReferential.passwordDialog.message"), + t("tutti.manageTemporaryReferential.passwordDialog.title"), + t("tutti.manageTemporaryReferential.passwordDialog.error.message"), + t("tutti.manageTemporaryReferential.passwordDialog.error.title") ); } return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporarySpeciesAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Import temporary species referential. @@ -62,9 +62,9 @@ if (doAction) { // choose file to import file = chooseFile( - _("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), - "^.*\\.csv", _("tutti.common.file.csv")); + t("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); doAction = file != null; } @@ -98,6 +98,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryVesselAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Import temporary vessel referential. @@ -62,9 +62,9 @@ if (doAction) { // choose file to import file = chooseFile( - _("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), - _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), - "^.*\\.csv", _("tutti.common.file.csv")); + t("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), + t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), + "^.*\\.csv", t("tutti.common.file.csv")); doAction = file != null; } @@ -98,6 +98,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success", file)); + sendMessage(t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success", file)); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/InstallDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To install (or reinstall) a db from last network one. @@ -57,7 +57,7 @@ public InstallDbAction(MainUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.dbManager.action.installDb.tip")); + setActionDescription(t("tutti.dbManager.action.installDb.tip")); } @Override @@ -99,7 +99,7 @@ File dest = new File(config.getBasedir(), "NEW"); - progressionModel.increments(_("tutti.dbManager.action.upgradeDb.check")); + progressionModel.increments(t("tutti.dbManager.action.upgradeDb.check")); TuttiDbUpdaterCallBack callback = new TuttiDbUpdaterCallBack(this, progressionModel); ApplicationUpdater up = new ApplicationUpdater(); @@ -112,7 +112,7 @@ Preconditions.checkState(callback.isDbInstalled()); - progressionModel.increments(_("tutti.dbManager.action.upgradeDb.opening")); + progressionModel.increments(t("tutti.dbManager.action.upgradeDb.opening")); getContext().setDbExist(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -44,7 +44,7 @@ import java.util.Date; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To open existing db. @@ -75,7 +75,7 @@ public OpenDbAction(MainUIHandler handler) { super(handler, true, TuttiScreen.SELECT_CRUISE); - setActionDescription(_("tutti.dbManager.action.openDb.tip")); + setActionDescription(t("tutti.dbManager.action.openDb.tip")); } public void setUpdateReferentiel(boolean updateReferentiel) { @@ -112,12 +112,12 @@ // ask user if it wants to do the update String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.dbManager.updatedb.found", updateDbVersion.newVersion), - _("tutti.common.askBeforeUpdate.help")); + t("tutti.dbManager.updatedb.found", updateDbVersion.newVersion), + t("tutti.common.askBeforeUpdate.help")); int i = JOptionPane.showConfirmDialog( getHandler().getTopestUI(), htmlMessage, - _("tutti.dbManager.title.confirm.updatedb"), + t("tutti.dbManager.title.confirm.updatedb"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -147,7 +147,7 @@ // --- open db // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.openDb.step.open", jdbcUrl)); + progressionModel.increments(t("tutti.openDb.step.open", jdbcUrl)); try { getContext().setDbLoaded(true); getContext().reloadPersistenceService(); @@ -161,14 +161,14 @@ getContext().reloadPersistenceService(); // could not load db - throw new ApplicationBusinessException(_("tutti.dbManager.action.openDb.couldNotOpen")); + throw new ApplicationBusinessException(t("tutti.dbManager.action.openDb.couldNotOpen")); } // ------------------------------------------------------------------ // // --- check schema version // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.openDb.step.checkSchemaVersion")); + progressionModel.increments(t("tutti.openDb.step.checkSchemaVersion")); TuttiPersistence persistenceService = getContext().getPersistenceService(); @@ -198,16 +198,16 @@ // ask user where to backup db - String message = _("tutti.dbManager.action.upgradeDb.schema.to.update.message", dbVersion, applicationVersion); + String message = t("tutti.dbManager.action.upgradeDb.schema.to.update.message", dbVersion, applicationVersion); String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, message, - _("tutti.dbManager.action.upgradeDb.schema.to.update.message.help")); + t("tutti.dbManager.action.upgradeDb.schema.to.update.message.help")); int i = JOptionPane.showConfirmDialog( getHandler().getTopestUI(), htmlMessage, - _("tutti.dbManager.title.schema.toupdate"), + t("tutti.dbManager.title.schema.toupdate"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); boolean continueAction = i == JOptionPane.OK_OPTION; @@ -220,9 +220,9 @@ config.getDbBackupDirectory(), "tutti-db-" + ExportDbAction.df.format(new Date()), "zip", - _("tutti.dbManager.title.choose.dbBackupFile"), - _("tutti.dbManager.action.chooseDbBackupFile"), - "^.*\\.zip", _("tutti.common.file.zip") + t("tutti.dbManager.title.choose.dbBackupFile"), + t("tutti.dbManager.action.chooseDbBackupFile"), + "^.*\\.zip", t("tutti.common.file.zip") ); if (file == null) { @@ -231,8 +231,8 @@ closeDb = true; displayWarningMessage( - _("tutti.dbManager.title.choose.dbBackupFile"), - _("tutti.dbManager.action.upgradeDb.no.backup.db.choosen") + t("tutti.dbManager.title.choose.dbBackupFile"), + t("tutti.dbManager.action.upgradeDb.no.backup.db.choosen") ); } else { @@ -248,8 +248,8 @@ // database schema version is higher than application one displayWarningMessage( - _("tutti.dbManager.title.schema.toupdate"), - _("tutti.dbManager.action.upgradeDb.schema.not.update.message", dbVersion, applicationVersion) + t("tutti.dbManager.title.schema.toupdate"), + t("tutti.dbManager.action.upgradeDb.schema.not.update.message", dbVersion, applicationVersion) ); } @@ -259,7 +259,7 @@ // --- close current db // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.importDb.step.closeDb")); + progressionModel.increments(t("tutti.importDb.step.closeDb")); getActionEngine().runInternalAction(getHandler(), CloseDbAction.class); setScreen(TuttiScreen.MANAGE_DB); @@ -286,7 +286,7 @@ // --- update schema // // ------------------------------------------------------------------ // - String message = _("tutti.openDb.step.will.migrateSchema", + String message = t("tutti.openDb.step.will.migrateSchema", dbVersion, applicationVersion); progressionModel.increments(message); @@ -300,14 +300,14 @@ // --- update referentiel // // ------------------------------------------------------------------ // - progressionModel.increments(_("tutti.openDb.step.updateReferential")); + progressionModel.increments(t("tutti.openDb.step.updateReferential")); File current = config.getDataDirectory(); String url = config.getUpdateDataUrl(); File dest = new File(config.getBasedir(), "NEW"); - progressionModel.setMessage(_("tutti.dbManager.action.upgradeDb.check")); + progressionModel.setMessage(t("tutti.dbManager.action.upgradeDb.check")); TuttiDbUpdaterCallBack callback = new TuttiDbUpdaterCallBack(this, progressionModel); ApplicationUpdater up = new ApplicationUpdater(); @@ -320,10 +320,10 @@ if (callback.isDbUpdated()) { - progressionModel.setMessage(_("tutti.dbManager.action.upgradeDb.reloading")); + progressionModel.setMessage(t("tutti.dbManager.action.upgradeDb.reloading")); } else { - sendMessage(_("tutti.dbManager.action.upgradeDb.upToDate")); + sendMessage(t("tutti.dbManager.action.upgradeDb.upToDate")); } } @@ -331,7 +331,7 @@ // --- check db context // // ------------------------------------------------------------------ // - String message = _("tutti.openDb.step.check.dbContext", + String message = t("tutti.openDb.step.check.dbContext", dbVersion, applicationVersion); progressionModel.increments(message); @@ -353,15 +353,15 @@ handler.changeTitle(); if (closeDb) { - sendMessage(_("tutti.flash.info.db.not.opened", jdbcUrl)); + sendMessage(t("tutti.flash.info.db.not.opened", jdbcUrl)); } else { if (updateSchema) { - sendMessage(_("tutti.flash.info.db.schema.updated", dbVersion, applicationVersion)); + sendMessage(t("tutti.flash.info.db.schema.updated", dbVersion, applicationVersion)); } - sendMessage(_("tutti.flash.info.db.opened", jdbcUrl)); + sendMessage(t("tutti.flash.info.db.opened", jdbcUrl)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -33,7 +33,7 @@ import java.io.File; import java.util.Date; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To import a db after restart application. @@ -51,7 +51,7 @@ public ReimportDbAction(MainUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.dbManager.action.importDb.tip")); + setActionDescription(t("tutti.dbManager.action.importDb.tip")); } @Override @@ -69,8 +69,8 @@ if (getModel().isDbExist()) { displayInfoMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.importDb.backup.db") + t("tutti.dbManager.title.backup.db"), + t("tutti.dbManager.action.importDb.backup.db") ); // choose backup file @@ -78,16 +78,16 @@ getConfig().getDbBackupDirectory(), "tutti-db-" + ExportDbAction.df.format(new Date()), "zip", - _("tutti.dbManager.title.choose.dbExportFile"), - _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.common.file.zip") + t("tutti.dbManager.title.choose.dbExportFile"), + t("tutti.dbManager.action.chooseDbExportFile"), + "^.*\\.zip", t("tutti.common.file.zip") ); if (backupFile == null) { displayWarningMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.importdb.no.backup.db.choosen") + t("tutti.dbManager.title.backup.db"), + t("tutti.dbManager.action.importdb.no.backup.db.choosen") ); doAction = false; @@ -98,16 +98,16 @@ // choose file to import importFile = chooseFile( - _("tutti.dbManager.title.choose.dbImportFile"), - _("tutti.dbManager.action.chooseDbFile"), - "^.*\\.zip", _("tutti.common.file.zip") + t("tutti.dbManager.title.choose.dbImportFile"), + t("tutti.dbManager.action.chooseDbFile"), + "^.*\\.zip", t("tutti.common.file.zip") ); if (importFile == null) { displayWarningMessage( - _("tutti.dbManager.title.choose.dbImportFile"), - _("tutti.dbManager.action.importdb.no.import.file.choosen") + t("tutti.dbManager.title.choose.dbImportFile"), + t("tutti.dbManager.action.importdb.no.import.file.choosen") ); doAction = false; @@ -140,12 +140,12 @@ ProgressionModel progressionModel = getProgressionModel(); // close db - progressionModel.increments(_("tutti.reimport.step.closeDb", jdbcUrl)); + progressionModel.increments(t("tutti.reimport.step.closeDb", jdbcUrl)); getContext().setDbLoaded(false); getContext().reloadPersistenceService(); // backup db - progressionModel.increments(_("tutti.reimport.step.backupDb", backupFile)); + progressionModel.increments(t("tutti.reimport.step.backupDb", backupFile)); getContext().getPersistenceService().exportDb(backupFile); // clean db context @@ -155,10 +155,10 @@ String actionContent = ImportDbAction.class.getName() + ":" + importFile.getAbsolutePath(); File startActionFile = getConfig().getStartActionFile(); - ApplicationIOUtil.writeContent(startActionFile, actionContent, _("tutti.error.write.startActionFile", startActionFile)); + ApplicationIOUtil.writeContent(startActionFile, actionContent, t("tutti.error.write.startActionFile", startActionFile)); // restart application - progressionModel.increments(_("tutti.reimport.step.reloadApplication")); + progressionModel.increments(t("tutti.reimport.step.reloadApplication")); RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.io.File; import java.util.Date; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To install (or reinstall) a db from last network one. @@ -50,7 +50,7 @@ public ReinstallDbAction(MainUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.dbManager.action.installDb.tip")); + setActionDescription(t("tutti.dbManager.action.installDb.tip")); } @Override @@ -76,8 +76,8 @@ if (getModel().isDbExist()) { displayInfoMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.installDb.backup.db") + t("tutti.dbManager.title.backup.db"), + t("tutti.dbManager.action.installDb.backup.db") ); // choose backup file @@ -85,16 +85,16 @@ getConfig().getDbBackupDirectory(), "tutti-db-" + ExportDbAction.df.format(new Date()), "zip", - _("tutti.dbManager.title.choose.dbExportFile"), - _("tutti.dbManager.action.chooseDbExportFile"), - "^.*\\.zip", _("tutti.common.file.zip") + t("tutti.dbManager.title.choose.dbExportFile"), + t("tutti.dbManager.action.chooseDbExportFile"), + "^.*\\.zip", t("tutti.common.file.zip") ); if (backupFile == null) { displayWarningMessage( - _("tutti.dbManager.title.backup.db"), - _("tutti.dbManager.action.installDb.no.backup.db.choosen") + t("tutti.dbManager.title.backup.db"), + t("tutti.dbManager.action.installDb.no.backup.db.choosen") ); doAction = false; @@ -119,13 +119,13 @@ ProgressionModel progressionModel = getProgressionModel(); // close db - progressionModel.increments(_("tutti.reinstallDb.step.closeDb", jdbcUrl)); + progressionModel.increments(t("tutti.reinstallDb.step.closeDb", jdbcUrl)); getContext().setDbLoaded(false); getContext().reloadPersistenceService(); // backup db - progressionModel.increments(_("tutti.reinstallDb.step.backupDb", backupFile)); + progressionModel.increments(t("tutti.reinstallDb.step.backupDb", backupFile)); getContext().getPersistenceService().exportDb(backupFile); // clean db context @@ -135,10 +135,10 @@ String actionContent = InstallDbAction.class.getName(); File startActionFile = getConfig().getStartActionFile(); - ApplicationIOUtil.writeContent(startActionFile, actionContent, _("tutti.error.write.startActionFile", startActionFile)); + ApplicationIOUtil.writeContent(startActionFile, actionContent, t("tutti.error.write.startActionFile", startActionFile)); // restart application - progressionModel.increments(_("tutti.reinstallDb.step.reloadApplication")); + progressionModel.increments(t("tutti.reinstallDb.step.reloadApplication")); RunTutti.closeTutti(getHandler(), RunTutti.DELETE_DB_EXIT_CODE); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReloadTuttiAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To reload Tutti application. @@ -39,7 +39,7 @@ public ReloadTuttiAction(MainUIHandler handler) { super(handler, true, null); - setActionDescription(_("tutti.main.action.reloadTutti")); + setActionDescription(t("tutti.main.action.reloadTutti")); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAccidentalBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ import javax.swing.JOptionPane; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -60,8 +60,8 @@ if (result) { int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editAccidentalBatch.action.removeBatch.confirm.message"), - _("tutti.editAccidentalBatch.action.removeBatch.confirm.title"), + t("tutti.editAccidentalBatch.action.removeBatch.confirm.message"), + t("tutti.editAccidentalBatch.action.removeBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveAllIndividualObservationBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -42,7 +42,7 @@ import javax.swing.JOptionPane; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 10/3/13. @@ -99,8 +99,8 @@ } int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editIndividualObservationBatch.action.removeAllBatch.confirm.message", rowIndexToRemove.size(), decorate(species)), - _("tutti.editIndividualObservationBatch.action.removeAllBatch.confirm.title"), + t("tutti.editIndividualObservationBatch.action.removeAllBatch.confirm.message", rowIndexToRemove.size(), decorate(species)), + t("tutti.editIndividualObservationBatch.action.removeAllBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -40,7 +40,7 @@ import javax.swing.JOptionPane; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove a species batch and all his children. @@ -76,8 +76,8 @@ if (result) { int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editBenthosBatch.action.removeBatch.confirm.message"), - _("tutti.editBenthosBatch.action.removeBatch.confirm.title"), + t("tutti.editBenthosBatch.action.removeBatch.confirm.message"), + t("tutti.editBenthosBatch.action.removeBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove all the selected benthos rows from protocol. @@ -131,6 +131,6 @@ handler.getBenthosTable().clearSelection(); // notify user - sendMessage(_("tutti.flash.info.benthos.remove.from.protocol")); + sendMessage(t("tutti.flash.info.benthos.remove.from.protocol")); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveBenthosSubBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import javax.swing.JOptionPane; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove a species batch children. @@ -82,8 +82,8 @@ if (result) { int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editBenthosBatch.action.removeSubBatch.confirm.message"), - _("tutti.editBenthosBatch.action.removeSubBatch.confirm.title"), + t("tutti.editBenthosBatch.action.removeSubBatch.confirm.message"), + t("tutti.editBenthosBatch.action.removeSubBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveIndividualObservationBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ import javax.swing.JOptionPane; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -61,8 +61,8 @@ if (result) { int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editIndividualObservationBatch.action.removeBatch.confirm.message"), - _("tutti.editIndividualObservationBatch.action.removeBatch.confirm.title"), + t("tutti.editIndividualObservationBatch.action.removeBatch.confirm.message"), + t("tutti.editIndividualObservationBatch.action.removeBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveMarineLitterBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import javax.swing.JOptionPane; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove a selected marine litter batch in the table. @@ -67,8 +67,8 @@ if (result) { int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editMarineLitterBatch.action.removeBatch.confirm.message"), - _("tutti.editMarineLitterBatch.action.removeBatch.confirm.title"), + t("tutti.editMarineLitterBatch.action.removeBatch.confirm.message"), + t("tutti.editMarineLitterBatch.action.removeBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -40,7 +40,7 @@ import javax.swing.JOptionPane; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove a species batch and all his children. @@ -67,8 +67,8 @@ if (result) { int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editSpeciesBatch.action.removeBatch.confirm.message"), - _("tutti.editSpeciesBatch.action.removeBatch.confirm.title"), + t("tutti.editSpeciesBatch.action.removeBatch.confirm.message"), + t("tutti.editSpeciesBatch.action.removeBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove all the selected species rows from protocol. @@ -128,7 +128,7 @@ handler.getSpeciesTable().clearSelection(); // notify user - sendMessage(_("tutti.flash.info.species.remove.from.protocol")); + sendMessage(t("tutti.flash.info.species.remove.from.protocol")); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveSpeciesSubBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import javax.swing.JOptionPane; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To remove a species batch children. @@ -82,8 +82,8 @@ if (result) { int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), - _("tutti.editSpeciesBatch.action.removeSubBatch.confirm.message"), - _("tutti.editSpeciesBatch.action.removeSubBatch.confirm.title"), + t("tutti.editSpeciesBatch.action.removeSubBatch.confirm.message"), + t("tutti.editSpeciesBatch.action.removeSubBatch.confirm.title"), JOptionPane.YES_NO_OPTION); result = answer == JOptionPane.YES_OPTION; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import java.util.Collection; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To rename the species for a species batch and all his children. @@ -77,7 +77,7 @@ (CaracteristicQualitativeValue) categoryValue)); selectedSpecies = getHandler().openAddSpeciesDialog( - _("tutti.selectSpecies.title"), + t("tutti.selectSpecies.title"), speciesList ); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import java.util.Collection; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To rename the species for a species batch and all his children. @@ -76,7 +76,7 @@ model.getSpeciesUsed().get((CaracteristicQualitativeValue) categoryValue)); selectedSpecies = getHandler().openAddSpeciesDialog( - _("tutti.selectSpecies.title"), + t("tutti.selectSpecies.title"), speciesList ); 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import javax.swing.JOptionPane; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Saves a cruise @@ -76,12 +76,12 @@ // if so ask user confirmation String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCruise.action.save.vesselChanged.message"), - _("tutti.editCruise.action.save.vesselChanged.help")); + t("tutti.editCruise.action.save.vesselChanged.message"), + t("tutti.editCruise.action.save.vesselChanged.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), htmlMessage, - _("tutti.editCruise.action.save.vesselChanged.title"), + t("tutti.editCruise.action.save.vesselChanged.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); @@ -114,9 +114,9 @@ // not possible, can't removed used gears - String message = _("tutti.persistence.cruise.gearUsedInOperations.error"); + String message = t("tutti.persistence.cruise.gearUsedInOperations.error"); displayWarningMessage( - _("tutti.editCruise.action.save.gearChanged.title"), + t("tutti.editCruise.action.save.gearChanged.title"), "<html><body>" + message + "</body></html>" ); result = false; @@ -125,12 +125,12 @@ // if so ask user confirmation String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.editCruise.action.save.gearChanged.message"), - _("tutti.editCruise.action.save.gearChanged.help")); + t("tutti.editCruise.action.save.gearChanged.message"), + t("tutti.editCruise.action.save.gearChanged.help")); int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), htmlMessage, - _("tutti.editCruise.action.save.gearChanged.title"), + t("tutti.editCruise.action.save.gearChanged.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); @@ -155,10 +155,10 @@ saved = persistenceService.createCruise(bean); model.setId(saved.getId()); - sendMessage(_("tutti.flash.info.cruiseCreated", bean.getName())); + sendMessage(t("tutti.flash.info.cruiseCreated", bean.getName())); } else { saved = persistenceService.saveCruise(bean, updateVessel, updateGear); - sendMessage(_("tutti.flash.info.cruiseSaved", bean.getName())); + sendMessage(t("tutti.flash.info.cruiseSaved", bean.getName())); } context.setProgramId(saved.getProgram().getId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -33,7 +33,7 @@ import fr.ifremer.tutti.ui.swing.content.program.EditProgramUIHandler; import fr.ifremer.tutti.ui.swing.content.program.EditProgramUIModel; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -61,10 +61,10 @@ saved = persistenceService.createProgram(bean); model.setId(saved.getId()); - sendMessage(_("tutti.flash.info.programCreated", bean.getName())); + sendMessage(t("tutti.flash.info.programCreated", bean.getName())); } else { saved = persistenceService.saveProgram(bean); - sendMessage(_("tutti.flash.info.programSaved", bean.getName())); + sendMessage(t("tutti.flash.info.programSaved", bean.getName())); } context.setProgramId(saved.getId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -40,7 +40,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Saves a protocol @@ -101,10 +101,10 @@ saved = persistenceService.createProtocol(bean); model.setId(saved.getId()); - sendMessage(_("tutti.flash.info.protocolCreated", bean.getName())); + sendMessage(t("tutti.flash.info.protocolCreated", bean.getName())); } else { saved = persistenceService.saveProtocol(bean); - sendMessage(_("tutti.flash.info.protocolSaved", bean.getName())); + sendMessage(t("tutti.flash.info.protocolSaved", bean.getName())); } context.setProtocolId(saved.getId()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherBenthosAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Action to select a benthos which is not in the referent list. @@ -64,7 +64,7 @@ List<Species> species = Lists.newArrayList(model.getAllSynonyms()); selectedSpecies = getHandler().openSelectOtherSpeciesDialog( - _("tutti.selectBenthos.title"), species); + t("tutti.selectBenthos.title"), species); if (log.isInfoEnabled()) { log.info("SelectedBenthos: " + selectedSpecies); @@ -86,7 +86,7 @@ String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = getModel().getAllReferentSpeciesByTaxonId().get(taxonId); String decoratedReferent = decorate(selectedSpecies); - sendMessage(_("tutti.flash.info.benthos.replaced", decoratedSynonym, decoratedReferent)); + sendMessage(t("tutti.flash.info.benthos.replaced", decoratedSynonym, decoratedReferent)); getUI().getBenthosComboBox().setSelectedItem(selectedSpecies); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Action to select a species which is not in the referent list. @@ -64,7 +64,7 @@ List<Species> species = Lists.newArrayList(model.getAllSynonyms()); selectedSpecies = getHandler().openSelectOtherSpeciesDialog( - _("tutti.selectSpecies.title"), species); + t("tutti.selectSpecies.title"), species); if (log.isInfoEnabled()) { log.info("SelectedSpecies: " + selectedSpecies); @@ -86,7 +86,7 @@ String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = getModel().getAllReferentSpeciesByTaxonId().get(taxonId); String decoratedReferent = decorate(selectedSpecies); - sendMessage(_("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); + sendMessage(t("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); getUI().getSpeciesComboBox().setSelectedItem(selectedSpecies); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForBenthosBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Enable to select a species to the species selected in the protocol. @@ -69,7 +69,7 @@ species.removeAll(model.getAvailableSpecies()); selectedSpecies = getHandler().openAddSpeciesDialog( - _("tutti.selectSpecies.title"), species); + t("tutti.selectSpecies.title"), species); canContinue = selectedSpecies != null; } return canContinue; @@ -89,7 +89,7 @@ String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); - sendMessage(_("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); + sendMessage(t("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); } if (!availableSpecies.contains(selectedSpecies)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForIndividualObservationBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Enable to select a species to the species selected in the protocol. @@ -71,7 +71,7 @@ species.removeAll(model.getAvailableSpecies()); selectedSpecies = getHandler().openAddSpeciesDialog( - _("tutti.selectSpecies.title"), species); + t("tutti.selectSpecies.title"), species); canContinue = selectedSpecies != null; } return canContinue; @@ -91,7 +91,7 @@ String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); - sendMessage(_("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); + sendMessage(t("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); } if (!availableSpecies.contains(selectedSpecies)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectSpeciesForSpeciesBatchAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Enable to select a species to the species selected in the protocol. @@ -69,7 +69,7 @@ species.removeAll(model.getAvailableSpecies()); selectedSpecies = getHandler().openAddSpeciesDialog( - _("tutti.selectSpecies.title"), species); + t("tutti.selectSpecies.title"), species); canContinue = selectedSpecies != null; } return canContinue; @@ -89,7 +89,7 @@ String taxonId = String.valueOf(selectedSpecies.getReferenceTaxonId()); selectedSpecies = referentsById.get(taxonId); String decoratedReferent = decorate(selectedSpecies, DecoratorService.FROM_PROTOCOL); - sendMessage(_("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); + sendMessage(t("tutti.flash.info.species.replaced", decoratedSynonym, decoratedReferent)); } if (!availableSpecies.contains(selectedSpecies)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import javax.swing.JOptionPane; import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Opens a file chooser, exports the cruise catches into the selected file and open the default email editor. @@ -68,9 +68,9 @@ file = saveFile( "exportCruise-" + cruise.getName(), "pdf", - _("tutti.sendCruiseReport.title.choose.exportFile"), - _("tutti.sendCruiseReport.action.chooseFile"), - "^.+\\.pdf$", _("tutti.common.file.pdf") + t("tutti.sendCruiseReport.title.choose.exportFile"), + t("tutti.sendCruiseReport.action.chooseFile"), + "^.+\\.pdf$", t("tutti.common.file.pdf") ); doAction = file != null; } @@ -101,13 +101,13 @@ try { - TuttiUIUtil.mail(_("tutti.sendCruiseReport.mail.subject", cruise.getName()), - _("tutti.sendCruiseReport.mail.body", cruise.getName(), file.getAbsolutePath())); + TuttiUIUtil.mail(t("tutti.sendCruiseReport.mail.subject", cruise.getName()), + t("tutti.sendCruiseReport.mail.body", cruise.getName(), file.getAbsolutePath())); } catch (ApplicationTechnicalException e) { JOptionPane.showMessageDialog(getContext().getMainUI(), - _("tutti.sendCruiseReport.action.error.mail.message", file), - _("tutti.sendCruiseReport.action.error.mail.title"), + t("tutti.sendCruiseReport.action.error.mail.message", file), + t("tutti.sendCruiseReport.action.error.mail.title"), JOptionPane.WARNING_MESSAGE); } @@ -116,6 +116,6 @@ @Override public void postSuccessAction() { super.postSuccessAction(); - sendMessage(_("tutti.sendCruiseReport.action.success", file)); + sendMessage(t("tutti.sendCruiseReport.action.success", file)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ShowAboutAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -50,7 +50,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To show about panel. @@ -109,8 +109,8 @@ String thirdPartyPath = "META-INF/" + name + "-THIRD-PARTY.txt"; about = new AboutPanel(); - about.setTitle(_("tutti.about.title")); - about.setAboutText(_("tutti.about.message")); + about.setTitle(t("tutti.about.title")); + about.setAboutText(t("tutti.about.message")); TuttiConfiguration config = getConfig(); int currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -122,7 +122,7 @@ years = inceptionYear + ""; } - about.setBottomText(_("tutti.about.bottomText", + about.setBottomText(t("tutti.about.bottomText", config.getOrganizationName(), years, config.getVersion())); @@ -145,7 +145,7 @@ translateArea.setBorder(null); File csvFile = new File(config.getI18nDirectory(), "tutti-i18n.csv"); - String translateText = _("tutti.about.translate.content", csvFile.toURI().toURL()); + String translateText = t("tutti.about.translate.content", csvFile.toURI().toURL()); translateArea.setText(translateText); translatePane.getViewport().add(translateArea); translateArea.addHyperlinkListener(new HyperlinkListener() { @@ -161,7 +161,7 @@ } }); - about.getTabs().add(_("tutti.about.translate.title"), translatePane); + about.getTabs().add(t("tutti.about.translate.title"), translatePane); if (canUpdateApplication || canUpdateData) { @@ -229,7 +229,7 @@ String oldVersion = info.oldVersion; String newVersion = info.newVersion; String i18nKey = "tutti.update." + appName.toLowerCase(); - String appLabel = _(i18nKey); + String appLabel = t(i18nKey); if (log.isInfoEnabled()) { log.info(String.format( @@ -239,14 +239,14 @@ if (newVersion == null) { // no update - params.add(_("tutti.about.update.app.noup.detail", appLabel, oldVersion)); + params.add(t("tutti.about.update.app.noup.detail", appLabel, oldVersion)); } else { // update exists - params.add(_("tutti.about.update.app.up.detail", appLabel, oldVersion, newVersion, appName)); + params.add(t("tutti.about.update.app.up.detail", appLabel, oldVersion, newVersion, appName)); } } - String updateText = _("tutti.about.update.content", urlApplication, urlData, Joiner.on("\n").join(params)); + String updateText = t("tutti.about.update.content", urlApplication, urlData, Joiner.on("\n").join(params)); updateArea.setText(updateText); updatePane.getViewport().add(updateArea); updateArea.addHyperlinkListener(new HyperlinkListener() { @@ -272,7 +272,7 @@ // install db action.setActionDescription( - _("tutti.dbManager.action.installDb.tip")); + t("tutti.dbManager.action.installDb.tip")); } } else if (TuttiReportUpdaterCallBack.REPORT_UPDATE_NAME.equals(appType)) { UpdateReportAction logicAction = getContext().getActionFactory().createLogicAction(getHandler(), UpdateReportAction.class); @@ -284,7 +284,7 @@ UpdateApplicationAction logicAction = getContext().getActionFactory().createLogicAction(getHandler(), UpdateApplicationAction.class); logicAction.setTypes(updateType); - logicAction.setActionDescription(_("tutti.main.action.updateSpecificApplication.tip", updateType.getLabel())); + logicAction.setActionDescription(t("tutti.main.action.updateSpecificApplication.tip", updateType.getLabel())); action = logicAction; } @@ -298,7 +298,7 @@ } } }); - about.getTabs().add(_("tutti.about.update.title"), updatePane); + about.getTabs().add(t("tutti.about.update.title"), updatePane); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -32,7 +32,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Start action. @@ -64,7 +64,7 @@ try { // get action to execute - String content = ApplicationIOUtil.readContent(actionfile, _("tutti.error.read.startActionFile", actionfile)); + String content = ApplicationIOUtil.readContent(actionfile, t("tutti.error.read.startActionFile", actionfile)); content = content.trim(); if (InstallDbAction.class.getName().equals(content)) { @@ -100,7 +100,7 @@ // delete start action file ApplicationIOUtil.deleteFile( actionfile, - _("tutti.error.delete.startActionFile", actionfile)); + t("tutti.error.delete.startActionFile", actionfile)); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateApplicationAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To update jre / i18n or tutti using the {@link ApplicationUpdater} mecanism. @@ -53,7 +53,7 @@ public UpdateApplicationAction(MainUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.main.action.updateApplication.tip")); + setActionDescription(t("tutti.main.action.updateApplication.tip")); types = TuttiApplicationUpdaterCallBack.UpdateType.values(); } @@ -105,7 +105,7 @@ ProgressionModel progressionModel = new ProgressionModel(); context.getActionUI().getModel().setProgressionModel(progressionModel); - progressionModel.setMessage(_("tutti.updateApplication.checkUpdates")); + progressionModel.setMessage(t("tutti.updateApplication.checkUpdates")); TuttiApplicationUpdaterCallBack callback = new TuttiApplicationUpdaterCallBack(this, progressionModel); @@ -126,7 +126,7 @@ } else { - sendMessage(_("tutti.updateApplication.noUpdate")); + sendMessage(t("tutti.updateApplication.noUpdate")); } } } @@ -151,8 +151,8 @@ // tell user restart will be done - getHandler().showSuccessMessage(_("tutti.updateApplication.title.success"), - _("tutti.updateApplication.message.success")); + getHandler().showSuccessMessage(t("tutti.updateApplication.title.success"), + t("tutti.updateApplication.message.success")); CloseApplicationAction action = getContext().getActionFactory().createLogicAction( getHandler(), CloseApplicationAction.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateDbAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import java.io.File; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To update - install database. @@ -56,7 +56,7 @@ public UpdateDbAction(MainUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.dbManager.action.upgradeDb.tip")); + setActionDescription(t("tutti.dbManager.action.upgradeDb.tip")); } @Override @@ -89,12 +89,12 @@ // ask user if it wants to do the update String htmlMessage = String.format( AbstractTuttiUIHandler.CONFIRMATION_FORMAT, - _("tutti.dbManager.updatedb.found", updateDbVersion.newVersion), - _("tutti.common.askBeforeUpdate.help")); + t("tutti.dbManager.updatedb.found", updateDbVersion.newVersion), + t("tutti.common.askBeforeUpdate.help")); int i = JOptionPane.showConfirmDialog( getHandler().getUI(), htmlMessage, - _("tutti.dbManager.title.confirm.updatedb"), + t("tutti.dbManager.title.confirm.updatedb"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); @@ -119,7 +119,7 @@ File dest = new File(config.getBasedir(), "NEW"); ProgressionModel progressionModel = new ProgressionModel(); context.getActionUI().getModel().setProgressionModel(progressionModel); - progressionModel.setMessage(_("tutti.dbManager.action.upgradeDb.check")); + progressionModel.setMessage(t("tutti.dbManager.action.upgradeDb.check")); TuttiDbUpdaterCallBack callback = new TuttiDbUpdaterCallBack(this, progressionModel); ApplicationUpdater up = new ApplicationUpdater(); @@ -133,10 +133,10 @@ if (callback.isDbUpdated()) { - sendMessage(_("tutti.dbManager.action.upgradeDb.done", updateDbVersion.newVersion)); + sendMessage(t("tutti.dbManager.action.upgradeDb.done", updateDbVersion.newVersion)); } else { - sendMessage(_("tutti.dbManager.action.upgradeDb.upToDate")); + sendMessage(t("tutti.dbManager.action.upgradeDb.upToDate")); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/UpdateReportAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To update reports using the {@link ApplicationUpdater} mecanism. @@ -53,7 +53,7 @@ public UpdateReportAction(MainUIHandler handler) { super(handler, true); - setActionDescription(_("tutti.main.action.updateReport.tip")); + setActionDescription(t("tutti.main.action.updateReport.tip")); } protected boolean reload; @@ -96,7 +96,7 @@ ProgressionModel progressionModel = new ProgressionModel(); context.getActionUI().getModel().setProgressionModel(progressionModel); - progressionModel.setMessage(_("tutti.updateApplication.checkUpdates")); + progressionModel.setMessage(t("tutti.updateApplication.checkUpdates")); TuttiReportUpdaterCallBack callback = new TuttiReportUpdaterCallBack(this, progressionModel); @@ -115,7 +115,7 @@ } else { - sendMessage(_("tutti.updateReport.noUpdate")); + sendMessage(t("tutti.updateReport.noUpdate")); } } } @@ -136,8 +136,8 @@ // tell user restart will be done - getHandler().showSuccessMessage(_("tutti.updateReport.title.success"), - _("tutti.updateReport.message.success")); + getHandler().showSuccessMessage(t("tutti.updateReport.title.success"), + t("tutti.updateReport.message.success")); CloseApplicationAction action = getContext().getActionFactory().createLogicAction( getHandler(), CloseApplicationAction.class); 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 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -74,7 +74,7 @@ import java.net.URL; import java.util.Locale; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -101,9 +101,9 @@ String result; if (connected) { FeedReader ichtyometerReader = getModel().getIchtyometerReader(); - result =_("tutti.ichtyometer.status.connected.tip", ichtyometerReader.getClientName()); + result =t("tutti.ichtyometer.status.connected.tip", ichtyometerReader.getClientName()); } else { - result=_("tutti.ichtyometer.status.not.connected.tip"); + result=t("tutti.ichtyometer.status.not.connected.tip"); } return result; } @@ -380,28 +380,28 @@ case CONFIG: screenUI = new TuttiConfigUI(ui); - screenTitle = _("tutti.config.title"); + screenTitle = t("tutti.config.title"); icon = ui.getMenuFileConfiguration().getIcon(); break; case EDIT_SAMPLE_CATEGORY_MODEL: screenUI = new EditSampleCategoryModelUI(ui); - screenTitle = _("tutti.editSampleCategoryModel.title"); + screenTitle = t("tutti.editSampleCategoryModel.title"); icon = ui.getMenuEditSampleCategoryModel().getIcon(); break; default: case MANAGE_DB: screenUI = new DbManagerUI(ui); - screenTitle = _("tutti.dbMabager.title"); + screenTitle = t("tutti.dbMabager.title"); icon = ui.getMenuFileManageDb().getIcon(); break; case SELECT_CRUISE: screenUI = new SelectCruiseUI(ui); - screenTitle = _("tutti.selectCruise.title"); + screenTitle = t("tutti.selectCruise.title"); icon = ui.getMenuActionSelectCruise().getIcon(); break; @@ -435,7 +435,7 @@ case EDIT_FISHING_OPERATION: - screenTitle = _("tutti.fishingOperations.title.edit.operations", getSelectedCruiseTitle()); + screenTitle = t("tutti.fishingOperations.title.edit.operations", getSelectedCruiseTitle()); icon = ui.getMenuActionEditCatches().getIcon(); screenUI = new FishingOperationsUI(ui); @@ -443,7 +443,7 @@ case IMPORT_TEMPORARY_REFERENTIAL: - screenTitle = _("tutti.manageTemporaryReferential.title"); + screenTitle = t("tutti.manageTemporaryReferential.title"); screenUI = new ManageTemporaryReferentialUI(ui); icon = ui.getMenuImportTemporaryReferential().getIcon(); break; @@ -451,14 +451,14 @@ case VALIDATE_CRUISE: screenUI = new ValidateCruiseUI(ui); - screenTitle = _("tutti.fishingOperations.title.validate.operations", getSelectedCruiseTitle()); + screenTitle = t("tutti.fishingOperations.title.validate.operations", getSelectedCruiseTitle()); icon = ui.getMenuActionValidateCatches().getIcon(); break; case REPORT: screenUI = new ReportUI(ui); - screenTitle = _("tutti.report.title"); + screenTitle = t("tutti.report.title"); icon = ui.getMenuActionGenerateCruiseReport().getIcon(); break; } @@ -490,7 +490,7 @@ String title = getSelectedCruiseTitle(); - ui.setTitle(_("tutti.main.title.application", + ui.setTitle(t("tutti.main.title.application", getConfig().getVersion(), title)); } @@ -509,7 +509,7 @@ Program program = getDataContext().getProgram(); - title = _("tutti.main.title.selectedProgram", program.getName()) + " / "; + title = t("tutti.main.title.selectedProgram", program.getName()) + " / "; if (context.isCruiseFilled()) { @@ -517,20 +517,20 @@ Cruise cruise = getDataContext().getCruise(); if (cruise != null) { - title += _("tutti.main.title.selectedCruise", cruise.getName()); + title += t("tutti.main.title.selectedCruise", cruise.getName()); } } else { // no selected cruise - title += _("tutti.main.title.noSelectedCruise"); + title += t("tutti.main.title.noSelectedCruise"); } } else { // no program selected (so neither cruise) - title = _("tutti.main.title.noSelectedProgram"); + title = t("tutti.main.title.noSelectedProgram"); } @@ -541,18 +541,18 @@ // selected protocol TuttiProtocol protocol = getDataContext().getProtocol(); - title += _("tutti.main.title.selectedProtocol", protocol.getName()); + title += t("tutti.main.title.selectedProtocol", protocol.getName()); } else { // no selected protocol - title += _("tutti.main.title.noSelectedProtocol"); + title += t("tutti.main.title.noSelectedProtocol"); } } else { // no db loaded - title = _("tutti.main.title.nodb"); + title = t("tutti.main.title.nodb"); } return title; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Model of table of {@link SampleCategoryModelEntry}. @@ -43,13 +43,13 @@ public static final ColumnIdentifier<EditSampleCategoryModelRowModel> CARACTERISTIC = ColumnIdentifier.newId( EditSampleCategoryModelRowModel.PROPERTY_CARACTERISTIC, - n_("tutti.editSampleCategoryModel.table.header.caracteristic"), - n_("tutti.editSampleCategoryModel.table.header.caracteristic.tip")); + n("tutti.editSampleCategoryModel.table.header.caracteristic"), + n("tutti.editSampleCategoryModel.table.header.caracteristic.tip")); public static final ColumnIdentifier<EditSampleCategoryModelRowModel> LABEL = ColumnIdentifier.newId( EditSampleCategoryModelRowModel.PROPERTY_LABEL, - n_("tutti.editSampleCategoryModel.table.header.label"), - n_("tutti.editSampleCategoryModel.table.header.label.tip")); + n("tutti.editSampleCategoryModel.table.header.label"), + n("tutti.editSampleCategoryModel.table.header.label.tip")); public EditSampleCategoryModelTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,7 +47,7 @@ import java.beans.PropertyChangeListener; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of ui {@link EditSampleCategoryModelUI}. @@ -201,8 +201,8 @@ boolean result = quitScreen( getModel().isValid(), getModel().isModify(), - _("tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel"), - _("tutti.editProtocol.askSaveBeforeLeaving.saveSampleCategoryModel"), + t("tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel"), + t("tutti.editProtocol.askSaveBeforeLeaving.saveSampleCategoryModel"), ui.getSaveButton().getAction() ); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -43,8 +43,8 @@ import javax.swing.JComponent; import java.awt.BorderLayout; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -79,7 +79,7 @@ config.getConfigFile()); helper.registerCallBack( - CALLBACK_UI, n_("tutti.config.action.reload.ui"), + CALLBACK_UI, n("tutti.config.action.reload.ui"), SwingUtil.createActionIcon("reload-ui"), new Runnable() { @@ -89,7 +89,7 @@ } } ).registerCallBack( - CALLBACK_APPLICATION, n_("tutti.config.action.reload.application"), + CALLBACK_APPLICATION, n("tutti.config.action.reload.application"), SwingUtil.createActionIcon("reload-application"), new Runnable() { @@ -99,7 +99,7 @@ } } ).registerCallBack( - CALLBACK_SHORTCUT, n_("tutti.config.action.reload.actions"), + CALLBACK_SHORTCUT, n("tutti.config.action.reload.actions"), SwingUtil.createActionIcon("reload-shortcut"), new Runnable() { @@ -112,23 +112,23 @@ // Application category - helper.addCategory(n_("tutti.config.category.applications"), - n_("tutti.config.category.applications.description"), + helper.addCategory(n("tutti.config.category.applications"), + n("tutti.config.category.applications.description"), CALLBACK_APPLICATION) .addOption(TuttiConfigurationOption.CSV_SEPARATOR) - .setOptionShortLabel(_("tutti.config.option.csv.separator.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.csv.separator.shortLabel")) .addOption(TuttiConfigurationOption.UI_CONFIG_FILE) - .setOptionShortLabel(_("tutti.config.option.ui.config.file.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.config.file.shortLabel")) .addOption(TuttiConfigurationOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE) - .setOptionShortLabel(_("tutti.config.option.weights.rate.difference.totalAndSorted.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.weights.rate.difference.totalAndSorted.shortLabel")) .addOption(TuttiConfigurationOption.MAX_INDIVIDUAL_OBSERVATION_ROW_TO_CREATE) - .setOptionShortLabel(_("tutti.config.option.ui.individualObservationRowsToCreate.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.individualObservationRowsToCreate.shortLabel")) .addOption(TuttiConfigurationOption.FULL_BLUETOOTH_SCAN) - .setOptionShortLabel(_("tutti.config.option.ui.fullBluetoothScan.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.fullBluetoothScan.shortLabel")) ; @@ -138,132 +138,132 @@ VesselTableCell vesselTableCellComponent = new VesselTableCell(context); helper.addOption(TuttiConfigurationOption.TREMIE_CAROUSSEL_VESSEL_ID) - .setOptionShortLabel(_("tutti.config.option.tremieCarousselVessel.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.tremieCarousselVessel.shortLabel")) .setOptionEditor(vesselTableCellComponent.getNewTableCellEditor()) .setOptionRenderer(vesselTableCellComponent.getNewTableCellRenderer()); TuttiLocationTableCell tuttiLocationTableCellComponent = new TuttiLocationTableCell(context); helper.addOption(TuttiConfigurationOption.EXPORT_COUNTRY_ID) - .setOptionShortLabel(_("tutti.config.option.export.countryId.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.export.countryId.shortLabel")) .setOptionEditor(tuttiLocationTableCellComponent.getNewTableCellEditor()) .setOptionRenderer(tuttiLocationTableCellComponent.getNewTableCellRenderer()); } // UI category - helper.addCategory(n_("tutti.config.category.ui"), - n_("tutti.config.category.ui.description"), + helper.addCategory(n("tutti.config.category.ui"), + n("tutti.config.category.ui.description"), CALLBACK_UI) .addOption(TuttiConfigurationOption.COLOR_ALTERNATE_ROW) - .setOptionShortLabel(_("tutti.config.option.ui.color.alternateRow.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.alternateRow.shortLabel")) .addOption(TuttiConfigurationOption.COLOR_SELECTED_ROW) - .setOptionShortLabel(_("tutti.config.option.ui.color.selectedRow.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.selectedRow.shortLabel")) .addOption(TuttiConfigurationOption.COLOR_ROW_INVALID) - .setOptionShortLabel(_("tutti.config.option.ui.color.rowInvalid.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.rowInvalid.shortLabel")) .addOption(TuttiConfigurationOption.COLOR_ROW_READ_ONLY) - .setOptionShortLabel(_("tutti.config.option.ui.color.rowReadOnly.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.rowReadOnly.shortLabel")) .addOption(TuttiConfigurationOption.COLOR_CELL_WITH_VALUE) - .setOptionShortLabel(_("tutti.config.option.ui.color.cellWithValue.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.cellWithValue.shortLabel")) .addOption(TuttiConfigurationOption.COLOR_ROW_TO_CONFIRM) - .setOptionShortLabel(_("tutti.config.option.ui.color.rowToConfirm.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.rowToConfirm.shortLabel")) .addOption(TuttiConfigurationOption.COLOR_COMPUTED_WEIGHTS) - .setOptionShortLabel(_("tutti.config.option.ui.color.computedWeights.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.computedWeights.shortLabel")) .addOption(TuttiConfigurationOption.COLOR_BLOCKING_LAYER) - .setOptionShortLabel(_("tutti.config.option.ui.color.blockingLayer.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.color.blockingLayer.shortLabel")) .addOption(TuttiConfigurationOption.DATE_FORMAT) - .setOptionShortLabel(_("tutti.config.option.ui.dateFormat.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.ui.dateFormat.shortLabel")) .addOption(TuttiConfigurationOption.COORDINATE_EDITOR_TYPE) - .setOptionShortLabel(_("tutti.config.option.ui.coordinateEditorType.shortLabel")); + .setOptionShortLabel(t("tutti.config.option.ui.coordinateEditorType.shortLabel")); // Weight Unit category - helper.addCategory(n_("tutti.config.category.weightUnit"), - n_("tutti.config.category.weightUnit.description"), + helper.addCategory(n("tutti.config.category.weightUnit"), + n("tutti.config.category.weightUnit.description"), CALLBACK_UI) .addOption(TuttiConfigurationOption.WEIGHT_UNIT_SPECIES) - .setOptionShortLabel(_("tutti.config.option.weight.unit.species.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.weight.unit.species.shortLabel")) .addOption(TuttiConfigurationOption.WEIGHT_UNIT_BENTHOS) - .setOptionShortLabel(_("tutti.config.option.weight.unit.benthos.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.weight.unit.benthos.shortLabel")) .addOption(TuttiConfigurationOption.WEIGHT_UNIT_MARINE_LITTER) - .setOptionShortLabel(_("tutti.config.option.weight.unit.marineLitter.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.weight.unit.marineLitter.shortLabel")) .addOption(TuttiConfigurationOption.WEIGHT_UNIT_INDIVIDUAL_OBSERVATION) - .setOptionShortLabel(_("tutti.config.option.weight.unit.individualObservation.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.weight.unit.individualObservation.shortLabel")) .addOption(TuttiConfigurationOption.WEIGHT_UNIT_ACCIDENTAL_CATCH) - .setOptionShortLabel(_("tutti.config.option.weight.unit.accidentalCatch.shortLabel")); + .setOptionShortLabel(t("tutti.config.option.weight.unit.accidentalCatch.shortLabel")); // Technical category - helper.addCategory(n_("tutti.config.category.technical"), - n_("tutti.config.category.technical.description")) + helper.addCategory(n("tutti.config.category.technical"), + n("tutti.config.category.technical.description")) .addOption(TuttiConfigurationOption.BASEDIR) - .setOptionShortLabel(_("tutti.config.option.basedir.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.basedir.shortLabel")) .addOption(TuttiConfigurationOption.DATA_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.data.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.data.directory.shortLabel")) .addOption(TuttiConfigurationOption.TMP_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.tmp.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.tmp.directory.shortLabel")) .addOption(TuttiConfigurationOption.I18N_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.i18n.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.i18n.directory.shortLabel")) .addOption(TuttiConfigurationOption.HELP_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.help.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.help.directory.shortLabel")) .addOption(TuttiConfigurationOption.REPORT_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.service.report.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.service.report.directory.shortLabel")) .addOption(TuttiConfigurationOption.REPORT_LOG_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.service.report.log.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.service.report.log.directory.shortLabel")) .addOption(TuttiConfigurationOption.DB_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.persistence.db.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.db.directory.shortLabel")) .addOption(TuttiConfigurationOption.DB_ATTACHMENT_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.persistence.db.attachment.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.db.attachment.directory.shortLabel")) .addOption(TuttiConfigurationOption.DB_PROTOCOL_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.persistence.db.protocol.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.db.protocol.directory.shortLabel")) .addOption(TuttiConfigurationOption.DB_CACHE_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.persistence.db.cache.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.db.cache.directory.shortLabel")) .addOption(TuttiConfigurationOption.DB_CONFIGURATION_PATH) - .setOptionShortLabel(_("tutti.config.option.persistence.db.configurationPath.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.db.configurationPath.shortLabel")) .addOption(TuttiConfigurationOption.DB_ENUMERATION_PATH) - .setOptionShortLabel(_("tutti.config.option.persistence.db.enumerationPath.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.db.enumerationPath.shortLabel")) .addOption(TuttiConfigurationOption.JDBC_URL) - .setOptionShortLabel(_("tutti.config.option.persistence.jdbc.url.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.jdbc.url.shortLabel")) .addOption(TuttiConfigurationOption.SITE_URL) - .setOptionShortLabel(_("tutti.config.option.site.url.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.site.url.shortLabel")) .addOption(TuttiConfigurationOption.DB_BACKUP_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.persistence.db.backup.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.persistence.db.backup.directory.shortLabel")) .addOption(TuttiConfigurationOption.REPORT_BACKUP_DIRECTORY) - .setOptionShortLabel(_("tutti.config.option.service.report.backup.directory.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.service.report.backup.directory.shortLabel")) .addOption(TuttiConfigurationOption.UPDATE_APPLICATION_URL) - .setOptionShortLabel(_("tutti.config.option.update.application.url.shortLabel")) + .setOptionShortLabel(t("tutti.config.option.update.application.url.shortLabel")) .addOption(TuttiConfigurationOption.UPDATE_DATA_URL) - .setOptionShortLabel(_("tutti.config.option.update.data.url.shortLabel")); + .setOptionShortLabel(t("tutti.config.option.update.data.url.shortLabel")); helper.setFinalizer(new MainCallBackFinalizer(CALLBACK_APPLICATION)); @@ -279,7 +279,7 @@ }); ConfigUI configUI = helper.buildUI( getUI(), - n_("tutti.config.category.applications")); + n("tutti.config.category.applications")); configUI.getHandler().setTopContainer(getUI()); getUI().add(configUI, BorderLayout.CENTER); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -85,7 +85,7 @@ #nameField { text: {model.getName()}; - _validatorLabel: {_("tutti.editCruise.field.name")}; + _validatorLabel: {t("tutti.editCruise.field.name")}; _help: {"tutti.editCruise.field.name.help"}; } @@ -98,7 +98,7 @@ #surveyPartField { text: {model.getSurveyPart()}; - _validatorLabel: {_("tutti.editCruise.field.surveyPart")}; + _validatorLabel: {t("tutti.editCruise.field.surveyPart")}; _help: {"tutti.editCruise.field.surveyPart.help"}; } @@ -112,7 +112,7 @@ #departureLocationComboBox { property: departureLocation; selectedItem: {model.getDepartureLocation()}; - _validatorLabel: {_("tutti.editCruise.field.departureLocation")}; + _validatorLabel: {t("tutti.editCruise.field.departureLocation")}; _help: {"tutti.editCruise.field.departureLocation.help"}; } @@ -126,7 +126,7 @@ #returnLocationComboBox { property: returnLocation; selectedItem: {model.getReturnLocation()}; - _validatorLabel: {_("tutti.editCruise.field.returnLocation")}; + _validatorLabel: {t("tutti.editCruise.field.returnLocation")}; _help: {"tutti.editCruise.field.returnLocation.help"}; } @@ -140,7 +140,7 @@ #programComboBox { property: program; selectedItem: {model.getProgram()}; - _validatorLabel: {_("tutti.editCruise.field.program")}; + _validatorLabel: {t("tutti.editCruise.field.program")}; _help: {"tutti.editCruise.field.program.help"}; } @@ -153,7 +153,7 @@ #beginDateField { date: {model.getBeginDate()}; - _validatorLabel: {_("tutti.editCruise.field.beginDate")}; + _validatorLabel: {t("tutti.editCruise.field.beginDate")}; _help: {"tutti.editCruise.field.beginDate.help"}; } @@ -166,7 +166,7 @@ #endDateField { date: {model.getEndDate()}; - _validatorLabel: {_("tutti.editCruise.field.endDate")}; + _validatorLabel: {t("tutti.editCruise.field.endDate")}; _help: {"tutti.editCruise.field.endDate.help"}; } @@ -182,7 +182,7 @@ model: {model.getMultirigNumber()}; useFloat: false; numberPattern: {INT_1_DIGITS_PATTERN}; - _validatorLabel: {_("tutti.editCruise.field.multirigNumber")}; + _validatorLabel: {t("tutti.editCruise.field.multirigNumber")}; _help: {"tutti.editCruise.field.multirigNumber.help"}; } @@ -229,44 +229,44 @@ property: vessel; selectedItem: {model.getVessel()}; toolTipText: "tutti.editCruise.field.vessel.tip"; - _validatorLabel: {_("tutti.editCruise.field.vessel")}; + _validatorLabel: {t("tutti.editCruise.field.vessel")}; _help: {"tutti.editCruise.field.vessel.help"}; } #gearList { property: gear; - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.gear"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCruise.field.gear"))}; useMultiSelect: true; - _validatorLabel: {_("tutti.editCruise.field.gear")}; + _validatorLabel: {t("tutti.editCruise.field.gear")}; toolTipText: "tutti.editCruise.field.gear.tip"; _help: {"tutti.editCruise.field.gear.help"}; } #headOfMissionList { property: headOfMission; - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.headOfMission"))}; - _validatorLabel: {_("tutti.editCruise.field.headOfMission")}; + border: {BorderFactory.createTitledBorder(t("tutti.editCruise.field.headOfMission"))}; + _validatorLabel: {t("tutti.editCruise.field.headOfMission")}; toolTipText: "tutti.editCruise.field.headOfMission.tip"; _help: {"tutti.editCruise.field.headOfMission.help"}; } #headOfSortRoomList { property: headOfSortRoom; - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.headOfSortRoom"))}; - _validatorLabel: {_("tutti.editCruise.field.headOfSortRoom")}; + border: {BorderFactory.createTitledBorder(t("tutti.editCruise.field.headOfSortRoom"))}; + _validatorLabel: {t("tutti.editCruise.field.headOfSortRoom")}; toolTipText: "tutti.editCruise.field.headOfSortRoom.tip"; _help: {"tutti.editCruise.field.headOfSortRoom.help"}; } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.editCruise.field.comment"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCruise.field.comment"))}; toolTipText: "tutti.editCruise.field.comment.tip"; _help: {"tutti.editCruise.field.comment.help"}; } #commentField { text: {model.getComment()}; - _validatorLabel: {_("tutti.editCruise.field.comment")}; + _validatorLabel: {t("tutti.editCruise.field.comment")}; } #saveButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,7 +47,7 @@ javax.swing.JSeparator javax.swing.SwingConstants - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -62,7 +62,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of UI {@link EditCruiseUI}. @@ -83,9 +83,9 @@ String result; if (exist) { - result = _("tutti.editCruise.title.edit.cruise"); + result = t("tutti.editCruise.title.edit.cruise"); } else { - result = _("tutti.editCruise.title.create.cruise"); + result = t("tutti.editCruise.title.create.cruise"); } return result; } @@ -431,8 +431,8 @@ boolean result = quitScreen( getModel().isValid(), getModel().isModify(), - _("tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise"), - _("tutti.editCruise.askSaveBeforeLeaving.saveCruise"), + t("tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise"), + t("tutti.editCruise.askSaveBeforeLeaving.saveCruise"), ui.getSaveButton().getAction() ); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -26,7 +26,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin <kmorin(a)codelutin.com> @@ -38,13 +38,13 @@ public static final ColumnIdentifier<GearCaracteristicsEditorRowModel> KEY = ColumnIdentifier.newId( GearCaracteristicsEditorRowModel.PROPERTY_KEY, - n_("tutti.gearCaracteristicsEditorTable.table.header.key"), - n_("tutti.gearCaracteristicsEditorTable.table.header.key")); + n("tutti.gearCaracteristicsEditorTable.table.header.key"), + n("tutti.gearCaracteristicsEditorTable.table.header.key")); public static final ColumnIdentifier<GearCaracteristicsEditorRowModel> VALUE = ColumnIdentifier.newId( GearCaracteristicsEditorRowModel.PROPERTY_VALUE, - n_("tutti.gearCaracteristicsEditorTable.table.header.value"), - n_("tutti.gearCaracteristicsEditorTable.table.header.value")); + n("tutti.gearCaracteristicsEditorTable.table.header.value"), + n("tutti.gearCaracteristicsEditorTable.table.header.value")); public GearCaracteristicsEditorTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -62,7 +62,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -237,7 +237,7 @@ } else if (value instanceof MessageTreeNode) { MessageTreeNode node = (MessageTreeNode) value; - String text = _(String.valueOf(node.getUserObject())); + String text = t(String.valueOf(node.getUserObject())); label.setText(text); label.setToolTipText(text); String iconName = node.getScope().toString().toLowerCase(); @@ -268,7 +268,7 @@ validationResult.getMessagesForScope(NuitonValidatorScope.WARNING)); if (messageNb == 0) { - addMessages(NuitonValidatorScope.INFO, Lists.newArrayList(_("tutti.validator.info.operation.noError"))); + addMessages(NuitonValidatorScope.INFO, Lists.newArrayList(t("tutti.validator.info.operation.noError"))); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -32,7 +32,7 @@ javax.swing.border.EmptyBorder - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -43,8 +43,8 @@ import java.beans.PropertyChangeListener; import java.util.Map; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -78,21 +78,21 @@ String title; - caracteristics.put(_("tutti.dbManager.caracteristic.url"), jdbcUrl); + caracteristics.put(t("tutti.dbManager.caracteristic.url"), jdbcUrl); if (dbLoaded) { Version dbVersion = getContext().getPersistenceService().getDbVersion(); // db loaded - title = n_("tutti.dbManager.info.db.loaded"); + title = n("tutti.dbManager.info.db.loaded"); - caracteristics.put(_("tutti.dbManager.caracteristic.schemaVersion"), dbVersion.toString()); + caracteristics.put(t("tutti.dbManager.caracteristic.schemaVersion"), dbVersion.toString()); } else { // no db loaded - title = n_("tutti.dbManager.info.no.db.loaded"); + title = n("tutti.dbManager.info.no.db.loaded"); } // get referential version @@ -108,9 +108,9 @@ String currentReferentialVersion = updateDbVersion.oldVersion; String newReferentialVersion = updateDbVersion.newVersion; - caracteristics.put(_("tutti.dbManager.caracteristic.referentialVersion"), currentReferentialVersion); + caracteristics.put(t("tutti.dbManager.caracteristic.referentialVersion"), currentReferentialVersion); if (newReferentialVersion != null) { - caracteristics.put(_("tutti.dbManager.caracteristic.lastReferentialVersion"), newReferentialVersion); + caracteristics.put(t("tutti.dbManager.caracteristic.lastReferentialVersion"), newReferentialVersion); } } @@ -124,12 +124,12 @@ } caracteristicsToString.append("</ul>"); - message = _(title, caracteristicsToString); + message = t(title, caracteristicsToString); } else { // db does not exist - message = _("tutti.dbManager.info.no.db.exist"); + message = t("tutti.dbManager.info.no.db.exist"); } String result = "<html><body>" + message + "</body></html>"; getUI().getInformationArea().setText(result); @@ -153,9 +153,9 @@ Boolean dbExist = (Boolean) evt.getNewValue(); String mnemonic; if (dbExist) { - mnemonic = _("tutti.dbManager.action.reinstallDb.mnemonic"); + mnemonic = t("tutti.dbManager.action.reinstallDb.mnemonic"); } else { - mnemonic = _("tutti.dbManager.action.installDb.mnemonic"); + mnemonic = t("tutti.dbManager.action.installDb.mnemonic"); } if (StringUtils.isNotBlank(mnemonic)) { DbManagerUIHandler.this.ui.getInstallOrReinstallDbButton().setMnemonic(mnemonic.charAt(0)); @@ -193,9 +193,9 @@ public String getInstallButtonText(boolean dbExist) { String result; if (dbExist) { - result = _("tutti.dbManager.action.reinstallDb"); + result = t("tutti.dbManager.action.reinstallDb"); } else { - result = _("tutti.dbManager.action.installDb"); + result = t("tutti.dbManager.action.installDb"); } return result; } @@ -203,9 +203,9 @@ public String getInstallButtonTip(boolean dbExist) { String result; if (dbExist) { - result = _("tutti.dbManager.action.reinstallDb.tip"); + result = t("tutti.dbManager.action.reinstallDb.tip"); } else { - result = _("tutti.dbManager.action.installDb.tip"); + result = t("tutti.dbManager.action.installDb.tip"); } return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -53,7 +53,7 @@ property: program; selectedItem: {model.getProgram()}; enabled: {!programCombobox.isEmpty()}; - _validatorLabel: {_("tutti.selectCruise.field.program")}; + _validatorLabel: {t("tutti.selectCruise.field.program")}; _help: {"tutti.selectCruise.field.program.help"}; } @@ -100,7 +100,7 @@ property: cruise; selectedItem: {model.getCruise()}; enabled: {!cruiseCombobox.isEmpty()}; - _validatorLabel: {_("tutti.selectCruise.field.cruise")}; + _validatorLabel: {t("tutti.selectCruise.field.cruise")}; _help: {"tutti.selectCruise.field.cruise.help"}; } @@ -164,7 +164,7 @@ property: protocol; selectedItem: {model.getProtocol()}; enabled: {!protocolCombobox.isEmpty()}; - _validatorLabel: {_("tutti.selectCruise.field.protocol")}; + _validatorLabel: {t("tutti.selectCruise.field.protocol")}; _help: {"tutti.selectCruise.field.protocol.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -101,7 +101,7 @@ #stationNumberField { text: {model.getStationNumber()}; - _validatorLabel: {_("tutti.editFishingOperation.field.stationNumber")}; + _validatorLabel: {t("tutti.editFishingOperation.field.stationNumber")}; _selectOnFocus: {true}; _help: {"tutti.editFishingOperation.field.stationNumber.help"}; } @@ -118,7 +118,7 @@ model: {model.getFishingOperationNumber()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; - _validatorLabel: {_("tutti.editFishingOperation.field.fishingOperationNumber")}; + _validatorLabel: {t("tutti.editFishingOperation.field.fishingOperationNumber")}; _help: {"tutti.editFishingOperation.field.fishingOperationNumber.help"}; } @@ -132,7 +132,7 @@ #strataComboBox { property: strata; selectedItem: {model.getStrata()}; - _validatorLabel: {_("tutti.editFishingOperation.field.strata")}; + _validatorLabel: {t("tutti.editFishingOperation.field.strata")}; _help: {"tutti.editFishingOperation.field.strata.help"}; } @@ -146,7 +146,7 @@ #subStrataComboBox { property: subStrata; selectedItem: {model.getSubStrata()}; - _validatorLabel: {_("tutti.editFishingOperation.field.subStrata")}; + _validatorLabel: {t("tutti.editFishingOperation.field.subStrata")}; _help: {"tutti.editFishingOperation.field.subStrata.help"}; } @@ -160,7 +160,7 @@ #locationComboBox { property: location; selectedItem: {model.getLocation()}; - _validatorLabel: {_("tutti.editFishingOperation.field.location")}; + _validatorLabel: {t("tutti.editFishingOperation.field.location")}; _help: {"tutti.editFishingOperation.field.location.help"}; } @@ -209,7 +209,7 @@ } #traitVesselPanel { - border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.pane.other"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editFishingOperation.pane.other"))}; } #vesselLabel { @@ -237,7 +237,7 @@ #gearComboBox { property: gear; selectedItem: {model.getGear()}; - _validatorLabel: {_("tutti.editFishingOperation.field.gear")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gear")}; _help: {"tutti.editFishingOperation.field.gear.help"}; } @@ -250,7 +250,7 @@ #multirigAggregationField { text: {model.getMultirigAggregation()}; - _validatorLabel: {_("tutti.editFishingOperation.field.multirigAggregation")}; + _validatorLabel: {t("tutti.editFishingOperation.field.multirigAggregation")}; _help: {"tutti.editFishingOperation.field.multirigAggregation.help"}; } @@ -299,10 +299,10 @@ #secondaryVesselList { property: secondaryVessel; - border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.field.secondaryVessel"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editFishingOperation.field.secondaryVessel"))}; useMultiSelect: false; showSelectPopupEnabled: false; - _validatorLabel: {_("tutti.editFishingOperation.field.secondaryVessel")}; + _validatorLabel: {t("tutti.editFishingOperation.field.secondaryVessel")}; toolTipText: "tutti.editFishingOperation.field.secondaryVessel.tip"; _help: {"tutti.editFishingOperation.field.secondaryVessel.help"}; } @@ -349,7 +349,7 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingStartLatitude")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLatitude")}; } #gearShootingStartLatitudeDMSField { @@ -358,8 +358,8 @@ propertyMinute: gearShootingStartLatitudeDmsMinute; propertySecond: gearShootingStartLatitudeDmsSecond; value: {model.getGearShootingStartLatitudeDms()}; - showResetTip: {_("tutti.coordinate.action.reset.latitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingStartLatitude")}; + showResetTip: {t("tutti.coordinate.action.reset.latitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLatitude")}; } #gearShootingStartLatitudeDMDField { @@ -368,8 +368,8 @@ propertyMinute: gearShootingStartLatitudeDmdMinute; propertyDecimal : gearShootingStartLatitudeDmdDecimal; value: {model.getGearShootingStartLatitudeDmd()}; - showResetTip: {_("tutti.coordinate.action.reset.latitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingStartLatitude")}; + showResetTip: {t("tutti.coordinate.action.reset.latitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLatitude")}; } /****************************************************************************** @@ -388,7 +388,7 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingStartLongitude")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLongitude")}; } #gearShootingStartLongitudeDMSField { @@ -398,8 +398,8 @@ propertySecond: gearShootingStartLongitudeDmsSecond; _longitudeEditor: {true}; value: {model.getGearShootingStartLongitudeDms()}; - showResetTip: {_("tutti.coordinate.action.reset.longitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingStartLongitude")}; + showResetTip: {t("tutti.coordinate.action.reset.longitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLongitude")}; } #gearShootingStartLongitudeDMDField { @@ -409,8 +409,8 @@ propertyDecimal: gearShootingStartLongitudeDmdDecimal; _longitudeEditor: {true}; value: {model.getGearShootingStartLongitudeDmd()}; - showResetTip: {_("tutti.coordinate.action.reset.longitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingStartLongitude")}; + showResetTip: {t("tutti.coordinate.action.reset.longitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLongitude")}; } /****************************************************************************** @@ -429,7 +429,7 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingEndLatitude")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLatitude")}; } #gearShootingEndLatitudeDMSField { @@ -438,8 +438,8 @@ propertyMinute: gearShootingEndLatitudeDmsMinute; propertySecond: gearShootingEndLatitudeDmsSecond; value: {model.getGearShootingEndLatitudeDms()}; - showResetTip: {_("tutti.coordinate.action.reset.latitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingEndLatitude")}; + showResetTip: {t("tutti.coordinate.action.reset.latitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLatitude")}; } #gearShootingEndLatitudeDMDField { @@ -448,8 +448,8 @@ propertyMinute: gearShootingEndLatitudeDmdMinute; propertyDecimal: gearShootingEndLatitudeDmdDecimal; value: {model.getGearShootingEndLatitudeDmd()}; - showResetTip: {_("tutti.coordinate.action.reset.latitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingEndLatitude")}; + showResetTip: {t("tutti.coordinate.action.reset.latitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLatitude")}; } /****************************************************************************** @@ -468,7 +468,7 @@ showReset: false; useFloat: true; useSign: true; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingEndLongitude")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLongitude")}; } #gearShootingEndLongitudeDMSField { @@ -478,8 +478,8 @@ propertySecond: gearShootingEndLongitudeDmsSecond; _longitudeEditor: {true}; value: {model.getGearShootingEndLongitudeDms()}; - showResetTip: {_("tutti.coordinate.action.reset.longitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingEndLongitude")}; + showResetTip: {t("tutti.coordinate.action.reset.longitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLongitude")}; } #gearShootingEndLongitudeDMDField { @@ -489,8 +489,8 @@ propertyDecimal: gearShootingEndLongitudeDmdDecimal; _longitudeEditor: {true}; value: {model.getGearShootingEndLongitudeDmd()}; - showResetTip: {_("tutti.coordinate.action.reset.longitude.tip")}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingEndLongitude")}; + showResetTip: {t("tutti.coordinate.action.reset.longitude.tip")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLongitude")}; } /****************************************************************************** @@ -499,7 +499,7 @@ #gearShootingStartDateField { date: {model.getGearShootingStartDate()}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingStartDate")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartDate")}; _help: {"tutti.editFishingOperation.field.gearShootingStartDate.help"}; } @@ -511,7 +511,7 @@ #gearShootingEndDateField { date: {model.getGearShootingEndDate()}; - _validatorLabel: {_("tutti.editFishingOperation.field.gearShootingEndDate")}; + _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndDate")}; _help: {"tutti.editFishingOperation.field.gearShootingEndDate.help"}; } @@ -525,7 +525,7 @@ floatable: false; borderPainted: false; opaque: false; - _validatorLabel: {_("tutti.editFishingOperation.field.fishingOperationValidity")}; + _validatorLabel: {t("tutti.editFishingOperation.field.fishingOperationValidity")}; toolTipText: "tutti.editFishingOperation.field.fishingOperationValid.tip"; _help: {"tutti.editFishingOperation.field.fishingOperationValid.help"}; } @@ -571,7 +571,7 @@ numberPattern: {INT_6_DIGITS_PATTERN}; enabled: {!model.isFishingOperationRectiligne()}; toolTipText: {handler.getTrawlDistanceTooltipText(model.getTrawlDistance())}; - _validatorLabel: {_("tutti.editFishingOperation.field.trawlDistance")}; + _validatorLabel: {t("tutti.editFishingOperation.field.trawlDistance")}; _help: {"tutti.editFishingOperation.field.trawlDistance.help"}; } @@ -585,27 +585,27 @@ #durationField { text: {handler.getDuration(model.getGearShootingStartDate(), model.getGearShootingEndDate())}; enabled: false; - _validatorLabel: {_("tutti.editFishingOperation.field.duration")}; + _validatorLabel: {t("tutti.editFishingOperation.field.duration")}; _help: {"tutti.editFishingOperation.field.duration.help"}; } #recorderPersonList { property: recorderPerson; - border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.field.recorderPerson"))}; - _validatorLabel: {_("tutti.editFishingOperation.field.recorderPerson")}; + border: {BorderFactory.createTitledBorder(t("tutti.editFishingOperation.field.recorderPerson"))}; + _validatorLabel: {t("tutti.editFishingOperation.field.recorderPerson")}; toolTipText: "tutti.editFishingOperation.field.recorderPerson.tip"; _help: {"tutti.editFishingOperation.field.recorderPerson.help"}; } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.editFishingOperation.field.comment"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editFishingOperation.field.comment"))}; toolTipText: "tutti.editFishingOperation.field.comment.tip"; _help: {"tutti.editFishingOperation.field.comment.help"}; } #commentField { text: {model.getComment()}; - _validatorLabel: {_("tutti.editFishingOperation.field.comment")}; + _validatorLabel: {t("tutti.editFishingOperation.field.comment")}; } #resetValidStateButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -50,7 +50,7 @@ org.jdesktop.swingx.JXDatePicker org.jdesktop.swingx.JXTitledPanel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t java.awt.Color </import> 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -73,7 +73,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler for UI {@link EditFishingOperationUI}. @@ -504,16 +504,16 @@ CancelEditFishingOperationAction action = getContext().getActionFactory().getLogicAction(button); if (evt.getNewValue() == null) { - button.setText(_("tutti.editFishingOperation.action.cancelEditFishingOperation")); - button.setToolTipText(_("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); - button.setMnemonic(_("tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic").charAt(0)); - action.setActionDescription(_("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); + button.setText(t("tutti.editFishingOperation.action.cancelEditFishingOperation")); + button.setToolTipText(t("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); + button.setMnemonic(t("tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic").charAt(0)); + action.setActionDescription(t("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); } else { - button.setText(_("tutti.editFishingOperation.action.resetEditFishingOperation")); - button.setToolTipText(_("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); - button.setMnemonic(_("tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic").charAt(0)); - action.setActionDescription(_("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); + button.setText(t("tutti.editFishingOperation.action.resetEditFishingOperation")); + button.setToolTipText(t("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); + button.setMnemonic(t("tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic").charAt(0)); + action.setActionDescription(t("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); } } }); @@ -604,9 +604,9 @@ String message; if (TuttiEntities.isNew(model.getFishingOperation())) { - message = _("tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation"); + message = t("tutti.editFishingOperation.askSaveBeforeLeaving.createFishingOperation"); } else { - message = _("tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation"); + message = t("tutti.editFishingOperation.askSaveBeforeLeaving.saveFishingOperation"); } int answer = askSaveBeforeLeaving(message); @@ -631,7 +631,7 @@ // model is not valid, ask user to continue or not result = askCancelEditBeforeLeaving( - _("tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation")); + t("tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation")); if (result) { // ok will revert any modification @@ -692,19 +692,19 @@ } public String getGearLatitudeLabelText(CoordinateEditorType coordinateEditorType) { - String result = _("tutti.editFishingOperation.field.gearLatitude", coordinateEditorType.toString()); + String result = t("tutti.editFishingOperation.field.gearLatitude", coordinateEditorType.toString()); return result; } public String getGearLongitudeLabelText(CoordinateEditorType coordinateEditorType) { - String result = _("tutti.editFishingOperation.field.gearLongitude", coordinateEditorType.toString()); + String result = t("tutti.editFishingOperation.field.gearLongitude", coordinateEditorType.toString()); return result; } public String getTrawlDistanceTooltipText(Float trawlDistance) { String result = trawlDistance == null ? null : - _("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", TuttiEntities.getDistanceInMilles(trawlDistance)); + t("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", TuttiEntities.getDistanceInMilles(trawlDistance)); return result; } @@ -712,7 +712,7 @@ String duration = TuttiEntities.getDuration( startDate, endDate, - _("tutti.editFishingOperation.duration.format") + t("tutti.editFishingOperation.duration.format") ); return duration; } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -53,7 +53,7 @@ import java.util.Date; import java.util.List; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Model for UI {@link EditFishingOperationUI}. @@ -66,7 +66,7 @@ private static final long serialVersionUID = 1L; - public static final String TITLE = n_("tutti.editFishingOperation.tab.general"); + public static final String TITLE = n("tutti.editFishingOperation.tab.general"); public static final String PROPERTY_PERSISTED = "persisted"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ java.awt.GridLayout - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,7 +47,7 @@ import java.beans.PropertyChangeListener; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of UI {@link FishingOperationsUI}. @@ -278,11 +278,11 @@ boolean catchSampleModelValid) { String result = null; if (!catchSampleModelValid) { - result = _("tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel"); + result = t("tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel"); } else if (catchNotFound) { - result = _("tutti.fishingOperations.warn.catchBatch.notFound"); + result = t("tutti.fishingOperations.warn.catchBatch.notFound"); } else if (!catchEnabled) { - result = _("tutti.fishingOperations.warn.invalid.batch.model"); + result = t("tutti.fishingOperations.warn.invalid.batch.model"); } return result; } @@ -313,10 +313,10 @@ if (bean == null) { fishingOperationText = null; } else if (TuttiEntities.isNew(bean)) { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", - _("tutti.editFishingOperation.label.traitReminder.inCreation")); + fishingOperationText = t("tutti.editFishingOperation.label.traitReminder", + t("tutti.editFishingOperation.label.traitReminder.inCreation")); } else { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + fishingOperationText = t("tutti.editFishingOperation.label.traitReminder", decorate(bean)); } return fishingOperationText; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -77,7 +77,7 @@ } #catchTable { - border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.total"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCatchBatch.legend.total"))}; } #catchTotalWeightLabel { @@ -178,7 +178,7 @@ } #speciesTable { - border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.species"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCatchBatch.legend.species"))}; } #speciesTotalWeightLabel { @@ -244,7 +244,7 @@ } #benthosTable { - border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.benthos"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCatchBatch.legend.benthos"))}; } #benthosTotalWeightLabel { @@ -310,7 +310,7 @@ } #marineLitterTable { - border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.marineLitter"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCatchBatch.legend.marineLitter"))}; } #marineLitterTotalWeightLabel { @@ -333,7 +333,7 @@ } #accidentalTable { - border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.accidental"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCatchBatch.legend.accidental"))}; } #individualObservationTabPanel { @@ -341,7 +341,7 @@ } #individualObservationTable { - border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.individualObservation"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editCatchBatch.legend.individualObservation"))}; } #exportFishingOperationReportButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -54,7 +54,7 @@ jaxx.runtime.swing.CardLayout2Ext - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue ]]></import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -52,8 +52,8 @@ import java.awt.Color; import java.util.Set; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -225,7 +225,7 @@ // ask user to save, do not save or cancel action int answer = askSaveBeforeLeaving( - _("tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch")); + t("tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch")); switch (answer) { case JOptionPane.OK_OPTION: @@ -254,7 +254,7 @@ // model is not valid, ask user to loose modification or cancel result = askCancelEditBeforeLeaving( - _("tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch")); + t("tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch")); if (result) { @@ -306,7 +306,7 @@ String title = buildReminderLabelTitle(editRow.getSpecies(), editRow, ui.getSpeciesTabFishingOperationReminderLabel().getTitle(), - _("tutti.editSpeciesFrequencies.title")); + t("tutti.editSpeciesFrequencies.title")); ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title); } @@ -322,7 +322,7 @@ String title = buildReminderLabelTitle(editRow.getSpecies(), editRow, ui.getSpeciesTabFishingOperationReminderLabel().getTitle(), - _("tutti.splitSpeciesBatch.title")); + t("tutti.splitSpeciesBatch.title")); ui.getSpeciesTabSplitBatchReminderLabel().setTitle(title); } @@ -339,7 +339,7 @@ String title = buildReminderLabelTitle(editRow.getSpecies(), editRow, ui.getSpeciesTabFishingOperationReminderLabel().getTitle(), - _("tutti.addSampleCategorySpeciesBatch.title")); + t("tutti.addSampleCategorySpeciesBatch.title")); ui.getSpeciesTabAddSampleCategoryBatchReminderLabel().setTitle(title); } @@ -363,7 +363,7 @@ if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabCreateBatch(); titlePanel = ui.getSpeciesTabCreateBatchReminderLabel(); - title = n_("tutti.createSpeciesBatch.title"); + title = n("tutti.createSpeciesBatch.title"); } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabSplitBatch(); @@ -379,7 +379,7 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); + titlePanel.setTitle(ui.getSpeciesTabFishingOperationReminderLabel().getTitle() + " - " + t(title)); } } } @@ -399,7 +399,7 @@ String title = buildReminderLabelTitle(editRow.getSpecies(), editRow, ui.getBenthosTabFishingOperationReminderLabel().getTitle(), - _("tutti.editBenthosFrequencies.title")); + t("tutti.editBenthosFrequencies.title")); ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title); } @@ -416,7 +416,7 @@ String title = buildReminderLabelTitle(editRow.getSpecies(), editRow, ui.getBenthosTabFishingOperationReminderLabel().getTitle(), - _("tutti.splitBenthosBatch.title")); + t("tutti.splitBenthosBatch.title")); ui.getBenthosTabSplitBatchReminderLabel().setTitle(title); } @@ -433,7 +433,7 @@ String title = buildReminderLabelTitle(editRow.getSpecies(), editRow, ui.getBenthosTabFishingOperationReminderLabel().getTitle(), - _("tutti.addSampleCategoryBenthosBatch.title")); + t("tutti.addSampleCategoryBenthosBatch.title")); ui.getBenthosTabAddSampleCategoryBatchReminderLabel().setTitle(title); } @@ -457,7 +457,7 @@ if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getBenthosTabCreateBatch(); titlePanel = ui.getBenthosTabCreateBatchReminderLabel(); - title = n_("tutti.createBenthosBatch.title"); + title = n("tutti.createBenthosBatch.title"); } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getBenthosTabSplitBatch(); @@ -474,7 +474,7 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + _(title)); + titlePanel.setTitle(ui.getBenthosTabFishingOperationReminderLabel().getTitle() + " - " + t(title)); } } } @@ -500,14 +500,14 @@ if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getMarineLitterTabCreateBatch(); titlePanel = ui.getMarineLitterTabCreateBatchReminderLabel(); - title = n_("tutti.createMarineLitterBatch.title"); + title = n("tutti.createMarineLitterBatch.title"); } if (tuttiUi != null) { registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getMarineLitterTabCreateBatchReminderLabel().getTitle() + " - " + _(title)); + titlePanel.setTitle(ui.getMarineLitterTabCreateBatchReminderLabel().getTitle() + " - " + t(title)); } } } @@ -537,18 +537,18 @@ if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getIndividualObservationTabCreateBatch(); titlePanel = ui.getIndividualObservationTabCreateBatchReminderLabel(); - title = n_("tutti.createIndividualObservationBatch.title"); + title = n("tutti.createIndividualObservationBatch.title"); } else if (EDIT_CARACTERISTICS_CARD.equals(card)) { titlePanel = ui.getIndividualObservationCaracteristicMapEditorReminderLabel(); - title = n_("tutti.editCaracteristics.title"); + title = n("tutti.editCaracteristics.title"); } if (tuttiUi != null) { registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getIndividualObservationTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(species))); + titlePanel.setTitle(ui.getIndividualObservationTabFishingOperationReminderLabel().getTitle() + " - " + t(title, decorate(species))); } } } @@ -578,11 +578,11 @@ if (CREATE_BATCH_CARD.equals(card)) { tuttiUi = ui.getAccidentalTabCreateBatch(); titlePanel = ui.getAccidentalTabCreateBatchReminderLabel(); - title = n_("tutti.createAccidentalBatch.title"); + title = n("tutti.createAccidentalBatch.title"); } else if (EDIT_CARACTERISTICS_CARD.equals(card)) { titlePanel = ui.getAccidentalCaracteristicMapEditorReminderLabel(); - title = n_("tutti.editCaracteristics.title"); + title = n("tutti.editCaracteristics.title"); } @@ -590,7 +590,7 @@ registerValidators(tuttiUi.getHandler().getValidator()); } if (titlePanel != null) { - titlePanel.setTitle(ui.getAccidentalTabFishingOperationReminderLabel().getTitle() + " - " + _(title, decorate(species))); + titlePanel.setTitle(ui.getAccidentalTabFishingOperationReminderLabel().getTitle() + " - " + t(title, decorate(species))); } } } @@ -603,7 +603,7 @@ // no reject weight, so can let this weight result = TuttiEntities.getWeightStringValue(totalWeight); } else { - result = _("tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed"); + result = t("tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed"); } return result; } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -47,7 +47,7 @@ import java.util.Collection; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -222,7 +222,7 @@ @Override public String getTitle() { - return _("tutti.label.tab.catchesCaracteristics"); + return t("tutti.label.tab.catchesCaracteristics"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialog.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -27,7 +27,7 @@ } #message { - text: {_("tutti.multiPostImportLog.message")}; + text: {t("tutti.multiPostImportLog.message")}; border: { BorderFactory.createEmptyBorder(10, 20, 10, 20) }; font: { javax.swing.UIManager.getFont("Label.font") }; editable: false; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To decorate some {@link SpeciesAbleBatch} as a {@link Species}. @@ -82,7 +82,7 @@ protected Object onNullValue(Species bean, String token) { Object result; if (Species.PROPERTY_SURVEY_CODE.equals(token)) { - result = _("tutti.propety.no.species.speciesCode"); + result = t("tutti.propety.no.species.speciesCode"); } else { result = super.onNullValue(bean, token); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -55,7 +55,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Helper methods aroun sorting species rows. @@ -164,7 +164,7 @@ getSpeciesColumnDecorator(speciesColumn); JPopupMenu popup = new JPopupMenu(); - popup.add(new JLabel(_("tutti.ui.change.species.decorator"))); + popup.add(new JLabel(t("tutti.ui.change.species.decorator"))); popup.add(new JSeparator()); for (int i = 0, nbContext = decorator.getNbContext(); i < nbContext; i++) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -30,7 +30,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -42,48 +42,48 @@ public static final ColumnIdentifier<AccidentalBatchRowModel> SPECIES = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_SPECIES, - n_("tutti.editAccidentalBatch.table.header.species"), - n_("tutti.editAccidentalBatch.table.header.species.tip")); + n("tutti.editAccidentalBatch.table.header.species"), + n("tutti.editAccidentalBatch.table.header.species.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> GENDER = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_GENDER, - n_("tutti.editAccidentalBatch.table.header.gender"), - n_("tutti.editAccidentalBatch.table.header.gender.tip")); + n("tutti.editAccidentalBatch.table.header.gender"), + n("tutti.editAccidentalBatch.table.header.gender.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> WEIGHT = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.editAccidentalBatch.table.header.weight"), - n_("tutti.editAccidentalBatch.table.header.weight.tip")); + n("tutti.editAccidentalBatch.table.header.weight"), + n("tutti.editAccidentalBatch.table.header.weight.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> SIZE = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_SIZE, - n_("tutti.editAccidentalBatch.table.header.size"), - n_("tutti.editAccidentalBatch.table.header.size.tip")); + n("tutti.editAccidentalBatch.table.header.size"), + n("tutti.editAccidentalBatch.table.header.size.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> LENGTH_STEP_CARACTERISTIC = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, - n_("tutti.editAccidentalBatch.table.header.lengthStepCaracteristic"), - n_("tutti.editAccidentalBatch.table.header.lengthStepCaracteristic.tip")); + n("tutti.editAccidentalBatch.table.header.lengthStepCaracteristic"), + n("tutti.editAccidentalBatch.table.header.lengthStepCaracteristic.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> DEAD_OR_ALIVE = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_DEAD_OR_ALIVE, - n_("tutti.editAccidentalBatch.table.header.deadOrAlive"), - n_("tutti.editAccidentalBatch.table.header.deadOrAlive.tip")); + n("tutti.editAccidentalBatch.table.header.deadOrAlive"), + n("tutti.editAccidentalBatch.table.header.deadOrAlive.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> OTHER_CARACTERISTICS = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_CARACTERISTICS, - n_("tutti.editAccidentalBatch.table.header.otherCaracteristics"), - n_("tutti.editAccidentalBatch.table.header.otherCaracteristics.tip")); + n("tutti.editAccidentalBatch.table.header.otherCaracteristics"), + n("tutti.editAccidentalBatch.table.header.otherCaracteristics.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> COMMENT = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_COMMENT, - n_("tutti.editAccidentalBatch.table.header.comment"), - n_("tutti.editAccidentalBatch.table.header.comment.tip")); + n("tutti.editAccidentalBatch.table.header.comment"), + n("tutti.editAccidentalBatch.table.header.comment.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> ATTACHMENT = ColumnIdentifier.newReadOnlyId( AccidentalBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.editAccidentalBatch.table.header.file"), - n_("tutti.editAccidentalBatch.table.header.file.tip")); + n("tutti.editAccidentalBatch.table.header.file"), + n("tutti.editAccidentalBatch.table.header.file.tip")); /** * Weight unit. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ java.awt.Color - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.apache.commons.collections.CollectionUtils; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -83,7 +83,7 @@ @Override public String getTitle() { - return n_("tutti.label.tab.accidental"); + return n("tutti.label.tab.accidental"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -44,7 +44,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -60,33 +60,33 @@ public static final ColumnIdentifier<BenthosBatchRowModel> SPECIES = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES_ROW, - n_("tutti.editBenthosBatch.table.header.species"), - n_("tutti.editBenthosBatch.table.header.species.tip")); + n("tutti.editBenthosBatch.table.header.species"), + n("tutti.editBenthosBatch.table.header.species.tip")); public static final ColumnIdentifier<BenthosBatchRowModel> WEIGHT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_COMPUTED_WEIGHT, - n_("tutti.editBenthosBatch.table.header.weight"), - n_("tutti.editBenthosBatch.table.header.weight.tip")); + n("tutti.editBenthosBatch.table.header.weight"), + n("tutti.editBenthosBatch.table.header.weight.tip")); public static final ColumnIdentifier<BenthosBatchRowModel> COMPUTED_NUMBER = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_COMPUTED_NUMBER, - n_("tutti.editBenthosBatch.table.header.computedNumber"), - n_("tutti.editBenthosBatch.table.header.computedNumber.tip")); + n("tutti.editBenthosBatch.table.header.computedNumber"), + n("tutti.editBenthosBatch.table.header.computedNumber.tip")); public static final ColumnIdentifier<BenthosBatchRowModel> COMMENT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_COMMENT, - n_("tutti.editBenthosBatch.table.header.comment"), - n_("tutti.editBenthosBatch.table.header.comment.tip")); + n("tutti.editBenthosBatch.table.header.comment"), + n("tutti.editBenthosBatch.table.header.comment.tip")); public static final ColumnIdentifier<BenthosBatchRowModel> ATTACHMENT = ColumnIdentifier.newReadOnlyId( BenthosBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.editBenthosBatch.table.header.file"), - n_("tutti.editBenthosBatch.table.header.file.tip")); + n("tutti.editBenthosBatch.table.header.file"), + n("tutti.editBenthosBatch.table.header.file.tip")); public static final ColumnIdentifier<BenthosBatchRowModel> SPECIES_TO_CONFIRM = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, - n_("tutti.editBenthosBatch.table.header.toConfirm"), - n_("tutti.editBenthosBatch.table.header.toConfirm.tip")); + n("tutti.editBenthosBatch.table.header.toConfirm"), + n("tutti.editBenthosBatch.table.header.toConfirm.tip")); /** * Columns for the frequency edition. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ java.awt.Color - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue ]]></import> 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -108,8 +108,8 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -786,8 +786,8 @@ SampleCategoryColumnIdentifier<BenthosBatchRowModel> columnIdentifier = SampleCategoryColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SAMPLE_CATEGORY + "[" + sampleCategoryDef.getOrder() + "]", sampleCategoryDef.getCategoryId(), - n_(sampleCategoryDef.getLabel()), - n_(sampleCategoryDef.getLabel())); + n(sampleCategoryDef.getLabel()), + n(sampleCategoryDef.getLabel())); Decorator<? extends Serializable> decorator = sampleCategoryDef.getCaracteristic().isNumericType() ? @@ -947,8 +947,8 @@ table, speciesColumn, getModel(), - _("tutti.species.surveyCode.tip"), - _("tutti.species.name.tip") + t("tutti.species.surveyCode.tip"), + t("tutti.species.name.tip") ); } @@ -1059,12 +1059,12 @@ if (parentBatch.getWeight() != null) { String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.editBenthosBatch.split.weightNotNull.message"), - _("tutti.editBenthosBatch.split.weightNotNull.help")); + t("tutti.editBenthosBatch.split.weightNotNull.message"), + t("tutti.editBenthosBatch.split.weightNotNull.help")); int i = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.editBenthosBatch.split.weightNotNull.title"), + t("tutti.editBenthosBatch.split.weightNotNull.title"), JOptionPane.OK_CANCEL_OPTION); if (i == JOptionPane.OK_OPTION) { @@ -1160,7 +1160,7 @@ Serializable selectedItem; String categoryDecorated = decorate(caracteristic, DecoratorService.CARACTERISTIC_PARAMETER_ONLY); - String dialogTitle = _("tutti.editBenthosBatch.title.changeSampleCategoryValue", categoryDecorated); + String dialogTitle = t("tutti.editBenthosBatch.title.changeSampleCategoryValue", categoryDecorated); if (caracteristic.isNumericType()) { @@ -1190,7 +1190,7 @@ // impossible de choisir cette valeur (déjà utilisée) JOptionPane.showMessageDialog( getTopestUI(), - _("tutti.editBenthosBatch.error.sampleCategoryValue.notAvailable", selectedItem, categoryDecorated)); + t("tutti.editBenthosBatch.error.sampleCategoryValue.notAvailable", selectedItem, categoryDecorated)); selectedItem = null; } @@ -1384,7 +1384,7 @@ } public String getFilterBenthosBatchRootButtonText(int rootNumber) { - return _("tutti.editBenthosBatch.filterBatch.mode.root", rootNumber); + return t("tutti.editBenthosBatch.filterBatch.mode.root", rootNumber); } public void collectChildren(BenthosBatchRowModel row, 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode; import org.apache.commons.collections.CollectionUtils; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -179,7 +179,7 @@ @Override public String getTitle() { - return n_("tutti.label.tab.benthos"); + return n("tutti.label.tab.benthos"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -43,7 +43,7 @@ java.awt.Color javax.swing.ListSelectionModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue </import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Model of the species frequency table. @@ -49,18 +49,18 @@ public static final ColumnIdentifier<BenthosFrequencyRowModel> LENGTH_STEP = ColumnIdentifier.newId( BenthosFrequencyRowModel.PROPERTY_LENGTH_STEP, - n_("tutti.editSpeciesFrequencies.table.header.lengthStep"), - n_("tutti.editSpeciesFrequencies.table.header.lengthStep")); + n("tutti.editSpeciesFrequencies.table.header.lengthStep"), + n("tutti.editSpeciesFrequencies.table.header.lengthStep")); public static final ColumnIdentifier<BenthosFrequencyRowModel> NUMBER = ColumnIdentifier.newId( BenthosFrequencyRowModel.PROPERTY_NUMBER, - n_("tutti.editSpeciesFrequencies.table.header.number"), - n_("tutti.editSpeciesFrequencies.table.header.number")); + n("tutti.editSpeciesFrequencies.table.header.number"), + n("tutti.editSpeciesFrequencies.table.header.number")); public static final ColumnIdentifier<BenthosFrequencyRowModel> WEIGHT = ColumnIdentifier.newId( BenthosFrequencyRowModel.PROPERTY_WEIGHT, - n_("tutti.editSpeciesFrequencies.table.header.weight"), - n_("tutti.editSpeciesFrequencies.table.header.weight")); + n("tutti.editSpeciesFrequencies.table.header.weight"), + n("tutti.editSpeciesFrequencies.table.header.weight")); private final BenthosFrequencyUIModel uiModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -52,7 +52,7 @@ bean: {model}; enabled: {!model.isSimpleCountingMode()}; _selectOnFocus: true; - _validatorLabel: {_("tutti.editBenthosFrequencies.field.step")}; + _validatorLabel: {t("tutti.editBenthosFrequencies.field.step")}; _help: {"tutti.editBenthosFrequencies.field.step.help"}; } @@ -99,7 +99,7 @@ property: lengthStepCaracteristic; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; - _validatorLabel: {_("tutti.editBenthosFrequencies.field.lengthStepCaracteristic")}; + _validatorLabel: {t("tutti.editBenthosFrequencies.field.lengthStepCaracteristic")}; _help: {"tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help"}; } @@ -187,7 +187,7 @@ } #tableScrollPane { - _validatorLabel: {_("tutti.editBenthosFrequencies.field.rows")}; + _validatorLabel: {t("tutti.editBenthosFrequencies.field.rows")}; } #table { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -44,7 +44,7 @@ java.awt.Color - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue </import> 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -63,7 +63,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -427,7 +427,7 @@ int response = JOptionPane.showConfirmDialog( getTopestUI(), editor, - _("tutti.editBenthosFrequencies.title.addLengthStepCaracteristic"), + t("tutti.editBenthosFrequencies.title.addLengthStepCaracteristic"), JOptionPane.OK_CANCEL_OPTION); Caracteristic selectedItem; @@ -779,7 +779,7 @@ // can't save mensurations (found doublon) String message = - _("tutti.editBenthosFrequencies.error.length.doublon", + t("tutti.editBenthosFrequencies.error.length.doublon", doublon, index + 1); getContext().getErrorHelper().showErrorDialog( message); @@ -798,12 +798,12 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.editBenthosFrequencies.askBeforeSave.message"), - _("tutti.editBenthosFrequencies.askBeforeSave.help")); + t("tutti.editBenthosFrequencies.askBeforeSave.message"), + t("tutti.editBenthosFrequencies.askBeforeSave.help")); int answer = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.editBenthosFrequencies.askBeforeSave.title"), + t("tutti.editBenthosFrequencies.askBeforeSave.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Table model of sample categories values. @@ -44,23 +44,23 @@ public static final ColumnIdentifier<SplitBenthosBatchRowModel> SELECTED = ColumnIdentifier.newId( SplitBenthosBatchRowModel.PROPERTY_SELECTED, - n_("tutti.splitBenthosBatch.table.header.selected"), - n_("tutti.splitBenthosBatch.table.header.selected")); + n("tutti.splitBenthosBatch.table.header.selected"), + n("tutti.splitBenthosBatch.table.header.selected")); public static final ColumnIdentifier<SplitBenthosBatchRowModel> EDITABLE_CATEGORY_VALUE = ColumnIdentifier.newId( SplitBenthosBatchRowModel.PROPERTY_CATEGORY_VALUE, - n_("tutti.splitBenthosBatch.table.header.category"), - n_("tutti.splitBenthosBatch.table.header.category")); + n("tutti.splitBenthosBatch.table.header.category"), + n("tutti.splitBenthosBatch.table.header.category")); public static final ColumnIdentifier<SplitBenthosBatchRowModel> READ_ONLY_CATEGORY_VALUE = ColumnIdentifier.newId( SplitBenthosBatchRowModel.PROPERTY_CATEGORY_VALUE, - n_("tutti.splitBenthosBatch.table.header.category"), - n_("tutti.splitBenthosBatch.table.header.category")); + n("tutti.splitBenthosBatch.table.header.category"), + n("tutti.splitBenthosBatch.table.header.category")); public static final ColumnIdentifier<SplitBenthosBatchRowModel> WEIGHT = ColumnIdentifier.newId( SplitBenthosBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.splitBenthosBatch.table.header.weight"), - n_("tutti.splitBenthosBatch.table.header.weight")); + n("tutti.splitBenthosBatch.table.header.weight"), + n("tutti.splitBenthosBatch.table.header.weight")); private final SelectedCategoryAble uiModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ java.awt.Color - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue </import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -27,7 +27,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin <kmorin(a)codelutin.com> @@ -39,38 +39,38 @@ public static final ColumnIdentifier<IndividualObservationBatchRowModel> SPECIES = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_SPECIES, - n_("tutti.editIndividualObservationBatch.table.header.species"), - n_("tutti.editIndividualObservationBatch.table.header.species.tip")); + n("tutti.editIndividualObservationBatch.table.header.species"), + n("tutti.editIndividualObservationBatch.table.header.species.tip")); public static final ColumnIdentifier<IndividualObservationBatchRowModel> WEIGHT = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.editIndividualObservationBatch.table.header.weight"), - n_("tutti.editIndividualObservationBatch.table.header.weight.tip")); + n("tutti.editIndividualObservationBatch.table.header.weight"), + n("tutti.editIndividualObservationBatch.table.header.weight.tip")); public static final ColumnIdentifier<IndividualObservationBatchRowModel> SIZE = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_SIZE, - n_("tutti.editIndividualObservationBatch.table.header.size"), - n_("tutti.editIndividualObservationBatch.table.header.size.tip")); + n("tutti.editIndividualObservationBatch.table.header.size"), + n("tutti.editIndividualObservationBatch.table.header.size.tip")); public static final ColumnIdentifier<IndividualObservationBatchRowModel> LENGTH_STEP_CARACTERISTIC = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, - n_("tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic"), - n_("tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic.tip")); + n("tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic"), + n("tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic.tip")); public static final ColumnIdentifier<IndividualObservationBatchRowModel> OTHER_CARACTERISTICS = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_CARACTERISTICS, - n_("tutti.editIndividualObservationBatch.table.header.otherCaracteristics"), - n_("tutti.editIndividualObservationBatch.table.header.otherCaracteristics.tip")); + n("tutti.editIndividualObservationBatch.table.header.otherCaracteristics"), + n("tutti.editIndividualObservationBatch.table.header.otherCaracteristics.tip")); public static final ColumnIdentifier<IndividualObservationBatchRowModel> COMMENT = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_COMMENT, - n_("tutti.editIndividualObservationBatch.table.header.comment"), - n_("tutti.editIndividualObservationBatch.table.header.comment.tip")); + n("tutti.editIndividualObservationBatch.table.header.comment"), + n("tutti.editIndividualObservationBatch.table.header.comment.tip")); public static final ColumnIdentifier<IndividualObservationBatchRowModel> ATTACHMENT = ColumnIdentifier.newReadOnlyId( IndividualObservationBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.editIndividualObservationBatch.table.header.file"), - n_("tutti.editIndividualObservationBatch.table.header.file.tip")); + n("tutti.editIndividualObservationBatch.table.header.file"), + n("tutti.editIndividualObservationBatch.table.header.file.tip")); /** * Weight unit. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -40,7 +40,7 @@ java.awt.Color java.awt.Dimension - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -74,7 +74,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -476,10 +476,10 @@ if (!model.isSpeciesFromBatchWithCount()) { String htmlMessage = String.format("<html>%s</html>", - _("tutti.createIndividualObservationBatch.warn.nocount", speciesStr)); + t("tutti.createIndividualObservationBatch.warn.nocount", speciesStr)); JOptionPane.showMessageDialog(getContext().getMainUI(), htmlMessage, - _("tutti.createIndividualObservationBatch.warn.nocount.title"), + t("tutti.createIndividualObservationBatch.warn.nocount.title"), JOptionPane.WARNING_MESSAGE); return; } @@ -491,12 +491,12 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.message", speciesStr), - _("tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.help")); + t("tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.message", speciesStr), + t("tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.help")); int response = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.title"), + t("tutti.createIndividualObservationBatch.confirm.alreadyUsedSpecies.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); @@ -663,12 +663,12 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.createIndividualObservationBatch.confirm.message", speciesStr, nbRowsToCreate), - _("tutti.createIndividualObservationBatch.confirm.help")); + t("tutti.createIndividualObservationBatch.confirm.message", speciesStr, nbRowsToCreate), + t("tutti.createIndividualObservationBatch.confirm.help")); int response = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.createIndividualObservationBatch.confirm.title"), + t("tutti.createIndividualObservationBatch.confirm.title"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin <kmorin(a)codelutin.com> @@ -127,7 +127,7 @@ @Override public String getTitle() { - return n_("tutti.label.tab.individualObservations"); + return n("tutti.label.tab.individualObservations"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -41,33 +41,33 @@ public static final ColumnIdentifier<MarineLitterBatchRowModel> MACRO_WASTE_CATEGORY = ColumnIdentifier.newId( MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_CATEGORY, - n_("tutti.editMarineLitterBatch.table.header.marineLitterCategory"), - n_("tutti.editMarineLitterBatch.table.header.marineLitterCategory.tip")); + n("tutti.editMarineLitterBatch.table.header.marineLitterCategory"), + n("tutti.editMarineLitterBatch.table.header.marineLitterCategory.tip")); public static final ColumnIdentifier<MarineLitterBatchRowModel> MACRO_WASTE_SIZE_CATEGORY = ColumnIdentifier.newId( MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_SIZE_CATEGORY, - n_("tutti.editMarineLitterBatch.table.header.marineLitterSizeCategory"), - n_("tutti.editMarineLitterBatch.table.header.marineLitterSizeCategory.tip")); + n("tutti.editMarineLitterBatch.table.header.marineLitterSizeCategory"), + n("tutti.editMarineLitterBatch.table.header.marineLitterSizeCategory.tip")); public static final ColumnIdentifier<MarineLitterBatchRowModel> NUMBER = ColumnIdentifier.newId( MarineLitterBatchRowModel.PROPERTY_NUMBER, - n_("tutti.editMarineLitterBatch.table.header.number"), - n_("tutti.editMarineLitterBatch.table.header.number.tip")); + n("tutti.editMarineLitterBatch.table.header.number"), + n("tutti.editMarineLitterBatch.table.header.number.tip")); public static final ColumnIdentifier<MarineLitterBatchRowModel> WEIGHT = ColumnIdentifier.newId( MarineLitterBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.editMarineLitterBatch.table.header.weight"), - n_("tutti.editMarineLitterBatch.table.header.weight.tip")); + n("tutti.editMarineLitterBatch.table.header.weight"), + n("tutti.editMarineLitterBatch.table.header.weight.tip")); public static final ColumnIdentifier<MarineLitterBatchRowModel> COMMENT = ColumnIdentifier.newId( MarineLitterBatchRowModel.PROPERTY_COMMENT, - n_("tutti.editMarineLitterBatch.table.header.comment"), - n_("tutti.editMarineLitterBatch.table.header.comment.tip")); + n("tutti.editMarineLitterBatch.table.header.comment"), + n("tutti.editMarineLitterBatch.table.header.comment.tip")); public static final ColumnIdentifier<MarineLitterBatchRowModel> ATTACHMENT = ColumnIdentifier.newReadOnlyId( MarineLitterBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.editMarineLitterBatch.table.header.file"), - n_("tutti.editMarineLitterBatch.table.header.file.tip")); + n("tutti.editMarineLitterBatch.table.header.file"), + n("tutti.editMarineLitterBatch.table.header.file.tip")); /** * Weight unit. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ java.awt.Color java.awt.Dimension - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import org.apache.commons.collections.CollectionUtils; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -115,7 +115,7 @@ @Override public String getTitle() { - return n_("tutti.label.tab.marineLitter"); + return n("tutti.label.tab.marineLitter"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.NumberEditor - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,8 +34,8 @@ #trunkFile { directoryEnabled: false; - exts: {_("tutti.importPupitri.trunkFile.extension")}; - extsDescription: {_("tutti.importPupitri.trunkFile.extension.description")}; + exts: {t("tutti.importPupitri.trunkFile.extension")}; + extsDescription: {t("tutti.importPupitri.trunkFile.extension.description")}; acceptAllFileFilterUsed: false; } @@ -46,8 +46,8 @@ #carrouselFile { directoryEnabled: false; - exts: {_("tutti.importPupitri.carrouselFile.extension")}; - extsDescription: {_("tutti.importPupitri.carrouselFile.extension.description")}; + exts: {t("tutti.importPupitri.carrouselFile.extension")}; + extsDescription: {t("tutti.importPupitri.carrouselFile.extension.description")}; acceptAllFileFilterUsed: false; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -30,7 +30,7 @@ import javax.swing.JOptionPane; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <morin(a)codelutin.com> @@ -77,8 +77,8 @@ } else { JOptionPane.showMessageDialog(ui, - _("tutti.importPupitri.error.fileMissing.message"), - _("tutti.importPupitri.error.fileMissing.title"), + t("tutti.importPupitri.error.fileMissing.message"), + t("tutti.importPupitri.error.fileMissing.title"), JOptionPane.ERROR_MESSAGE); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -44,7 +44,7 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -60,33 +60,33 @@ public static final ColumnIdentifier<SpeciesBatchRowModel> SPECIES = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SPECIES_ROW, - n_("tutti.editSpeciesBatch.table.header.species"), - n_("tutti.editSpeciesBatch.table.header.species")); + n("tutti.editSpeciesBatch.table.header.species"), + n("tutti.editSpeciesBatch.table.header.species")); public static final ColumnIdentifier<SpeciesBatchRowModel> WEIGHT = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMPUTED_WEIGHT, - n_("tutti.editSpeciesBatch.table.header.weight"), - n_("tutti.editSpeciesBatch.table.header.weight")); + n("tutti.editSpeciesBatch.table.header.weight"), + n("tutti.editSpeciesBatch.table.header.weight")); public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_NUMBER = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMPUTED_NUMBER, - n_("tutti.editSpeciesBatch.table.header.computedNumber"), - n_("tutti.editSpeciesBatch.table.header.computedNumber")); + n("tutti.editSpeciesBatch.table.header.computedNumber"), + n("tutti.editSpeciesBatch.table.header.computedNumber")); public static final ColumnIdentifier<SpeciesBatchRowModel> COMMENT = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMMENT, - n_("tutti.editSpeciesBatch.table.header.comment"), - n_("tutti.editSpeciesBatch.table.header.comment")); + n("tutti.editSpeciesBatch.table.header.comment"), + n("tutti.editSpeciesBatch.table.header.comment")); public static final ColumnIdentifier<SpeciesBatchRowModel> ATTACHMENT = ColumnIdentifier.newReadOnlyId( SpeciesBatchRowModel.PROPERTY_ATTACHMENT, - n_("tutti.editSpeciesBatch.table.header.file"), - n_("tutti.editSpeciesBatch.table.header.file")); + n("tutti.editSpeciesBatch.table.header.file"), + n("tutti.editSpeciesBatch.table.header.file")); public static final ColumnIdentifier<SpeciesBatchRowModel> SPECIES_TO_CONFIRM = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, - n_("tutti.editSpeciesBatch.table.header.toConfirm"), - n_("tutti.editSpeciesBatch.table.header.toConfirm")); + n("tutti.editSpeciesBatch.table.header.toConfirm"), + n("tutti.editSpeciesBatch.table.header.toConfirm")); /** * Columns for the frequency edition. Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ java.awt.Color - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue ]]></import> 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -107,8 +107,8 @@ import java.util.List; import java.util.Set; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -741,8 +741,8 @@ SampleCategoryColumnIdentifier<SpeciesBatchRowModel> columnIdentifier = SampleCategoryColumnIdentifier.newId( sampleCategoryDef.getLabel(), sampleCategoryDef.getCategoryId(), - n_(sampleCategoryDef.getLabel()), - n_(sampleCategoryDef.getLabel())); + n(sampleCategoryDef.getLabel()), + n(sampleCategoryDef.getLabel())); Decorator<? extends Serializable> decorator = sampleCategoryDef.getCaracteristic().isNumericType() ? @@ -907,8 +907,8 @@ table, speciesColumn, getModel(), - _("tutti.species.surveyCode.tip"), - _("tutti.species.name.tip") + t("tutti.species.surveyCode.tip"), + t("tutti.species.name.tip") ); } @@ -1019,12 +1019,12 @@ if (parentBatch.getWeight() != null) { String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.editSpeciesBatch.split.weightNotNull.message"), - _("tutti.editSpeciesBatch.split.weightNotNull.help")); + t("tutti.editSpeciesBatch.split.weightNotNull.message"), + t("tutti.editSpeciesBatch.split.weightNotNull.help")); int i = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.editSpeciesBatch.split.weightNotNull.title"), + t("tutti.editSpeciesBatch.split.weightNotNull.title"), JOptionPane.OK_CANCEL_OPTION); if (i == JOptionPane.OK_OPTION) { @@ -1120,7 +1120,7 @@ Serializable selectedItem; String categoryDecorated = decorate(caracteristic, DecoratorService.CARACTERISTIC_PARAMETER_ONLY); - String dialogTitle = _("tutti.editSpeciesBatch.title.changeSampleCategoryValue", categoryDecorated); + String dialogTitle = t("tutti.editSpeciesBatch.title.changeSampleCategoryValue", categoryDecorated); if (caracteristic.isNumericType()) { @@ -1150,7 +1150,7 @@ // impossible de choisir cette valeur (déjà utilisée) JOptionPane.showMessageDialog( getTopestUI(), - _("tutti.editSpeciesBatch.error.sampleCategoryValue.notAvailable", selectedItem, categoryDecorated)); + t("tutti.editSpeciesBatch.error.sampleCategoryValue.notAvailable", selectedItem, categoryDecorated)); selectedItem = null; } @@ -1344,7 +1344,7 @@ } public String getFilterSpeciesBatchRootButtonText(int rootNumber) { - return _("tutti.editSpeciesBatch.filterBatch.mode.root", rootNumber); + return t("tutti.editSpeciesBatch.filterBatch.mode.root", rootNumber); } public void collectChildren(SpeciesBatchRowModel row, 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author tchemit <chemit(a)codelutin.com> @@ -395,7 +395,7 @@ @Override public String getTitle() { - return n_("tutti.label.tab.species"); + return n("tutti.label.tab.species"); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -43,7 +43,7 @@ java.awt.Color javax.swing.ListSelectionModel - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue </import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Model of the species frequency table. @@ -49,18 +49,18 @@ public static final ColumnIdentifier<SpeciesFrequencyRowModel> LENGTH_STEP = ColumnIdentifier.newId( SpeciesFrequencyRowModel.PROPERTY_LENGTH_STEP, - n_("tutti.editSpeciesFrequencies.table.header.lengthStep"), - n_("tutti.editSpeciesFrequencies.table.header.lengthStep")); + n("tutti.editSpeciesFrequencies.table.header.lengthStep"), + n("tutti.editSpeciesFrequencies.table.header.lengthStep")); public static final ColumnIdentifier<SpeciesFrequencyRowModel> NUMBER = ColumnIdentifier.newId( SpeciesFrequencyRowModel.PROPERTY_NUMBER, - n_("tutti.editSpeciesFrequencies.table.header.number"), - n_("tutti.editSpeciesFrequencies.table.header.number")); + n("tutti.editSpeciesFrequencies.table.header.number"), + n("tutti.editSpeciesFrequencies.table.header.number")); public static final ColumnIdentifier<SpeciesFrequencyRowModel> WEIGHT = ColumnIdentifier.newId( SpeciesFrequencyRowModel.PROPERTY_WEIGHT, - n_("tutti.editSpeciesFrequencies.table.header.weight"), - n_("tutti.editSpeciesFrequencies.table.header.weight")); + n("tutti.editSpeciesFrequencies.table.header.weight"), + n("tutti.editSpeciesFrequencies.table.header.weight")); private final SpeciesFrequencyUIModel uiModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -52,7 +52,7 @@ bean: {model}; enabled: {!model.isSimpleCountingMode()}; _selectOnFocus: true; - _validatorLabel: {_("tutti.editSpeciesFrequencies.field.step")}; + _validatorLabel: {t("tutti.editSpeciesFrequencies.field.step")}; _help: {"tutti.editSpeciesFrequencies.field.step.help"}; } @@ -99,7 +99,7 @@ property: lengthStepCaracteristic; selectedItem: {model.getLengthStepCaracteristic()}; enabled: {!model.isSimpleCountingMode()}; - _validatorLabel: {_("tutti.editSpeciesFrequencies.field.lengthStepCaracteristic")}; + _validatorLabel: {t("tutti.editSpeciesFrequencies.field.lengthStepCaracteristic")}; _help: {"tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help"}; } @@ -187,7 +187,7 @@ } #tableScrollPane { - _validatorLabel: {_("tutti.editSpeciesFrequencies.field.rows")}; + _validatorLabel: {t("tutti.editSpeciesFrequencies.field.rows")}; } #table { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -44,7 +44,7 @@ java.awt.Color - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue static fr.ifremer.tutti.persistence.entities.TuttiEntities.getWeightStringValue </import> 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -70,7 +70,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -479,7 +479,7 @@ int response = JOptionPane.showConfirmDialog( getTopestUI(), editor, - _("tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic"), + t("tutti.editSpeciesFrequencies.title.addLengthStepCaracteristic"), JOptionPane.OK_CANCEL_OPTION); Caracteristic selectedItem; @@ -581,7 +581,7 @@ getTable().scrollRowToVisible(rowIndex); if (fromIchtyometer) { - showInformationMessage(_("tutti.editSpeciesFrequencies.addMeasure", step, aroundLengthStep)); + showInformationMessage(t("tutti.editSpeciesFrequencies.addMeasure", step, aroundLengthStep)); } } @@ -790,7 +790,7 @@ applyRafaleStep(length, true); } else { throw new ApplicationBusinessException( - _("tutti.editSpeciesFrequencies.error.itchyometer.bad.record", + t("tutti.editSpeciesFrequencies.error.itchyometer.bad.record", record.getRecord(), record.getCrc(), record.getComputedCrc())); } } @@ -885,7 +885,7 @@ // can't save mensurations (found doublon) String message = - _("tutti.editSpeciesFrequencies.error.length.doublon", + t("tutti.editSpeciesFrequencies.error.length.doublon", doublon, index + 1); getContext().getErrorHelper().showErrorDialog( message); @@ -904,12 +904,12 @@ String htmlMessage = String.format( CONFIRMATION_FORMAT, - _("tutti.editSpeciesFrequencies.askBeforeSave.message"), - _("tutti.editSpeciesFrequencies.askBeforeSave.help")); + t("tutti.editSpeciesFrequencies.askBeforeSave.message"), + t("tutti.editSpeciesFrequencies.askBeforeSave.help")); int answer = JOptionPane.showConfirmDialog( getTopestUI(), htmlMessage, - _("tutti.editSpeciesFrequencies.askBeforeSave.title"), + t("tutti.editSpeciesFrequencies.askBeforeSave.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Table model of sample categories values. @@ -44,23 +44,23 @@ public static final ColumnIdentifier<SplitSpeciesBatchRowModel> SELECTED = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_SELECTED, - n_("tutti.splitSpeciesBatch.table.header.selected"), - n_("tutti.splitSpeciesBatch.table.header.selected")); + n("tutti.splitSpeciesBatch.table.header.selected"), + n("tutti.splitSpeciesBatch.table.header.selected")); public static final ColumnIdentifier<SplitSpeciesBatchRowModel> EDITABLE_CATEGORY_VALUE = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, - n_("tutti.splitSpeciesBatch.table.header.category"), - n_("tutti.splitSpeciesBatch.table.header.category")); + n("tutti.splitSpeciesBatch.table.header.category"), + n("tutti.splitSpeciesBatch.table.header.category")); public static final ColumnIdentifier<SplitSpeciesBatchRowModel> READ_ONLY_CATEGORY_VALUE = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, - n_("tutti.splitSpeciesBatch.table.header.category"), - n_("tutti.splitSpeciesBatch.table.header.category")); + n("tutti.splitSpeciesBatch.table.header.category"), + n("tutti.splitSpeciesBatch.table.header.category")); public static final ColumnIdentifier<SplitSpeciesBatchRowModel> WEIGHT = ColumnIdentifier.newId( SplitSpeciesBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.splitSpeciesBatch.table.header.weight"), - n_("tutti.splitSpeciesBatch.table.header.weight")); + n("tutti.splitSpeciesBatch.table.header.weight"), + n("tutti.splitSpeciesBatch.table.header.weight")); private final SelectedCategoryAble uiModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ java.awt.Color - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue </import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -24,7 +24,7 @@ * #L% */ -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** @@ -36,7 +36,7 @@ private static final long serialVersionUID = 1L; public static final String TITLE = - n_("tutti.gearUseFeatureTable.title"); + n("tutti.gearUseFeatureTable.title"); @Override public String getTitle() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin @@ -40,13 +40,13 @@ public static final ColumnIdentifier<GearUseFeatureRowModel> KEY = ColumnIdentifier.newId( GearUseFeatureRowModel.PROPERTY_KEY, - n_("tutti.gearUseFeatureTable.table.header.key"), - n_("tutti.gearUseFeatureTable.table.header.key")); + n("tutti.gearUseFeatureTable.table.header.key"), + n("tutti.gearUseFeatureTable.table.header.key")); public static final ColumnIdentifier<GearUseFeatureRowModel> VALUE = ColumnIdentifier.newId( GearUseFeatureRowModel.PROPERTY_VALUE, - n_("tutti.gearUseFeatureTable.table.header.value"), - n_("tutti.gearUseFeatureTable.table.header.value")); + n("tutti.gearUseFeatureTable.table.header.value"), + n("tutti.gearUseFeatureTable.table.header.value")); public GearUseFeatureTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -24,7 +24,7 @@ * #L% */ -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin @@ -35,7 +35,7 @@ private static final long serialVersionUID = 1L; public static final String TITLE = - n_("tutti.vesselUseFeatureTable.title"); + n("tutti.vesselUseFeatureTable.title"); @Override public String getTitle() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -28,7 +28,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin @@ -40,13 +40,13 @@ public static final ColumnIdentifier<VesselUseFeatureRowModel> KEY = ColumnIdentifier.newId( VesselUseFeatureRowModel.PROPERTY_KEY, - n_("tutti.vesselUseFeatureTable.table.header.key"), - n_("tutti.vesselUseFeatureTable.table.header.key")); + n("tutti.vesselUseFeatureTable.table.header.key"), + n("tutti.vesselUseFeatureTable.table.header.key")); public static final ColumnIdentifier<VesselUseFeatureRowModel> VALUE = ColumnIdentifier.newId( VesselUseFeatureRowModel.PROPERTY_VALUE, - n_("tutti.vesselUseFeatureTable.table.header.value"), - n_("tutti.vesselUseFeatureTable.table.header.value")); + n("tutti.vesselUseFeatureTable.table.header.value"), + n("tutti.vesselUseFeatureTable.table.header.value")); public VesselUseFeatureTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -48,19 +48,19 @@ #nameField { text: {model.getName()}; - _validatorLabel: {_("tutti.editProgram.field.name")}; + _validatorLabel: {t("tutti.editProgram.field.name")}; _help: {"tutti.editProgram.field.name.help"}; } #descriptionPane { - border: {BorderFactory.createTitledBorder(_("tutti.editProgram.field.description"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editProgram.field.description"))}; toolTipText: "tutti.editProgram.field.description.tip"; _help: {"tutti.editProgram.field.description.help"}; } #descriptionField { text: {getStringValue(model.getDescription())}; - _validatorLabel: {_("tutti.editProgram.field.description")}; + _validatorLabel: {t("tutti.editProgram.field.description")}; _help: {"tutti.editProgram.field.description.help"}; } @@ -74,7 +74,7 @@ #zoneComboBox { property: zone; selectedItem: {model.getZone()}; - _validatorLabel: {_("tutti.editProgram.field.zone")}; + _validatorLabel: {t("tutti.editProgram.field.zone")}; _help: {"tutti.editProgram.field.zone.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -33,7 +33,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue </import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -34,7 +34,7 @@ import javax.swing.JComponent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of UI {@link EditProgramUI}. @@ -52,9 +52,9 @@ String result; if (exist) { - result = _("tutti.editProgram.title.edit.program"); + result = t("tutti.editProgram.title.edit.program"); } else { - result = _("tutti.editProgram.title.create.program"); + result = t("tutti.editProgram.title.create.program"); } return result; } @@ -126,8 +126,8 @@ boolean result = quitScreen( getModel().isValid(), getModel().isModify(), - _("tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram"), - _("tutti.editProgram.askSaveBeforeLeaving.saveProgram"), + t("tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram"), + t("tutti.editProgram.askSaveBeforeLeaving.saveProgram"), ui.getSaveButton().getAction() ); return result; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -33,7 +33,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin @@ -43,33 +43,33 @@ public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SPECIES_ID = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_SPECIES, - n_("tutti.editProtocol.table.header.speciesReferenceTaxonId"), - n_("tutti.editProtocol.table.header.speciesReferenceTaxonId.tip")); + n("tutti.editProtocol.table.header.speciesReferenceTaxonId"), + n("tutti.editProtocol.table.header.speciesReferenceTaxonId.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SURVEY_CODE_ID = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_SPECIES_SURVEY_CODE, - n_("tutti.editProtocol.table.header.speciesSurveyCode"), - n_("tutti.editProtocol.table.header.speciesSurveyCode.tip")); + n("tutti.editProtocol.table.header.speciesSurveyCode"), + n("tutti.editProtocol.table.header.speciesSurveyCode.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> LENGTH_STEP_PMFM_ID = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_LENGTH_STEP_PMFM, - n_("tutti.editProtocol.table.header.lengthStep"), - n_("tutti.editProtocol.table.header.lengthStep.tip")); + n("tutti.editProtocol.table.header.lengthStep"), + n("tutti.editProtocol.table.header.lengthStep.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> WEIGHT_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_WEIGHT_ENABLED, - n_("tutti.editProtocol.table.header.weight"), - n_("tutti.editProtocol.table.header.weight.tip")); + n("tutti.editProtocol.table.header.weight"), + n("tutti.editProtocol.table.header.weight.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> COUNT_IF_NO_FREQUENCY_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, - n_("tutti.editProtocol.table.header.countIfNoFrequency"), - n_("tutti.editProtocol.table.header.countIfNoFrequency.tip")); + n("tutti.editProtocol.table.header.countIfNoFrequency"), + n("tutti.editProtocol.table.header.countIfNoFrequency.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFY_SAMPLE_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_CALCIFY_SAMPLE_ENABLED, - n_("tutti.editProtocol.table.header.calcifySample"), - n_("tutti.editProtocol.table.header.calcifySample.tip")); + n("tutti.editProtocol.table.header.calcifySample"), + n("tutti.editProtocol.table.header.calcifySample.tip")); protected final SampleCategoryModel sampleCategoryModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -53,19 +53,19 @@ #nameField { text: {model.getName()}; - _validatorLabel: {_("tutti.editProtocol.field.protocol.name")}; + _validatorLabel: {t("tutti.editProtocol.field.protocol.name")}; _help: {"tutti.editProtocol.field.name.help"}; } #commentPane { - border: {BorderFactory.createTitledBorder(_("tutti.editProtocol.field.comment"))}; + border: {BorderFactory.createTitledBorder(t("tutti.editProtocol.field.comment"))}; toolTipText: "tutti.editProtocol.field.comment.tip"; _help: {"tutti.editProtocol.field.comment.help"}; } #commentField { text: {getStringValue(model.getComment())}; - _validatorLabel: {_("tutti.editProtocol.field.comment")}; + _validatorLabel: {t("tutti.editProtocol.field.comment")}; } #saveWarningContainer { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ org.jdesktop.swingx.JXTable - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue </import> 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -82,7 +82,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** @@ -99,9 +99,9 @@ String result; if (exist) { - result = _("tutti.editProtocol.title.edit.protocol"); + result = t("tutti.editProtocol.title.edit.protocol"); } else { - result = _("tutti.editProtocol.title.create.protocol"); + result = t("tutti.editProtocol.title.create.protocol"); } return result; } @@ -202,7 +202,7 @@ EditProtocolAction.CLEAN_PROTOCOL_ENTRY.removeContextValue(this.ui); model.setCleaned(true); - this.ui.getSaveWarning().setText(_("tutti.editProtocol.warn.clean")); + this.ui.getSaveWarning().setText(t("tutti.editProtocol.warn.clean")); } model.fromBean(protocol); @@ -216,7 +216,7 @@ model.fromBean(protocol); model.setImported(true); - this.ui.getSaveWarning().setText(_("tutti.editProtocol.warn.import")); + this.ui.getSaveWarning().setText(t("tutti.editProtocol.warn.import")); } else if ((protocol = CloneProtocolAction.CLONE_PROTOCOL_ENTRY.getContextValue(this.ui)) != null) { @@ -228,7 +228,7 @@ model.fromBean(protocol); model.setCloned(true); - this.ui.getSaveWarning().setText(_("tutti.editProtocol.warn.clone")); + this.ui.getSaveWarning().setText(t("tutti.editProtocol.warn.clone")); } else { @@ -564,8 +564,8 @@ boolean result = quitScreen( getModel().isValid(), getModel().isModify(), - _("tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol"), - _("tutti.editProtocol.askSaveBeforeLeaving.saveProtocol"), + t("tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol"), + t("tutti.editProtocol.askSaveBeforeLeaving.saveProtocol"), ui.getSaveButton().getAction() ); return result; @@ -750,8 +750,8 @@ table, speciesColumn, null, - _("tutti.species.refTaxCode.tip"), - _("tutti.species.name.tip") + t("tutti.species.refTaxCode.tip"), + t("tutti.species.name.tip") ); // at the very end, set rows to model Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -32,7 +32,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t </import> <script><![CDATA[ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -53,7 +53,7 @@ #reportComboBox { property: report; selectedItem: {model.getReport()}; - _validatorLabel: {_("tutti.report.field.report")}; + _validatorLabel: {t("tutti.report.field.report")}; _help: {"tutti.report.field.report.help"}; } @@ -67,7 +67,7 @@ #fishingOperationComboBox { property: fishingOperation; selectedItem: {model.getFishingOperation()}; - _validatorLabel: {_("tutti.report.field.fishingOperation")}; + _validatorLabel: {t("tutti.report.field.fishingOperation")}; _help: {"tutti.report.field.fishingOperation.help"}; } @@ -80,7 +80,7 @@ #outputFileField { selectedFile: {model.getOutputFile()}; - _validatorLabel: {_("tutti.report.field.outputFile")}; + _validatorLabel: {t("tutti.report.field.outputFile")}; _help: {"tutti.report.field.outputFile.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -36,7 +36,7 @@ java.io.File - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.SwingUtil.getStringValue </import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -42,7 +42,7 @@ import java.io.IOException; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Handler of {@link ReportUI}. @@ -105,7 +105,7 @@ outputFileField.setDirectoryEnabled(false); outputFileField.setFileEnabled(true); outputFileField.setExts(".pdf"); - outputFileField.setExtsDescription(_("tutti.common.file.pdf")); + outputFileField.setExtsDescription(t("tutti.common.file.pdf")); SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); @@ -147,7 +147,7 @@ desktop.browse(file.toURI()); } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(_("swing.error.cannot.open.file")); + getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -73,7 +73,7 @@ import java.beans.PropertyChangeListener; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Contract of any UI handler. @@ -427,12 +427,12 @@ TableColumnExt col = new TableColumnExt(model.getColumnCount()); col.setCellEditor(editor); col.setCellRenderer(renderer); - String label = _(identifier.getHeaderI18nKey()); + String label = t(identifier.getHeaderI18nKey()); if (weightUnit != null) { label = weightUnit.decorateLabel(label); } col.setHeaderValue(label); - String tip = _(identifier.getHeaderTipI18nKey()); + String tip = t(identifier.getHeaderTipI18nKey()); if (weightUnit != null) { tip = weightUnit.decorateTip(tip); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -38,7 +38,7 @@ import java.net.URL; import java.net.URLConnection; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created: 14/06/12 @@ -76,7 +76,7 @@ if (log.isDebugEnabled()) { log.debug("Bad url syntax at " + urlAsString, e); } - throw new ApplicationBusinessException(_(badUrlFormatI18nKey, urlAsString)); + throw new ApplicationBusinessException(t(badUrlFormatI18nKey, urlAsString)); } URLConnection urlConnection; @@ -89,7 +89,7 @@ if (log.isDebugEnabled()) { log.debug("Could not connect to " + urlAsString, e); } - throw new ApplicationBusinessException(_(notReachI18nKey, urlAsString)); + throw new ApplicationBusinessException(t(notReachI18nKey, urlAsString)); } // try to open the resource (fail if resources does not exist) @@ -105,7 +105,7 @@ if (log.isDebugEnabled()) { log.debug("Could not found file at to " + urlAsString, e); } - throw new ApplicationBusinessException(_(notFoundI18nKey, urlAsString)); + throw new ApplicationBusinessException(t(notFoundI18nKey, urlAsString)); } } 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,8 +37,8 @@ import java.awt.Font; import java.util.List; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * Renderer of a attachement editor in a table cell. @@ -68,7 +68,7 @@ protected AttachmentCellRenderer(Decorator<Attachment> decorator) { setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("edit-attachment")); - this.noneText = n_("tutti.attachmentEditor.none.tip"); + this.noneText = n("tutti.attachmentEditor.none.tip"); this.decorator = decorator; } @@ -97,7 +97,7 @@ if (CollectionUtils.isEmpty(attachments)) { // use HTML to show the tooltip in italic - toolTipTextValue = "<i>" + _(noneText) + "</i>"; + toolTipTextValue = "<i>" + t(noneText) + "</i>"; } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -53,7 +53,7 @@ import java.io.IOException; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <morin(a)codelutin.com> @@ -112,7 +112,7 @@ closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); closeAction.putValue(Action.ACTION_COMMAND_KEY, "close"); closeAction.putValue(Action.NAME, "close"); - closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.attachmentEditor.action.closeAttachment.tip")); + closeAction.putValue(Action.SHORT_DESCRIPTION, t("tutti.attachmentEditor.action.closeAttachment.tip")); rootPane.getActionMap().put(CLOSE_DIALOG_ACTION, closeAction); rootPane.getActionMap().put(SHOW_DIALOG_ACTION, openAction); @@ -238,7 +238,7 @@ File file = getPersistenceService().getAttachmentFile(attachment.getId()); if (!file.exists()) { - throw new ApplicationTechnicalException(_("tutti.attachmentEditor.fileNotFound", file.getAbsolutePath())); + throw new ApplicationTechnicalException(t("tutti.attachmentEditor.fileNotFound", file.getAbsolutePath())); } Desktop desktop = TuttiUIUtil.getDesktopForBrowse(); @@ -246,7 +246,7 @@ desktop.browse(file.toURI()); } catch (IOException e) { - getContext().getErrorHelper().showErrorDialog(_("swing.error.cannot.open.file")); + getContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); } } @@ -265,8 +265,8 @@ ui.setAlwaysOnTop(false); } int answer = JOptionPane.showConfirmDialog(ui, - _("tutti.attachmentEditor.deleteAttachment.message", attachment.getName()), - _("tutti.attachmentEditor.deleteAttachment.title"), + t("tutti.attachmentEditor.deleteAttachment.message", attachment.getName()), + t("tutti.attachmentEditor.deleteAttachment.title"), JOptionPane.YES_NO_OPTION); if (hackDialog) { ui.setAlwaysOnTop(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx 2014-02-04 08:31:02 UTC (rev 1566) @@ -25,7 +25,7 @@ <import> fr.ifremer.tutti.persistence.entities.data.Attachment - static org.nuiton.i18n.I18n._ + static org.nuiton.i18n.I18n.t static jaxx.runtime.JAXXUtil.getStringValue </import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -41,7 +41,7 @@ import java.beans.PropertyChangeListener; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Button to edit attachments. @@ -65,7 +65,7 @@ AttachmentModelAware model) { setIcon(SwingUtil.createActionIcon("edit-attachment")); - setToolTipText(_("tutti.attachmentEditor.action.tip")); + setToolTipText(t("tutti.attachmentEditor.action.tip")); popup = new AttachmentEditorUI(context); @@ -120,7 +120,7 @@ } public static String getButtonText(List<Attachment> attachment) { - return _("tutti.attachmentEditor.text", attachment.size()); + return t("tutti.attachmentEditor.text", attachment.size()); } public void init() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -31,7 +31,7 @@ import java.io.File; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * To persist a attachment. @@ -61,8 +61,8 @@ file = saveFile( ApplicationIOUtil.getBaseName(attachment.getName()), ApplicationIOUtil.getExtension(attachmentFile.getName()), - _("tutti.attachmentEditor.saveAttachment.title"), - _("tutti.attachmentEditor.saveAttachment.button")); + t("tutti.attachmentEditor.saveAttachment.title"), + t("tutti.attachmentEditor.saveAttachment.button")); doAction = file != null; } return doAction; @@ -80,9 +80,9 @@ try { ApplicationIOUtil.copyFile(attachmentFile, file, - _("tutti.attachmentEditor.saveAttachment.error.message", attachmentFile, file.getName())); + t("tutti.attachmentEditor.saveAttachment.error.message", attachmentFile, file.getName())); sendMessage( - _("tutti.attachmentEditor.saveAttachment.success.message", file.getName())); + t("tutti.attachmentEditor.saveAttachment.success.message", file.getName())); } finally { if (hackDialog) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -29,7 +29,7 @@ import java.awt.Container; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 1/29/14. @@ -54,7 +54,7 @@ public void open(String url, AuthenticationInfo authenticationInfo) { - ui.getInfoMessage().setText(_("tutti.login.infoMmessage", url)); + ui.getInfoMessage().setText(t("tutti.login.infoMmessage", url)); ui.getLoginField().setText(authenticationInfo == null ? null : authenticationInfo.getLogin()); ui.getPasswordField().setText(authenticationInfo == null ? null : new String(authenticationInfo.getPassword())); ui.pack(); 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -53,7 +53,7 @@ import java.io.Serializable; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author kmorin <kmorin(a)codelutin.com> @@ -103,7 +103,7 @@ builder.append("<html><ul>"); if (MapUtils.isEmpty(map)) { builder.append("<li>"); - builder.append(_("tutti.caracteristicMapEditor.none.tip")); + builder.append(t("tutti.caracteristicMapEditor.none.tip")); builder.append("</li>"); } for (Caracteristic caracteristic : map.keySet()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -26,7 +26,7 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * @author kmorin <kmorin(a)codelutin.com> @@ -38,13 +38,13 @@ public static final ColumnIdentifier<CaracteristicMapEditorRowModel> KEY = ColumnIdentifier.newId( CaracteristicMapEditorRowModel.PROPERTY_KEY, - n_("tutti.caracteristicMapEditorTable.table.header.key"), - n_("tutti.caracteristicMapEditorTable.table.header.key")); + n("tutti.caracteristicMapEditorTable.table.header.key"), + n("tutti.caracteristicMapEditorTable.table.header.key")); public static final ColumnIdentifier<CaracteristicMapEditorRowModel> VALUE = ColumnIdentifier.newId( CaracteristicMapEditorRowModel.PROPERTY_VALUE, - n_("tutti.caracteristicMapEditorTable.table.header.value"), - n_("tutti.caracteristicMapEditorTable.table.header.value")); + n("tutti.caracteristicMapEditorTable.table.header.value"), + n("tutti.caracteristicMapEditorTable.table.header.value")); public CaracteristicMapEditorTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); 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-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/GearCaracteristicListCellRenderer.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -39,7 +39,7 @@ import java.io.Serializable; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Created on 10/2/13. @@ -116,7 +116,7 @@ StringBuilder sb = new StringBuilder("<html><body>"); String gearStr = gearDecorator.toString(gear); - sb.append("<h3>").append(_("tutti.gear.withCaracteristics", gearStr)).append("</h3></hr>"); + sb.append("<h3>").append(t("tutti.gear.withCaracteristics", gearStr)).append("</h3></hr>"); if (MapUtils.isNotEmpty(gear.getCaracteristics())) { @@ -134,7 +134,7 @@ sb.append("</ul>"); } else { - sb.append("<i>").append(_("tutti.gear.noCaracteristics")).append("</i>"); + sb.append("<i>").append(t("tutti.gear.noCaracteristics")).append("</i>"); } sb.append("</body></html>"); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -37,7 +37,7 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * A toggleButton to show (or hide) comment editor. @@ -59,7 +59,7 @@ CommentAware model) { setIcon(SwingUtil.createActionIcon("edit-comment")); - setToolTipText(_("tutti.commentEditor.action.tip")); + setToolTipText(t("tutti.commentEditor.action.tip")); popup = new CommentEditorUI(context); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -33,8 +33,8 @@ import javax.swing.table.DefaultTableCellRenderer; import java.awt.Font; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.n; /** * To render a comment in a table cell. @@ -62,7 +62,7 @@ protected CommentCellRenderer() { setHorizontalAlignment(CENTER); setIcon(SwingUtil.createActionIcon("edit-comment")); - this.noneText = n_("tutti.commentEditor.none.tip"); + this.noneText = n("tutti.commentEditor.none.tip"); } @Override @@ -85,7 +85,7 @@ if (StringUtils.isEmpty(comment)) { // use HTML to show the tooltip in italic - toolTipTextValue = "<i>" + _(noneText) + "</i>"; + toolTipTextValue = "<i>" + t(noneText) + "</i>"; } else { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java 2014-02-04 08:31:02 UTC (rev 1566) @@ -44,7 +44,7 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -118,7 +118,7 @@ closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); closeAction.putValue(Action.ACTION_COMMAND_KEY, "close"); closeAction.putValue(Action.NAME, "close"); - closeAction.putValue(Action.SHORT_DESCRIPTION, _("tutti.commentEditor.action.close.tip")); + closeAction.putValue(Action.SHORT_DESCRIPTION, t("tutti.commentEditor.action.close.tip")); rootPane.getActionMap().put(CLOSE_DIALOG_ACTION, closeAction); rootPane.getActionMap().put(SHOW_DIALOG_ACTION, openAction); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css 2014-01-31 13:13:56 UTC (rev 1565) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.css 2014-02-04 08:31:02 UTC (rev 1566) @@ -23,11 +23,11 @@ */ #dialog { - title: {_("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())}; + title: {t("tutti.createSpeciesMelag.title", weightUnit.getShortLabel())}; } #message { - text: {_("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())}; + text: {t("tutti.createSpeciesMelag.message", weightUnit.getShortLabel())}; horizontalAlignment: {JLabel.CENTER}; }

1 0

r1565 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action
by tchemit＠users.forge.codelutin.com 31 Jan '14

31 Jan '14

Author: tchemit Date: 2014-01-31 14:13:56 +0100 (Fri, 31 Jan 2014) New Revision: 1565 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1565 Log: fixes #4286: [IMPORT PSION] V?\195?\169rifier les cat?\195?\169gorisation uniquement utilis?\195?\169es Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java 2014-01-31 10:56:26 UTC (rev 1564) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java 2014-01-31 13:13:56 UTC (rev 1565) @@ -32,6 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -78,6 +79,19 @@ return result; } + public Set<Integer> getSampleCategoryIdUsed() { + Set<Integer> result = Sets.newHashSet(); + for (PsionImportBatchModel batch : batchsByCategory.values()) { + Iterator<PsionImportBatchModel.SampleCategory> categoryIterator = batch.getCategoryIterator(); + while (categoryIterator.hasNext()) { + PsionImportBatchModel.SampleCategory next = categoryIterator.next(); + + result.add(next.getCategoryId()); + } + } + return result; + } + public boolean withErrors() { return !errors.isEmpty(); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-31 10:56:26 UTC (rev 1564) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-31 13:13:56 UTC (rev 1565) @@ -25,13 +25,12 @@ */ import com.google.common.base.Charsets; +import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.Files; -import org.nuiton.jaxx.application.ApplicationBusinessException; -import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -39,6 +38,7 @@ import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequencys; @@ -52,12 +52,14 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.type.WeightUnit; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; import java.io.BufferedReader; import java.io.File; @@ -232,8 +234,28 @@ } } else { - // persist in db - persist(result, importModel, operation, catchBatch); + // check sample categories exists + + SampleCategoryModel sampleCategoryModel = context.getSampleCategoryModel(); + Set<Integer> sampleCategoryIdUsed = importModel.getSampleCategoryIdUsed(); + List<String> missingCategories = Lists.newArrayList(); + for (Integer categoryId : sampleCategoryIdUsed) { + if (!sampleCategoryModel.containsCategoryId(categoryId)) { + missingCategories.add("<li>" + categoryId + "</li>"); + } + } + + if (!missingCategories.isEmpty()) { + + result.addError( + _("tutti.service.psionimport.error.invalidSampleCategoryModel.message", + Joiner.on("").join(missingCategories))); + } else { + + // persist in db + persist(result, importModel, operation, catchBatch); + } + } return result; Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2014-01-31 10:56:26 UTC (rev 1564) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2014-01-31 13:13:56 UTC (rev 1565) @@ -152,6 +152,7 @@ tutti.service.psionimport.error.invalid.firstLine= tutti.service.psionimport.error.invalid.line.syntax= tutti.service.psionimport.error.invalid.operation= +tutti.service.psionimport.error.invalidSampleCategoryModel.message= tutti.service.psionimport.error.no.lengthClass.caracteristic= tutti.service.psionimport.error.no.protocol= tutti.service.psionimport.error.species.already.used= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2014-01-31 10:56:26 UTC (rev 1564) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2014-01-31 13:13:56 UTC (rev 1565) @@ -151,6 +151,7 @@ tutti.service.psionimport.error.invalid.firstLine=La ligne %s (%s) n'est pas valide, elle doit être précédée par une ligne ESPE tutti.service.psionimport.error.invalid.line.syntax=Ligne %s, format incorrecte (%s) tutti.service.psionimport.error.invalid.operation=Code station ou date du trait incorrect +tutti.service.psionimport.error.invalidSampleCategoryModel.message=<html><body>Le modèle de catégorisation n'est pas compatible pour un import psion.<br> Il manque les catégories suivantes \: <ul>%s</ul><hr/>Veuillez ajouter cette catégorie dans la configuration de catégorisation (menu administration).</body></html> tutti.service.psionimport.error.no.lengthClass.caracteristic=Ligne %s espèce '%s' ignorée car pas de caractéristique de classe de taille renseignée dans le protocole. tutti.service.psionimport.error.no.protocol=Impossible de faire un import Psion sans protocol. tutti.service.psionimport.error.species.already.used="Ligne %s, espèce '%s' déjà utilisée Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-31 10:56:26 UTC (rev 1564) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-31 13:13:56 UTC (rev 1565) @@ -24,12 +24,8 @@ * #L% */ -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; -import fr.ifremer.tutti.persistence.service.TuttiEnumerationFile; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.psionimport.PsionImportResult; import fr.ifremer.tutti.service.psionimport.PsionImportService; @@ -41,10 +37,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; -import javax.swing.JOptionPane; -import javax.swing.UIManager; import java.io.File; -import java.util.List; import static org.nuiton.i18n.I18n._; @@ -83,32 +76,8 @@ @Override public boolean prepareAction() throws Exception { - boolean result = true; + boolean result = super.prepareAction(); - // must check that sample category model is compatible for pupitri import - // means need some categories - - TuttiEnumerationFile enumerationFile = persistenceService.getEnumerationFile(); - SampleCategoryModel sampleCategoryModel = getDataContext().getSampleCategoryModel(); - - List<String> missingCategories = Lists.newArrayList(); - if (!sampleCategoryModel.containsCategoryId(enumerationFile.PMFM_ID_SEX)) { - missingCategories.add("<li>" + persistenceService.getSexCaracteristic().getParameterName() + "</li>"); - } - if (!sampleCategoryModel.containsCategoryId(enumerationFile.PMFM_ID_MATURITY)) { - missingCategories.add("<li>" + persistenceService.getMaturityCaracteristic().getParameterName() + "</li>"); - } - if (!missingCategories.isEmpty()) { - result = false; - JOptionPane.showMessageDialog( - getContext().getActionUI(), - _("tutti.editSpeciesBatch.action.importPsion.invalidSampleCategoryModel.message", Joiner.on("").join(missingCategories)), - _("tutti.editSpeciesBatch.action.importPsion.invalidSampleCategoryModel.title"), - JOptionPane.ERROR_MESSAGE, - UIManager.getIcon("error") - ); - } - if (result) { // choose file to import importedTrunkFile = chooseFile( @@ -118,7 +87,6 @@ result = importedTrunkFile != null; } - return result; }

1 0

r1564 - in trunk: . tutti-persistence tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/java/fr/ifremer/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/
by tchemit＠users.forge.codelutin.com 31 Jan '14

31 Jan '14

Author: tchemit Date: 2014-01-31 11:56:26 +0100 (Fri, 31 Jan 2014) New Revision: 1564 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1564 Log: fixes #4285: Use jaxx-application instead of ifremer-shared Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 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/AttachmentPersistenceServiceImpl.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/ProtocolPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/pom.xml trunk/tutti-service/src/license/THIRD-PARTY.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.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/WeightCleaningService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.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/export/pdf/CatchesPdfExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 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/category/EditSampleCategoryModelTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.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/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 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/FishingOperationsUIHandler.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/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.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/SampleCategoryColumnIdentifier.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.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/accidental/create/CreateAccidentalBatchUIHandler.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/BenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 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/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.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/benthos/split/SplitBenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.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/marinelitter/MarineLitterBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.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/marinelitter/create/CreateMarineLitterBatchUIHandler.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/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 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/create/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.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/operation/catches/species/split/SplitSpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.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/content/protocol/MandatorySampleCategoryColumnIdentifier.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.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/CaracteristicMapEditorTableModel.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/comment/CommentCellEditor.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 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/CaracteristicColumnIdentifier.java trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -131,12 +131,11 @@ <signatureVersion>1.0</signatureVersion>  - <ifremerApplicationVersion>1.0.1</ifremerApplicationVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> <eugenePluginVersion>2.7.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.7</jaxxVersion> + <jaxxVersion>2.8-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.4.1</adagioVersion> @@ -194,18 +193,6 @@ <dependencyManagement> <dependencies> -  - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> - <version>${ifremerApplicationVersion}</version> - </dependency> - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application-swing</artifactId> - <version>${ifremerApplicationVersion}</version> - </dependency> -  <dependency> <groupId>fr.ifremer.adagio</groupId> @@ -317,6 +304,16 @@ <artifactId>jaxx-config</artifactId> <version>${jaxxVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-swing</artifactId> + <version>${jaxxVersion}</version> + </dependency>  <dependency> @@ -496,9 +493,9 @@ <version>${hibernateVersion}</version> </dependency> <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> - <version>${ifremerApplicationVersion}</version> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + <version>${jaxxVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -37,10 +37,10 @@ <dependencies> -  +  <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> </dependency>  Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,7 +29,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import org.hibernate.mapping.ForeignKey; import org.hibernate.tool.hbm2ddl.ColumnMetadata; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,11 +28,11 @@ import com.google.common.base.Predicate; import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationConfiguration; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.type.CoordinateEditorType; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import fr.ifremer.tutti.type.CoordinateEditorType; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.apache.commons.io.IOUtils; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.type.CoordinateEditorType; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.CoordinateEditorType; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.hibernate.dialect.HSQLDialect; import org.hsqldb.jdbcDriver; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; /** * Exception when batch model is not compatible with Tutti. Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.type.ApplicationProgressionModel; +import org.nuiton.jaxx.application.type.ApplicationProgressionModel; import org.nuiton.updater.DownloadMonitor; /** @@ -36,84 +36,7 @@ public class ProgressionModel extends ApplicationProgressionModel implements DownloadMonitor { private static final long serialVersionUID = 1L; -// -// public static final String PROPERTY_TOTAL = "total"; -// -// public static final String PROPERTY_CURRENT = "current"; -// -// public static final String PROPERTY_RATE = "rate"; -// -// public static final String PROPERTY_MESSAGE = "message"; -// -// protected int total; -// -// protected int current; -// -// protected float rate; -// -// protected String message; -// public int getTotal() { -// return total; -// } -// -// public void setTotal(int total) { -// Object oldValue = getTotal(); -// this.total = total; -// firePropertyChange(PROPERTY_TOTAL, oldValue, total); -// setCurrent(0); -// } -// -// public void adaptTotal(int total) { -// long current = getCurrent(); -// setTotal(total); -// increments((int) current); -// Object oldValue = getTotal(); -// this.total = total; -// firePropertyChange(PROPERTY_TOTAL, oldValue, total); -// setCurrent(current); -// } -// -// public long getCurrent() { -// return current; -// } -// -// public void setCurrent(int current) { -// Object oldValue = getCurrent(); -// this.current = current; -// firePropertyChange(PROPERTY_CURRENT, oldValue, current); -// } -// -// public void increments(int nb) { -// setCurrent(current + nb); -// setRate(getCurrent() / getTotal()); -// } -// -// public float getRate() { -// return rate; -// } -// -// public void setRate(float rate) { -// Object oldValue = getRate(); -// this.rate = rate; -// firePropertyChange(PROPERTY_RATE, oldValue, rate); -// } -// -// public String getMessage() { -// return message; -// } -// -// public void increments(String message) { -// increments(1); -// setMessage(message); -// } -// -// public void setMessage(String message) { -// Object oldValue = getMessage(); -// this.message = message; -// firePropertyChange(PROPERTY_MESSAGE, oldValue, message); -// } - @Override public void setSize(long size) { setTotal((int) size); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,8 +28,8 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.adagio.core.dao.technical.VersionNotFoundException; import fr.ifremer.adagio.core.service.technical.CacheService; import fr.ifremer.adagio.core.service.technical.sanity.DatabaseSanityService; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,7 +32,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationDataUtil; +import org.nuiton.jaxx.application.ApplicationDataUtil; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -45,11 +45,15 @@ import org.hibernate.cfg.Environment; import java.io.File; +import java.math.BigDecimal; +import java.math.MathContext; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -235,20 +239,6 @@ } } -// public static void closeSilently(Connection connection) { -// try { -// if (connection != null && !connection.isClosed()) { -// -// connection.close(); -// -// } -// } catch (SQLException e) { -// if (log.isErrorEnabled()) { -// log.error("Could not close connection, but do not care", e); -// } -// } -// } - public static Connection createConnection(Properties connectionProperties) throws SQLException { return createConnection( connectionProperties.getProperty(Environment.URL), @@ -422,4 +412,105 @@ return result; } + private static final double EARTH_RADIUS = 6378288.0; + + private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(4); + + private static DecimalFormatSymbols symbols; + + private static DecimalFormat decimalFormat; + + public static int computeDistanceInMeters(Float startLatitude, + Float startLongitude, + Float endLatitude, + Float endLongitude) { + + double sLat = startLatitude * Math.PI / 180.0; + double sLong = startLongitude * Math.PI / 180.0; + double eLat = endLatitude * Math.PI / 180.0; + double eLong = endLongitude * Math.PI / 180.0; + + Double d = EARTH_RADIUS * + (Math.PI / 2 - Math.asin(Math.sin(eLat) * Math.sin(sLat) + + Math.cos(eLong - sLong) * Math.cos(eLat) * Math.cos(sLat))); + return d.intValue(); + } + + public static String getDistanceInMilles(Float distance) { + String distanceText; + if (distance != null) { + Float distanceInMilles = distance / 1852; + distanceText = String.format("%.3f", distanceInMilles); + + } else { + distanceText = ""; + } + return distanceText; + } + + public static float getRoundedLengthStep(float lengthStep, boolean aroundUp) { + int intValue = (int) ((lengthStep + (aroundUp ? 0.001f : 0f)) * 10); + float result = intValue / 10f; + return result; + } + + public static DecimalFormatSymbols getDecimalFormatSymbols() { + if (symbols == null) { + symbols = new DecimalFormatSymbols(); + symbols.setDecimalSeparator('.'); + symbols.setGroupingSeparator(' '); + } + return symbols; + } + + public static DecimalFormat getDecimalFormat(int minDecimal, int maxDecimal) { + if (decimalFormat == null) { + decimalFormat = new DecimalFormat(); + decimalFormat.setDecimalFormatSymbols(getDecimalFormatSymbols()); + decimalFormat.setGroupingUsed(false); + } + decimalFormat.setMinimumFractionDigits(minDecimal); + decimalFormat.setMaximumFractionDigits(maxDecimal); + return decimalFormat; + } + + public static String getWeightStringValue(Float weight) { + String textValue; + if (weight != null) { + DecimalFormat weightDecimalFormat = getDecimalFormat(1, 3); + textValue = weightDecimalFormat.format(weight); + + } else { + textValue = ""; + } + return textValue; + } + + public static <N extends Number> N getValueOrComputedValue(N value, N computedValue) { + return value == null ? computedValue : value; + } + + public static <N extends Number> Boolean getValueOrComputedValueComputed(N value, N computedValue) { + Boolean result; + if (value == null) { + + result = computedValue == null ? null : true; + } else { + result = false; + } + return result; + } + + /** + * Round the given value to max 4 digits. + * + * @param value the float to round. + * @return the rounded value + * @since 1.0.1 + */ + public static float roundKiloGram(float value) { + BigDecimal sumB = new BigDecimal(value); + float result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue(); + return result; + } } 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.v1.SpeciesProtocol1; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ import fr.ifremer.adagio.core.dao.data.measure.file.MeasurementFileDao; import fr.ifremer.adagio.core.dao.referential.ObjectTypeImpl; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -58,7 +58,7 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDao; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.dao.GearPhysicalFeaturesDaoTutti; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,24 @@ +package fr.ifremer.tutti.type; + +/** + * Coordinate formats. + * <p/> + * Created on 11/24/13. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.2 + */ +public enum CoordinateEditorType { + /** + * Degre-Minute-second. + */ + DMS, + /** + * Degre decimal. + */ + DD, + /** + * Degre minute decimal + */ + DMD +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,94 @@ +package fr.ifremer.tutti.type; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +/** + * Different types of weight unit. + * <p/> + * Created on 09/22/13. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.2 + */ +public enum WeightUnit { + + G(n_("application.common.unit.g"), n_("application.common.unit.short.g"), 1, "\\d{0,6}(\\.\\d{0,1})?") { + @Override + public Float fromEntity(Float weight) { + return weight == null ? null : weight * 1000; + } + + @Override + public Float toEntity(Float weight) { + return weight == null ? null : weight / 1000.0f; + } + }, + KG(n_("application.common.unit.kg"), n_("application.common.unit.short.kg"), 4, "\\d{0,6}(\\.\\d{0,4})?") { + @Override + public Float fromEntity(Float weight) { + return weight; + } + + @Override + public Float toEntity(Float weight) { + return weight; + } + }; + + private final String i18nShortKey; + + private final String i18nKey; + + private final int numberDigits; + + private final String numberEditorPattern; + + WeightUnit(String i18nKey, String i18nShortKey, int numberDigits, String numberEditorPattern) { + this.i18nKey = i18nKey; + this.i18nShortKey = i18nShortKey; + this.numberDigits = numberDigits; + this.numberEditorPattern = numberEditorPattern; + } + + public String getLabel() { + return _(i18nKey); + } + + public String getShortLabel() { + return _(i18nShortKey); + } + + public int getNumberDigits() { + return numberDigits; + } + + public String getNumberEditorPattern() { + return numberEditorPattern; + } + + /** + * Transform the given {@code weight} coming from db to ui. + * + * @param weight weigth to transform + * @return the ui representation of the given {@code weight}. + */ + public abstract Float fromEntity(Float weight); + + /** + * Transform the given {@code weight} coming from ui to db. + * + * @param weight weigth to transform + * @return the db representation of the given {@code weight}. + */ + public abstract Float toEntity(Float weight); + + public String decorateLabel(String label) { + return String.format("%s (%s)", label, getShortLabel()); + } + + public String decorateTip(String tip) { + String unit = _("application.common.unit"); + return String.format("%s (%s %s)", tip, unit, getLabel()); + } +} \ No newline at end of file Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-01-31 10:56:26 UTC (rev 1564) @@ -1,3 +1,8 @@ +application.common.unit=Unit +application.common.unit.g=Gram +application.common.unit.kg=Kilogram +application.common.unit.short.g=g +application.common.unit.short.kg=kg tutti.config= tutti.config.option.basedir.description= tutti.config.option.cruiseId.description= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-01-31 10:56:26 UTC (rev 1564) @@ -1,3 +1,8 @@ +application.common.unit=Unité +application.common.unit.g=Gramme +application.common.unit.kg=Kilogramme +application.common.unit.short.g=g +application.common.unit.short.kg=kg tutti.config= tutti.config.option.basedir.description=Répertoire principale tutti.config.option.cruiseId.description=Identifiant de la dernière campagne utilisée Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -48,10 +48,10 @@ <version>${project.version}</version> </dependency> -  +  <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> </dependency>  Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2014-01-31 10:56:26 UTC (rev 1564) @@ -20,6 +20,7 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - Mozilla Public License # - New BSD License # - Public Domain @@ -30,7 +31,7 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jan 15 09:00:37 CET 2014 +#Fri Jan 31 11:50:47 CET 2014 antlr--antlr--2.7.6=BSD License batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 @@ -47,5 +48,4 @@ batik--batik-xml--1.6=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 -javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.io.FileUtils; import org.nuiton.util.ZipUtil; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,8 +29,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.InvalidBatchModelException; import fr.ifremer.tutti.persistence.TuttiPersistence; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,7 +29,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.opensymphony.xwork2.util.ValueStack; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; /** * @author kmorin <kmorin(a)codelutin.com> 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.InvalidBatchModelException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,8 +29,8 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.TuttiEntity; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,9 +29,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; 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 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; 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 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,7 +32,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,8 +30,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,8 +32,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Gears; import fr.ifremer.tutti.persistence.entities.referential.Person; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.AbstractTuttiService; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.RessourceClassLoader; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.FishingOperations; Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -111,16 +111,6 @@ <version>${project.version}</version> </dependency> -  - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> - </dependency> - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application-swing</artifactId> - </dependency> -  <dependency> <groupId>org.nuiton</groupId> @@ -194,6 +184,14 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-swing</artifactId> + </dependency>  <dependency> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,10 +24,10 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.AbstractApplicationUIHandler; -import fr.ifremer.shared.application.swing.action.AbstractApplicationAction; -import fr.ifremer.shared.application.swing.action.ApplicationActionFactory; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; +import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; import fr.ifremer.tutti.ui.swing.action.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import org.apache.commons.lang3.reflect.ConstructorUtils; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroResult; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.action.ApplicationActionException; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,16 +27,16 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationConfiguration; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; -import fr.ifremer.shared.application.swing.ApplicationUIContext; -import fr.ifremer.shared.application.swing.action.ApplicationActionEngine; -import fr.ifremer.shared.application.swing.action.ApplicationActionFactory; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; -import fr.ifremer.shared.application.swing.util.ApplicationErrorHelper; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.swing.ApplicationUIContext; +import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; +import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ichtyometer.feed.FeedReader; import fr.ifremer.tutti.persistence.RessourceClassLoader; @@ -807,6 +807,7 @@ return actionUI; } + @Override public ApplicationActionUI getExistingActionUI() { while (actionUI == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.swing.action.AbstractApplicationAction; +import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.TuttiDataContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; import fr.ifremer.tutti.ichtyometer.LocalDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.export.generic.TuttiExportService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.service.PersistenceService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.swing.action.ApplicationUIAction; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.TuttiPersistence; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.export.pdf.CatchesPdfExportService; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.logging.Log; 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 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ichtyometer.feed.FeedReader; import fr.ifremer.tutti.persistence.entities.data.Cruise; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Cruise; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -22,8 +22,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.action.ApplicationActionUIModel; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUIModel; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.action.EditCruiseFishingOperationAction; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.util.ActionListCellRenderer + org.nuiton.jaxx.application.swing.util.ActionListCellRenderer jaxx.runtime.swing.editor.bean.BeanFilterableComboBox Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -37,7 +37,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment - fr.ifremer.shared.application.type.CoordinateEditorType + fr.ifremer.tutti.type.CoordinateEditorType jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.tab.TabHandler; -import fr.ifremer.shared.application.type.CoordinateEditorType; +import org.nuiton.jaxx.application.swing.tab.TabHandler; +import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.tab.TabContentModel; -import fr.ifremer.shared.application.type.CoordinateEditorType; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,9 +28,9 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jdesktop.swingx.JXTable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -48,7 +48,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTitledPanel Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.tab.TabHandler; +import org.nuiton.jaxx.application.swing.tab.TabHandler; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,8 +28,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; @@ -38,7 +38,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.collections.CollectionUtils; import org.nuiton.util.beans.Binder; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.SampleCategory; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import java.io.Serializable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiDecorator; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatchs; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,10 +24,10 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -36,6 +34,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -59,6 +58,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.apache.commons.collections.CollectionUtils; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -23,7 +23,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,13 +27,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnIdentifier; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.table.TableColumnModelExt; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTable 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequencys; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,9 +25,9 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import java.beans.PropertyChangeEvent; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import java.util.List; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatchs; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapColumnRowModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -22,9 +22,9 @@ * #L% */ -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.apache.commons.collections.CollectionUtils; import java.util.List; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationDataUtil; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatchs; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; 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/marinelitter/MarineLitterBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTable Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,9 +26,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,8 +28,8 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; -import fr.ifremer.shared.application.swing.computable.ComputableData; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import org.apache.commons.collections.CollectionUtils; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -38,11 +37,11 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchs; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.computable.ComputableData; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,13 +27,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnIdentifier; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.table.TableColumnModelExt; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTable 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,13 +26,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.computable.ComputableData; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; 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/frequency/SpeciesFrequencyRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequencys; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; 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/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,9 +25,9 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import java.beans.PropertyChangeEvent; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderListener; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderRecord; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import java.util.List; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import java.io.Serializable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import jaxx.runtime.validator.swing.SwingValidator; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,10 +25,10 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import java.util.List; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,7 +29,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; /** * @author tchemit <chemit(a)codelutin.com> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.report.ReportService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.util.CollectionUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,10 +25,10 @@ * #L% */ -import fr.ifremer.shared.application.swing.tab.DelegateTabContainerHandler; -import fr.ifremer.shared.application.swing.tab.TabContainerHandler; -import fr.ifremer.shared.application.swing.tab.TabContentModel; -import fr.ifremer.shared.application.swing.tab.TabHandler; +import org.nuiton.jaxx.application.swing.tab.DelegateTabContainerHandler; +import org.nuiton.jaxx.application.swing.tab.TabContainerHandler; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabHandler; import fr.ifremer.tutti.ui.swing.TuttiUIContext; /** Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,9 +26,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.AbstractApplicationUIHandler; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import fr.ifremer.tutti.type.WeightUnit; +import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.jdesktop.swingx.table.TableColumnExt; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; @@ -51,17 +55,26 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.bean.simple.SimpleBeanValidator; +import javax.swing.JTable; import javax.swing.JTextField; +import javax.swing.border.LineBorder; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumnModel; +import java.awt.Color; import java.awt.Component; import java.awt.Font; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Contract of any UI handler. * @@ -387,4 +400,49 @@ return title.toString(); } + protected <R> TableColumnExt addFloatColumnToModel(TableColumnModel model, + ColumnIdentifier<R> identifier, + WeightUnit weightUnit, + JTable table) { + + Preconditions.checkNotNull(weightUnit); + NumberCellEditor<Float> editor = + JAXXWidgetUtil.newNumberTableCellEditor(Float.class, false); + editor.getNumberEditor().setSelectAllTextOnError(true); + editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); + editor.getNumberEditor().setNumberPattern(weightUnit.getNumberEditorPattern()); + + TableCellRenderer renderer = + newNumberCellRenderer(table.getDefaultRenderer(Number.class)); + + return addColumnToModel(model, editor, renderer, identifier, weightUnit); + } + + protected <R> TableColumnExt addColumnToModel(TableColumnModel model, + TableCellEditor editor, + TableCellRenderer renderer, + ColumnIdentifier<R> identifier, + WeightUnit weightUnit) { + + TableColumnExt col = new TableColumnExt(model.getColumnCount()); + col.setCellEditor(editor); + col.setCellRenderer(renderer); + String label = _(identifier.getHeaderI18nKey()); + if (weightUnit != null) { + label = weightUnit.decorateLabel(label); + } + col.setHeaderValue(label); + String tip = _(identifier.getHeaderTipI18nKey()); + if (weightUnit != null) { + tip = weightUnit.decorateTip(tip); + } + col.setToolTipText(tip); + + col.setIdentifier(identifier); + model.addColumn(col); + // by default no column is sortable, must specify it + col.setSortable(false); + return col; + } + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.action.ApplicationActionException; -import fr.ifremer.shared.application.swing.util.ApplicationErrorHelper; -import fr.ifremer.shared.application.swing.util.ApplicationExceptionHandler; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; +import org.nuiton.jaxx.application.swing.util.ApplicationExceptionHandler; import fr.ifremer.tutti.ui.swing.action.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; import org.apache.commons.logging.Log; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,11 @@ * #L% */ -import fr.ifremer.shared.application.swing.ApplicationUI; +import org.nuiton.jaxx.application.swing.ApplicationUI; +import javax.swing.UIManager; +import java.awt.Font; + /** * Contract to place on each generated jaxx ui. * @@ -34,6 +37,10 @@ */ public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M, ?>> extends ApplicationUI<M, H> { + Font TEXTFIELD_NORMAL_FONT = UIManager.getDefaults().getFont("TextField.font"); + + Font TEXTFIELD_COMPUTED_FONT = UIManager.getDefaults().getFont("TextField.font").deriveFont(Font.ITALIC); + H getHandler(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.swing.util.ApplicationUIUtil; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; 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/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -22,8 +22,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CommentAware; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,127 @@ +package fr.ifremer.tutti.ui.swing.util.computable; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swin… $ + * %% + * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT + * %% + * 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 org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; + + +/** + * A number data plus a possible computed value. + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 1.0 + */ +public class ComputableData<N extends Number> extends AbstractSerializableBean { + + public static final String PROPERTY_DATA = "data"; + + public static final String PROPERTY_COMPUTED_DATA = "computedData"; + + private static final long serialVersionUID = 1L; + + protected N data; + + protected N computedData; + + public ComputableData() { + data = null; + computedData = null; + } + + public ComputableData(N data, N computedData) { + this.data = data; + this.computedData = computedData; + } + + public N getData() { + return data; + } + + public void setData(N data) { + Object oldValue = getData(); + this.data = data; + firePropertyChange(PROPERTY_DATA, oldValue, data); + } + + public N getComputedData() { + return computedData; + } + + public void setComputedData(N computedData) { + Object oldValue = getComputedData(); + this.computedData = computedData; + firePropertyChange(PROPERTY_COMPUTED_DATA, oldValue, computedData); + } + + @Override + public String toString() { + String result = null; + if (data != null) { + result = data.toString(); + } else if (computedData != null) { + result = computedData.toString(); + } + return result; + } + + /** + * Add a listener to propagate the modification of the + * {@link #PROPERTY_DATA} property to a given {@code propertyName}. + * + * @param propertyName name of the property to fire on given bean + * @param otherBean bean that will fires + * @since 1.2 + */ + public void addPropagateListener(String propertyName, + PropagatePropertyChangeListener.PropagatePropertyChange otherBean) { + + PropagatePropertyChangeListener.listenAndPropagate(this, + otherBean, + PROPERTY_DATA, + propertyName); + +// PropagatePropertyChangeListener listener = new PropagatePropertyChangeListener(propertyName, otherBean); +// addPropertyChangeListener(PROPERTY_DATA, listener); + } + +// private static class PropagateProperyChangeListener implements PropertyChangeListener { +// +// private String propertyName; +// +// private AbstractTuttiBeanUIModel otherBean; +// +// public PropagatePropertyChangeLstener(String propertyName, +// AbstractTuttiBeanUIModel otherBean) { +// this.propertyName = propertyName; +// this.otherBean = otherBean; +// } +// +// @Override +// public void propertyChange(PropertyChangeEvent evt) { +// otherBean.firePropertyChanged(propertyName, evt.getOldValue(), evt.getNewValue()); +// } +// } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,53 @@ + +<jaxx.runtime.swing.editor.NumberEditor genericType='E extends Number'> + + <import> + java.awt.Color + </import> + + <String id='property' javaBean='ComputableData.PROPERTY_DATA'/> + + <ComputableData id='bean' genericType='E' javaBean='null'/> + + <Color id='computedDataColor' javaBean='null'/> + +  + <ComputableDataEditorHandler id='handler' constructorParams='this'/> + + <Integer id='decimalNumber' javaBean='null'/> + + <script><![CDATA[ + + public void setBean(ComputableData<E> bean) { + super.setBean(bean); + } + + public void setProperty(String property) { + // cannot change the property + } +]]> + </script> + +</jaxx.runtime.swing.editor.NumberEditor> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,138 @@ + +package fr.ifremer.tutti.ui.swing.util.computable; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swin… $ + * %% + * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT + * %% + * 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.TuttiEntities; +import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.swing.editor.NumberEditorHandler; + +import javax.swing.JTextField; +import java.awt.Color; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.text.DecimalFormat; + +/** + * @author kmorin <kmorin(a)codelutin.com> + * @since 1.0 + */ +public class ComputableDataEditorHandler extends NumberEditorHandler { + + protected Integer decimalNumber; + + public ComputableDataEditorHandler(ComputableDataEditor ui) { + super(ui); + } + + @Override + public void init() { + final PropertyChangeListener l = new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + setComputedTextIfNullModel(); + } + }; + + ComputableData bean = (ComputableData) editor.getBean(); + if (bean != null) { + bean.addPropertyChangeListener(l); + } + editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_BEAN, new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + + ComputableData bean = (ComputableData) evt.getOldValue(); + if (bean != null) { + bean.removePropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); + } + + bean = (ComputableData) evt.getNewValue(); + if (bean != null) { + bean.addPropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); + } + } + }); + + editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_MODEL, l); + + editor.getTextField().addFocusListener(new FocusListener() { + + public void focusGained(FocusEvent e) { + JTextField tf = editor.getTextField(); + tf.setFont(TuttiUI.TEXTFIELD_NORMAL_FONT); + tf.setForeground(Color.BLACK); + if (editor.getModel() == null) { + tf.setText(""); + } + } + + public void focusLost(FocusEvent e) { + setComputedTextIfNullModel(); + } + }); + + editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_DECIMAL_NUMBER, + new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + decimalNumber = (Integer) evt.getNewValue(); + } + }); + + decimalNumber = ((ComputableDataEditor) editor).getDecimalNumber(); + + super.init(); + + } + + protected void setComputedTextIfNullModel() { + ComputableData bean = (ComputableData) editor.getBean(); + JTextField tf = editor.getTextField(); + if (bean != null && editor.getModel() == null) { + tf.setFont(TuttiUI.TEXTFIELD_COMPUTED_FONT); + tf.setForeground(((ComputableDataEditor) editor).getComputedDataColor()); + + String modelText; + Number computedData = bean.getComputedData(); + if (editor.isUseFloat() + && decimalNumber != null && computedData != null) { + DecimalFormat decimalFormat = TuttiEntities.getDecimalFormat(1, decimalNumber); + modelText = decimalFormat.format(computedData); + } else { + modelText = JAXXUtil.getStringValue(computedData); + } + tf.setText(modelText); + + } else { + tf.setFont(TuttiUI.TEXTFIELD_NORMAL_FONT); + tf.setForeground(Color.BLACK); + } + } + +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,259 @@ +package fr.ifremer.tutti.ui.swing.util.computable; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swin… $ + * %% + * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT + * %% + * 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.TuttiEntities; +import fr.ifremer.tutti.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import jaxx.runtime.JAXXUtil; + +import javax.swing.AbstractCellEditor; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.border.LineBorder; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Color; +import java.awt.Component; +import java.awt.Font; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.text.DecimalFormat; + +/** + * Editor for TuttiComputedOrNotData + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 1.0 + */ +public class ComputableDataTableCell extends DefaultTableCellRenderer { + private static final long serialVersionUID = 1L; + + public static TableCellRenderer newRender(TableCellRenderer renderer, + WeightUnit weightUnit, + Color computedDataColor) { + + return new TuttiComputedOrNotDataTableCellRenderer(renderer, + true, + weightUnit.getNumberDigits(), + computedDataColor); + } + + public static TableCellEditor newEditor(Class type, + WeightUnit weightUnit, + Color computedDataColor) { + + return new TuttiComputedOrNotDataTableCellEditor(type, + false, + true, + weightUnit.getNumberDigits(), + weightUnit.getNumberEditorPattern(), + computedDataColor); + } + + public static class TuttiComputedOrNotDataTableCellEditor + extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener { + + private static final long serialVersionUID = 1L; + + protected final ComputableDataEditor numberEditor; + + protected ComputableData data; + + /** constructor */ + public TuttiComputedOrNotDataTableCellEditor(Class type, + boolean useSign, + boolean useFloat, + Integer decimalNumber, + String numberPattern, + Color computedDataColor) { + + numberEditor = new ComputableDataEditor(); + numberEditor.setComputedDataColor(computedDataColor); + numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); + numberEditor.getTextField().addFocusListener(this); + numberEditor.getTextField().addAncestorListener(this); + numberEditor.getTextField().setBorder(new LineBorder(Color.GRAY, 2)); + numberEditor.setSelectAllTextOnError(true); + + numberEditor.setNumberPattern(numberPattern); + numberEditor.setModelType(type); + numberEditor.setUseSign(useSign); + numberEditor.setUseFloat(useFloat); + numberEditor.setDecimalNumber(decimalNumber); + numberEditor.init(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, int row, int column) { + + data = (ComputableData) value; + numberEditor.setModel(data.getData()); + + // Check nullity and set the text that will be selected with the current value + if (data.getData() != null) { + numberEditor.setModelText(String.valueOf(data.getData())); + } + return numberEditor; + } + + public ComputableDataEditor getNumberEditor() { + return numberEditor; + } + + @Override + public ComputableData getCellEditorValue() { + return data; + } + + @Override + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void focusLost(FocusEvent e) { + } + + @Override + public void ancestorAdded(AncestorEvent event) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void ancestorRemoved(AncestorEvent event) { + } + + @Override + public void ancestorMoved(AncestorEvent event) { + } + + @Override + public boolean stopCellEditing() { + boolean result = super.stopCellEditing(); + // Reset previous data to avoid keeping it on other cell edition + if (result) { + data.setData(numberEditor.getModel()); + + numberEditor.setBean(null); + + data = null; + } + return result; + } + } + + public static class TuttiComputedOrNotDataTableCellRenderer + implements TableCellRenderer { + + protected final TableCellRenderer delegate; + + protected Integer decimalNumber; + + protected Color computedDataColor; + + protected boolean useFloat; + + public TuttiComputedOrNotDataTableCellRenderer( + TableCellRenderer delegate, + boolean useFloat, + Integer decimalNumber, + Color computedDataColor) { + + this.delegate = delegate; + this.useFloat = useFloat; + this.decimalNumber = decimalNumber; + this.computedDataColor = computedDataColor; + } + + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + + ComputableData data = (ComputableData) value; + Number dataValue = data.getData(); + Font font; + Color foreground; + String text; + if (dataValue == null) { + dataValue = data.getComputedData(); + font = TuttiUI.TEXTFIELD_COMPUTED_FONT; + foreground = computedDataColor; + + if (useFloat && decimalNumber != null && dataValue != null) { + DecimalFormat decimalFormat = TuttiEntities.getDecimalFormat(1, decimalNumber); + text = JAXXUtil.getStringValue(decimalFormat.format(dataValue)); + } else { + text = JAXXUtil.getStringValue(dataValue); + } + + } else { + font = TuttiUI.TEXTFIELD_NORMAL_FONT; + foreground = Color.BLACK; + text = JAXXUtil.getStringValue(dataValue); + } + + Component component = delegate.getTableCellRendererComponent(table, + text, + isSelected, + hasFocus, + row, + column); + + if (isSelected) { + font = font.deriveFont(Font.BOLD); + } + component.setFont(font); + component.setForeground(foreground); + if (component instanceof JLabel) { + JLabel jLabel = (JLabel) component; + jLabel.setHorizontalAlignment(RIGHT); + } + + return component; + } + + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -23,7 +23,7 @@ --> <JDialog id='dialog' layout='{new BorderLayout()}'> <import> - fr.ifremer.shared.application.type.WeightUnit; + fr.ifremer.tutti.type.WeightUnit; java.awt.Component; java.awt.event.WindowAdapter; 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-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,12 +26,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.MoveToNextEditableCellAction; -import fr.ifremer.shared.application.swing.table.MoveToNextEditableRowAction; -import fr.ifremer.shared.application.swing.table.MoveToPreviousEditableCellAction; -import fr.ifremer.shared.application.swing.table.MoveToPreviousEditableRowAction; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.MoveToNextEditableCellAction; +import org.nuiton.jaxx.application.swing.table.MoveToNextEditableRowAction; +import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableCellAction; +import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableRowAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent.SampleCategoryEditor; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; Modified: trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java =================================================================== --- trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import org.junit.Assert; import org.junit.Test;

1 0

r1563 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action
by tchemit＠users.forge.codelutin.com 31 Jan '14

31 Jan '14

Author: tchemit Date: 2014-01-31 09:13:14 +0100 (Fri, 31 Jan 2014) New Revision: 1563 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1563 Log: fixes #4283: [IMPORT PSION] texte en bas d'?\195?\169cran ?\195?\160 v?\195?\169rifer apr?\195?\168s import Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-31 08:12:18 UTC (rev 1562) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportPsionAction.java 2014-01-31 08:13:14 UTC (rev 1563) @@ -157,7 +157,7 @@ if (importResult.isDone()) { sendMessage(_("tutti.editSpeciesBatch.action.importPsion.success", - getModel().getRootNumber(), importResult.getNbImported())); + importResult.getNbImported())); } else { StringBuilder sb = new StringBuilder();

1 0

r1562 - trunk/tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 31 Jan '14

31 Jan '14

Author: tchemit Date: 2014-01-31 09:12:18 +0100 (Fri, 31 Jan 2014) New Revision: 1562 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1562 Log: fixes #4283: [IMPORT PSION] texte en bas d'?\195?\169cran ?\195?\160 v?\195?\169rifer apr?\195?\168s import Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-30 22:15:48 UTC (rev 1561) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-31 08:12:18 UTC (rev 1562) @@ -979,7 +979,7 @@ tutti.editSpeciesBatch.action.importPsion.no.matching.data=Import psion non réalisé (des erreurs ont été détectées lors de la lecture du fichier) tutti.editSpeciesBatch.action.importPsion.no.matching.fishingOperation=L'import Psion n'a pas été réalisé, des erreurs ont été détectées \:<ul>%s</ul><br/>Aucun lot n'a donc été importé. tutti.editSpeciesBatch.action.importPsion.no.matching.fishingOperation.title=Import Psion -tutti.editSpeciesBatch.action.importPsion.success=Import Psion réussi \: %1s espèces importées, %2s espèces rejetées +tutti.editSpeciesBatch.action.importPsion.success=Import Psion réussi \: %1s espèces importées tutti.editSpeciesBatch.action.importPsion.tip=Import Psion tutti.editSpeciesBatch.action.importPupitri=Import Pupitri tutti.editSpeciesBatch.action.importPupitri.existingData.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas importer les données Pupitri et conserver les espèces saisies</li><li><strong>OK</strong> pour supprimer les espèces existantes et les remplacer par les données de Pupitri</li></ul>

1 0

r1561 - in trunk/tutti-ichtyometer: . src/main/assembly src/main/java/fr/ifremer/tutti/ichtyometer/tool
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 23:15:48 +0100 (Thu, 30 Jan 2014) New Revision: 1561 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1561 Log: add some tools for bigfin debug Modified: trunk/tutti-ichtyometer/pom.xml trunk/tutti-ichtyometer/src/main/assembly/tools.xml trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 21:52:42 UTC (rev 1560) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 22:15:48 UTC (rev 1561) @@ -91,6 +91,19 @@ <profiles> <profile> <id>tools</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <properties> + <redmine.releaseFiles> + target/${project.build.finalName}-tools.zip + </redmine.releaseFiles> + </properties> + <build> <defaultGoal>package</defaultGoal> @@ -108,8 +121,7 @@ <descriptorRefs> <descriptorRef>jar-with-dependencies</descriptorRef> </descriptorRefs> - <finalName>${project.build.finalName}-tools</finalName> - <appendAssemblyId>false</appendAssemblyId> + </configuration> </execution> <execution> @@ -120,10 +132,13 @@ <phase>package</phase> <configuration> <descriptor>src/main/assembly/tools.xml</descriptor> - <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> + <configuration> + <finalName>${project.build.finalName}-tools</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> </plugin> </plugins> </build> Modified: trunk/tutti-ichtyometer/src/main/assembly/tools.xml =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/tools.xml 2014-01-30 21:52:42 UTC (rev 1560) +++ trunk/tutti-ichtyometer/src/main/assembly/tools.xml 2014-01-30 22:15:48 UTC (rev 1561) @@ -48,6 +48,9 @@ <includes> <include>*</include> </includes> + <excludes> + <exclude>tools.xml</exclude> + </excludes> </fileSet> <fileSet> Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java 2014-01-30 21:52:42 UTC (rev 1560) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java 2014-01-30 22:15:48 UTC (rev 1561) @@ -61,6 +61,9 @@ writer.println(i++ + " for device " + remoteDeviceName); } writer.println("q (to quit)"); + writer.print("Your choice: "); + writer.flush(); + String command = console.readLine(); if ("q".equals(command)) {

1 0

r1560 - in trunk/tutti-ichtyometer: . src/main src/main/assembly src/main/java/fr/ifremer/tutti/ichtyometer src/main/java/fr/ifremer/tutti/ichtyometer/feed src/main/java/fr/ifremer/tutti/ichtyometer/tool
by tchemit＠users.forge.codelutin.com 30 Jan '14

30 Jan '14

Author: tchemit Date: 2014-01-30 22:52:42 +0100 (Thu, 30 Jan 2014) New Revision: 1560 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1560 Log: add some tools for bigfin debug Added: trunk/tutti-ichtyometer/src/main/assembly/ trunk/tutti-ichtyometer/src/main/assembly/README trunk/tutti-ichtyometer/src/main/assembly/build-checksum.bat trunk/tutti-ichtyometer/src/main/assembly/build-checksum.sh trunk/tutti-ichtyometer/src/main/assembly/feed-reader.bat trunk/tutti-ichtyometer/src/main/assembly/feed-reader.sh trunk/tutti-ichtyometer/src/main/assembly/log4j.properties trunk/tutti-ichtyometer/src/main/assembly/tools.xml trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java Modified: trunk/tutti-ichtyometer/pom.xml trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java Modified: trunk/tutti-ichtyometer/pom.xml =================================================================== --- trunk/tutti-ichtyometer/pom.xml 2014-01-30 19:15:37 UTC (rev 1559) +++ trunk/tutti-ichtyometer/pom.xml 2014-01-30 21:52:42 UTC (rev 1560) @@ -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> @@ -87,11 +88,57 @@ </dependencies> - <build> + <profiles> + <profile> + <id>tools</id> + <build> + <defaultGoal>package</defaultGoal> - <plugins> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>jar</id> + <goals> + <goal>assembly</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + <finalName>${project.build.finalName}-tools</finalName> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>zip</id> + <goals> + <goal>assembly</goal> + </goals> + <phase>package</phase> + <configuration> + <descriptor>src/main/assembly/tools.xml</descriptor> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - </plugins> - </build> + <dependencies> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + </profile> + </profiles> + </project> Added: trunk/tutti-ichtyometer/src/main/assembly/README =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/README (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/README 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1,29 @@ +Abstract +-------- + +Here is some little tools around Ichtyometer BigFin. + +You need to have java installed on your computer (at least java 7.0). + +build-checksum +-------------- + +Tool to compute some checksum + +To start, launch command + +build-checksum.bat (on windows OS) +build-checksum.sh (on linux OS) + +feed-mode +--------- + +Tool to listen records for the board + +To start, launch command + +feed-reader.bat (on windows OS) +feed-reader.sh (on linux OS) + + +Tony Chemit @copyright Code Lutin 2014 \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/README ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/assembly/build-checksum.bat =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/build-checksum.bat (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/build-checksum.bat 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1 @@ +java -cp ${project.build.finalName}-tools.${project.packaging} -Dlog4j.configuration=file://%CD%/log4j.properties fr.ifremer.tutti.ichtyometer.tool.CRCBuilderTool \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/build-checksum.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/assembly/build-checksum.sh =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/build-checksum.sh (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/build-checksum.sh 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1,2 @@ +#!/bin/sh +java -cp ${project.build.finalName}-tools.${project.packaging} -Dlog4j.configuration=file://$(pwd)/log4j.properties fr.ifremer.tutti.ichtyometer.tool.CRCBuilderTool \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/build-checksum.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/assembly/feed-reader.bat =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/feed-reader.bat (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/feed-reader.bat 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1 @@ +java -cp ${project.build.finalName}-tools.${project.packaging} -Dlog4j.configuration=file://%CD%/log4j.properties fr.ifremer.tutti.ichtyometer.tool.FeadReaderTool \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/feed-reader.bat ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/assembly/feed-reader.sh =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/feed-reader.sh (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/feed-reader.sh 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1,2 @@ +#!/bin/sh +java -cp ${project.build.finalName}-tools.${project.packaging} -Dlog4j.configuration=file://$(pwd)/log4j.properties fr.ifremer.tutti.ichtyometer.tool.FeadReaderTool \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/feed-reader.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/assembly/log4j.properties =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/log4j.properties (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/log4j.properties 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1,32 @@ +### +# #%L +# Tutti :: Ichtyometer API +# $Id$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 - 2014 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% +### +log4j.rootCategory=INFO, A1 +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n + +log4j.logger.javax.bluetooth=DEBUG + +#Uncomment this for some debug informations +#log4j.logger.fr.ifremer.tutti.ichtyometer.feed=DEBUG \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/assembly/tools.xml =================================================================== --- trunk/tutti-ichtyometer/src/main/assembly/tools.xml (rev 0) +++ trunk/tutti-ichtyometer/src/main/assembly/tools.xml 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1,60 @@ + +<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>standalone</id> + <formats> + <format>zip</format> + </formats> + + <fileSets> + + <fileSet> + <directory>target</directory> + <outputDirectory/> + <includes> + <include>${project.build.finalName}-tools.${project.packaging}</include> + </includes> + </fileSet> + + <fileSet> + <directory>src/main/assembly</directory> + <outputDirectory/> + <filtered>true</filtered> + <fileMode>0755</fileMode> + <includes> + <include>*</include> + </includes> + </fileSet> + + <fileSet> + <includes> + <include>LICENSE*</include> + </includes> + </fileSet> + + </fileSets> +</assembly> \ No newline at end of file Property changes on: trunk/tutti-ichtyometer/src/main/assembly/tools.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-01-30 19:15:37 UTC (rev 1559) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java 2014-01-30 21:52:42 UTC (rev 1560) @@ -107,7 +107,7 @@ .toString(); } - protected String computeCRC(String record) { + public static String computeCRC(String record) { // use long because int are signed and add doesn't work correctly long checksum = 0; Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1,60 @@ +package fr.ifremer.tutti.ichtyometer.tool; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.ichtyometer.feed.FeedReaderRecord; + +import java.io.Console; +import java.io.PrintWriter; + +/** + * Created on 1/30/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.2 + */ +public class CRCBuilderTool { + + public static void main(String[] args) { + + Console console = System.console(); + PrintWriter writer = console.writer(); + writer.println("CRCBuilderTool: to build CRC code v1.0"); + + while (true) { + + writer.print("Enter new record (or q to quit): "); + writer.flush(); + String command = console.readLine(); + + if ("q".equals(command)) { + break; + } + + String crc = FeedReaderRecord.computeCRC(command); + writer.println("CRC= " + crc); + } + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java =================================================================== --- trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java (rev 0) +++ trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java 2014-01-30 21:52:42 UTC (rev 1560) @@ -0,0 +1,98 @@ +package fr.ifremer.tutti.ichtyometer.tool; + +/* + * #%L + * Tutti :: Ichtyometer API + * $Id$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 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.collect.Lists; +import fr.ifremer.tutti.ichtyometer.IchtyometerClient; +import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; +import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.FeedReaderEvent; +import fr.ifremer.tutti.ichtyometer.feed.FeedReaderListener; + +import java.io.Console; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.List; +import java.util.Set; + +/** + * Created on 1/30/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 3.2 + */ +public class FeedReaderTool { + + public static void main(String[] args) throws IOException { + + final PrintWriter writer = System.console().writer(); + writer.println("FeedReaderTool: to display record in feed mode v1.0"); + + RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { + @Override + public String chooseRemoteDevice(Set<String> remoteDeviceNames) { + List<String> remoteDeviceNameList = Lists.newArrayList(remoteDeviceNames); + Console console = System.console(); + writer.println("Choose you device"); + int i = 0; + for (String remoteDeviceName : remoteDeviceNameList) { + writer.println(i++ + " for device " + remoteDeviceName); + } + writer.println("q (to quit)"); + String command = console.readLine(); + + if ("q".equals(command)) { + System.exit(0); + } + String deviceName = remoteDeviceNameList.get(Integer.valueOf(command)); + return deviceName; + } + }; + + IchtyometerClient client = new IchtyometerClient(); + + client.open(remoteDeviceChooser, true); + + FeedReader reader = new FeedReader(); + + writer.println("client " + client + " is open and listen the board"); + + FeedReaderListener listener = new FeedReaderListener() { + + @Override + public void recordRead(FeedReaderEvent event) { + + writer.println("New record: " + event.getRecord()); + } + }; + + reader.addFeedModeReaderListener(listener); + reader.start(client); + + while (true) { + + } + } +} Property changes on: trunk/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

[ANN] - Tutti 3.1 released
by forge.codelutin.com Release Notification 30 Jan '14

30 Jan '14

The Tutti team is pleased to announce the tutti-3.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 [IMPORT GENERIQUE] faire quotation pour import dans TUTTI du format générique Issue: 2505. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Requête d'accès au référentiel Personne Issue: 4196. Thanks to Christian BONNET. Resolved by tchemit. o Import de données depuis un ichtyomètre (par lot) Issue: 3876. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] demande d'évolutions Issue: 4135. Thanks to Vincent BADTS. Resolved by tchemit. o Ajout de message d'erreur si une mise à jour ne se déroule pas bien Issue: 4257. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Sécuriser les accès au site de données Issue: 4130. Thanks to Tony Chemit. Resolved by tchemit. o Import des mensurations en continue depuis un ichtyomètre Issue: 3875. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [CAPTURE] Mauvais focus suite à une élévation de poids Issue: 4151. Thanks to Tony Chemit. Resolved by tchemit. o [AIDE] Manque aide pour Action + ou - sur l'écran Issue: 4150. Thanks to Tony Chemit. Resolved by tchemit. o [PROTOCOLE] erreur après import protocole (d'avant 3.0), changement nom, et enregistrement. Urgent car bloque création protocole Issue: 4145. Thanks to Vincent BADTS. Resolved by tchemit. o [TECH] Mise à jour de référentiel - Erreur sur les données suite à la mise à jour Issue: 4149. Thanks to Christian BONNET. Resolved by tchemit. o [REFERENTIEL] plus de code rubin associé au référentiel des espèces Issue: 4146. Thanks to Vincent BADTS. Resolved by tchemit. o [REFERENTIEL] Problème si des espèces sont supprimés Issue: 4154. Thanks to Tony Chemit. Resolved by tchemit. Changes: o [SPECS] Fournir la documentation sur le format générique Issue: 3939. Thanks to Vincent BADTS. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-3.1-full-linux-i586.zip - http://forge.codelutin.com/attachments/download/1388 * tutti-3.1-full-windows-i586.zip - http://forge.codelutin.com/attachments/download/1389 * tutti-3.1-full-linux-i586.zip - http://forge.codelutin.com/attachments/download/1390 * tutti-3.1-full-windows-i586.zip - http://forge.codelutin.com/attachments/download/1391 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0