March 2014 - Lima-commits - mailman.cloud.codelutin.com

Build failed in Jenkins: lima-ci #13
by admin+ci-chorem.org＠codelutin.com 14 Mar '14

14 Mar '14

See <http://ci.chorem.org/jenkins/job/lima-ci/13/changes> Changes: [dcosse] refs #669 retrait du bouton de genération du rapport de TVA (le code est toujours présent) [dcosse] fixes# #966 suppression de code mort ------------------------------------------ [...truncated 1604 lines...] at org.hibernate.loader.Loader.list(Loader.java:2271) at org.hibernate.loader.hql.QueryLoader.list(QueryLoader.java:459) at org.hibernate.hql.ast.QueryTranslatorImpl.list(QueryTranslatorImpl.java:365) at org.hibernate.engine.query.HQLQueryPlan.performList(HQLQueryPlan.java:196) at org.hibernate.impl.SessionImpl.list(SessionImpl.java:1268) at org.hibernate.impl.QueryImpl.list(QueryImpl.java:102) at org.nuiton.topia.framework.TopiaContextImpl.findAll(TopiaContextImpl.java:1012) at org.nuiton.topia.framework.TopiaQuery.execute(TopiaQuery.java:1389) at org.nuiton.topia.framework.TopiaQuery.executeToEntityList(TopiaQuery.java:1409) at org.nuiton.topia.persistence.TopiaDAOImpl.findAllByQuery(TopiaDAOImpl.java:481) at org.nuiton.topia.persistence.TopiaDAOImpl.findAll(TopiaDAOImpl.java:442) at org.chorem.lima.business.ejb.EntryBookServiceImpl.getAllEntryBooks(EntryBookServiceImpl.java:114) 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.apache.openejb.core.interceptor.ReflectionInvocationContext$Invocation.invoke(ReflectionInvocationContext.java:181) at org.apache.openejb.core.interceptor.ReflectionInvocationContext.proceed(ReflectionInvocationContext.java:163) at org.chorem.lima.business.LimaInterceptor.invoke(LimaInterceptor.java:99) at sun.reflect.GeneratedMethodAccessor23.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.openejb.core.interceptor.ReflectionInvocationContext$Invocation.invoke(ReflectionInvocationContext.java:181) at org.apache.openejb.core.interceptor.ReflectionInvocationContext.proceed(ReflectionInvocationContext.java:163) at org.apache.openejb.cdi.CdiInterceptor.invoke(CdiInterceptor.java:126) at org.apache.openejb.cdi.CdiInterceptor.access$000(CdiInterceptor.java:42) at org.apache.openejb.cdi.CdiInterceptor$1.call(CdiInterceptor.java:63) at org.apache.openejb.cdi.CdiInterceptor.aroundInvoke(CdiInterceptor.java:69) at sun.reflect.GeneratedMethodAccessor22.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.openejb.core.interceptor.ReflectionInvocationContext$Invocation.invoke(ReflectionInvocationContext.java:181) at org.apache.openejb.core.interceptor.ReflectionInvocationContext.proceed(ReflectionInvocationContext.java:163) at org.apache.openejb.monitoring.StatsInterceptor.record(StatsInterceptor.java:176) at org.apache.openejb.monitoring.StatsInterceptor.invoke(StatsInterceptor.java:95) at sun.reflect.GeneratedMethodAccessor21.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.openejb.core.interceptor.ReflectionInvocationContext$Invocation.invoke(ReflectionInvocationContext.java:181) at org.apache.openejb.core.interceptor.ReflectionInvocationContext.proceed(ReflectionInvocationContext.java:163) at org.apache.openejb.core.interceptor.InterceptorStack.invoke(InterceptorStack.java:138) at org.apache.openejb.core.stateless.StatelessContainer._invoke(StatelessContainer.java:239) at org.apache.openejb.core.stateless.StatelessContainer.invoke(StatelessContainer.java:191) at org.apache.openejb.core.ivm.EjbObjectProxyHandler.synchronizedBusinessMethod(EjbObjectProxyHandler.java:246) at org.apache.openejb.core.ivm.EjbObjectProxyHandler.businessMethod(EjbObjectProxyHandler.java:241) at org.apache.openejb.core.ivm.EjbObjectProxyHandler._invoke(EjbObjectProxyHandler.java:83) at org.apache.openejb.core.ivm.BaseEjbProxyHandler.invoke(BaseEjbProxyHandler.java:279) at com.sun.proxy.$Proxy68.getAllEntryBooks(Unknown Source) 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.chorem.lima.service.ServiceMonitorableHandler.invoke(ServiceMonitorableHandler.java:76) at com.sun.proxy.$Proxy69.getAllEntryBooks(Unknown Source) at org.chorem.lima.business.EntryBookServiceImplTest.deleteUsedEntryBook(EntryBookServiceImplTest.java:78) Running org.chorem.lima.business.FinancialTransactionServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization WARN [main] (JDBCExceptionReporter.java:233) logExceptions - SQL Error: 90007, SQLState: 90007 ERROR [main] (JDBCExceptionReporter.java:234) logExceptions - The object is already closed [90007-172] Tests run: 5, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.82 sec <<< FAILURE! - in org.chorem.lima.business.FinancialTransactionServiceImplTest testGetUnbalancedTransactionNotAllGood(org.chorem.lima.business.FinancialTransactionServiceImplTest) Time elapsed: 0.032 sec <<< ERROR! org.hibernate.exception.GenericJDBCException: Cannot open connection at org.h2.message.DbException.getJdbcSQLException(DbException.java:329) at org.h2.message.DbException.get(DbException.java:169) at org.h2.message.DbException.get(DbException.java:146) at org.h2.message.DbException.get(DbException.java:135) at org.h2.jdbc.JdbcConnection.checkClosed(JdbcConnection.java:1410) at org.h2.jdbc.JdbcConnection.checkClosed(JdbcConnection.java:1388) at org.h2.jdbc.JdbcConnection.getAutoCommit(JdbcConnection.java:428) at org.hibernate.connection.DriverManagerConnectionProvider.getConnection(DriverManagerConnectionProvider.java:127) at org.hibernate.jdbc.ConnectionManager.openConnection(ConnectionManager.java:446) at org.hibernate.jdbc.ConnectionManager.getConnection(ConnectionManager.java:167) at org.hibernate.jdbc.JDBCContext.connection(JDBCContext.java:160) at org.hibernate.transaction.JDBCTransaction.begin(JDBCTransaction.java:81) at org.hibernate.impl.SessionImpl.beginTransaction(SessionImpl.java:1473) at org.nuiton.topia.framework.TopiaContextImpl.beginTransaction(TopiaContextImpl.java:792) at org.chorem.lima.business.LimaInterceptor.invoke(LimaInterceptor.java:85) at sun.reflect.GeneratedMethodAccessor23.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.openejb.core.interceptor.ReflectionInvocationContext$Invocation.invoke(ReflectionInvocationContext.java:181) at org.apache.openejb.core.interceptor.ReflectionInvocationContext.proceed(ReflectionInvocationContext.java:163) at org.apache.openejb.cdi.CdiInterceptor.invoke(CdiInterceptor.java:126) at org.apache.openejb.cdi.CdiInterceptor.access$000(CdiInterceptor.java:42) at org.apache.openejb.cdi.CdiInterceptor$1.call(CdiInterceptor.java:63) at org.apache.openejb.cdi.CdiInterceptor.aroundInvoke(CdiInterceptor.java:69) at sun.reflect.GeneratedMethodAccessor22.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.openejb.core.interceptor.ReflectionInvocationContext$Invocation.invoke(ReflectionInvocationContext.java:181) at org.apache.openejb.core.interceptor.ReflectionInvocationContext.proceed(ReflectionInvocationContext.java:163) at org.apache.openejb.monitoring.StatsInterceptor.record(StatsInterceptor.java:176) at org.apache.openejb.monitoring.StatsInterceptor.invoke(StatsInterceptor.java:95) at sun.reflect.GeneratedMethodAccessor21.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.apache.openejb.core.interceptor.ReflectionInvocationContext$Invocation.invoke(ReflectionInvocationContext.java:181) at org.apache.openejb.core.interceptor.ReflectionInvocationContext.proceed(ReflectionInvocationContext.java:163) at org.apache.openejb.core.interceptor.InterceptorStack.invoke(InterceptorStack.java:138) at org.apache.openejb.core.stateless.StatelessContainer._invoke(StatelessContainer.java:239) at org.apache.openejb.core.stateless.StatelessContainer.invoke(StatelessContainer.java:191) at org.apache.openejb.core.ivm.EjbObjectProxyHandler.synchronizedBusinessMethod(EjbObjectProxyHandler.java:246) at org.apache.openejb.core.ivm.EjbObjectProxyHandler.businessMethod(EjbObjectProxyHandler.java:241) at org.apache.openejb.core.ivm.EjbObjectProxyHandler._invoke(EjbObjectProxyHandler.java:83) at org.apache.openejb.core.ivm.BaseEjbProxyHandler.invoke(BaseEjbProxyHandler.java:279) at com.sun.proxy.$Proxy66.createAccount(Unknown Source) at sun.reflect.GeneratedMethodAccessor24.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.chorem.lima.service.ServiceMonitorableHandler.invoke(ServiceMonitorableHandler.java:76) at com.sun.proxy.$Proxy67.createAccount(Unknown Source) at org.chorem.lima.business.AbstractLimaTest.initTestAccounts(AbstractLimaTest.java:225) at org.chorem.lima.business.AbstractLimaTest.initTestDatabase(AbstractLimaTest.java:209) at org.chorem.lima.business.FinancialTransactionServiceImplTest.initTest(FinancialTransactionServiceImplTest.java:57) Running org.chorem.lima.business.FiscalPeriodServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.933 sec - in org.chorem.lima.business.FiscalPeriodServiceImplTest Running org.chorem.lima.business.ImportServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 604 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 52 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 21 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 576 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 48 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 14 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 562 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 41 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 12 ms Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.076 sec - in org.chorem.lima.business.ImportServiceImplTest Running org.chorem.lima.business.ReportServiceImplTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in org.chorem.lima.business.ReportServiceImplTest Running org.chorem.lima.business.accountingrules.AccountServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 13, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 1.131 sec - in org.chorem.lima.business.accountingrules.AccountServiceRuleFrTest Running org.chorem.lima.business.accountingrules.ReportServiceRuleFrTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 sec - in org.chorem.lima.business.accountingrules.ReportServiceRuleFrTest Running org.chorem.lima.business.accountingrules.FiscalPeriodServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.658 sec - in org.chorem.lima.business.accountingrules.FiscalPeriodServiceRuleFrTest Running org.chorem.lima.business.accountingrules.FinancialPeriodServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.378 sec - in org.chorem.lima.business.accountingrules.FinancialPeriodServiceRuleFrTest Running org.chorem.lima.business.accountingrules.ImportServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 445 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 37 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 12 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 437 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 41 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 11 ms INFO [main] (ImportServiceImpl.java:382) importAccountsChartFromEbp - Imported form EBP : 571 accounts in 452 ms INFO [main] (ImportServiceImpl.java:433) importEntryBookFromEbp - Imported form EBP : 9 accounts in 40 ms INFO [main] (ImportServiceImpl.java:326) importEntriesFromEbp - Imported form EBP : 19 entries in 10 ms Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.3 sec - in org.chorem.lima.business.accountingrules.ImportServiceRuleFrTest Running org.chorem.lima.business.accountingrules.FinancialTransactionServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.559 sec - in org.chorem.lima.business.accountingrules.FinancialTransactionServiceRuleFrTest Running org.chorem.lima.business.accountingrules.EntryBookServiceRuleFrTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.345 sec - in org.chorem.lima.business.accountingrules.EntryBookServiceRuleFrTest Running org.chorem.lima.business.LimaMiscTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.056 sec - in org.chorem.lima.business.LimaMiscTest Running org.chorem.lima.business.FinancialPeriodServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.113 sec - in org.chorem.lima.business.FinancialPeriodServiceImplTest Running org.chorem.lima.business.LetteringComparatorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.chorem.lima.business.LetteringComparatorTest Running org.chorem.lima.business.AccountServiceImplTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.633 sec - in org.chorem.lima.business.AccountServiceImplTest Running org.chorem.lima.entity.AccountDAOTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.1 sec - in org.chorem.lima.entity.AccountDAOTest Running org.chorem.lima.entity.FinancialTransactionDAOTest INFO - EJBContainer already initialized. Call ejbContainer.close() to allow reinitialization Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.114 sec - in org.chorem.lima.entity.FinancialTransactionDAOTest Results : Tests in error: EntryBookServiceImplTest.deleteUsedEntryBook » Unexpected exception, expected... FinancialTransactionServiceImplTest.initTest:57->AbstractLimaTest.initTestDatabase:209->AbstractLimaTest.initTestAccounts:225 » GenericJDBC Tests run: 79, Failures: 0, Errors: 2, Skipped: 3 [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Lima .............................................. SUCCESS [ 2.304 s] [INFO] Lima :: callao .................................... SUCCESS [ 11.803 s] [INFO] Lima :: business API .............................. SUCCESS [ 3.296 s] [INFO] Lima :: business .................................. FAILURE [ 18.918 s] [INFO] Lima :: Swing ..................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 36.855 s [INFO] Finished at: 2014-03-14T15:35:19+01:00 [INFO] Final Memory: 53M/442M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.15:test (default-test) on project lima-business: There are test failures. [ERROR] [ERROR] Please refer to <http://ci.chorem.org/jenkins/job/lima-ci/ws/trunk/lima-business/target/sure…> for the individual test results. [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.15:test (default-test) on project lima-business: There are test failures. Please refer to <http://ci.chorem.org/jenkins/job/lima-ci/ws/trunk/lima-business/target/sure…> for the individual test results. at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:584) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:213) at org.apache.maven.cli.MavenCli.main(MavenCli.java:157) 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.launchEnhanced(Launcher.java:289) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356) Caused by: org.apache.maven.plugin.MojoFailureException: There are test failures. Please refer to <http://ci.chorem.org/jenkins/job/lima-ci/ws/trunk/lima-business/target/sure…> for the individual test results. at org.apache.maven.plugin.surefire.SurefireHelper.reportExecution(SurefireHelper.java:82) at org.apache.maven.plugin.surefire.SurefirePlugin.handleSummary(SurefirePlugin.java:169) at org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeAfterPreconditionsChecked(AbstractSurefireMojo.java:777) at org.apache.maven.plugin.surefire.AbstractSurefireMojo.execute(AbstractSurefireMojo.java:645) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 19 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :lima-business Build step 'Invoke top-level Maven targets' marked build as failure

1 1

r3759 - in trunk/lima-swing/src/test/java: . org org/chorem org/chorem/lima org/chorem/lima/ui org/chorem/lima/ui/account
by dcosse＠users.chorem.org 14 Mar '14

14 Mar '14

Author: dcosse Date: 2014-03-14 16:06:23 +0100 (Fri, 14 Mar 2014) New Revision: 3759 Url: http://forge.chorem.org/projects/lima/repository/revisions/3759 Log: fixes #828 non reproductible avec ce jeu de test et java version "1.7.0_51" Added: trunk/lima-swing/src/test/java/org/ trunk/lima-swing/src/test/java/org/chorem/ trunk/lima-swing/src/test/java/org/chorem/lima/ trunk/lima-swing/src/test/java/org/chorem/lima/ui/ trunk/lima-swing/src/test/java/org/chorem/lima/ui/account/ trunk/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java Added: trunk/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java =================================================================== --- trunk/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java (rev 0) +++ trunk/lima-swing/src/test/java/org/chorem/lima/ui/account/AccountViewHandlerTest.java 2014-03-14 15:06:23 UTC (rev 3759) @@ -0,0 +1,44 @@ +package org.chorem.lima.ui.account; + +import java.util.Collections; +import java.util.List; + +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.AccountImpl; +import org.junit.Test; + +import com.google.common.collect.Lists; + +import junit.framework.Assert; + +/** + * @author David Cossé + */ +public class AccountViewHandlerTest { + @Test + public void testAccountLengthComparator() throws Exception { + +// int result = o1.getAccountNumber().length() - o2.getAccountNumber().length(); +// if (result == 0) { +// // same length, compare accountNumber +// result = o1.getAccountNumber().compareTo(o2.getAccountNumber()); +// } + + List<String> testsValues = Lists.newArrayList("", "", "", "A", "A", "A", "0", "0", "0", "00", "00", "00", "%£", "%£", " ", " "); + + List<Account> accounts = Lists.newArrayListWithCapacity(testsValues.size()); + + for (String testValue : testsValues) { + Account a = new AccountImpl(); + a.setAccountNumber(testValue); + accounts.add(a); + } + + try { + Collections.sort(accounts, AccountViewHandler.accountLengthComparator); + } catch (Exception e) { + Assert.fail(); + } + + } +}

1 0

r3758 - trunk/lima-swing/src/main/java/org/chorem/lima/ui
by dcosse＠users.chorem.org 14 Mar '14

14 Mar '14

Author: dcosse Date: 2014-03-14 15:25:38 +0100 (Fri, 14 Mar 2014) New Revision: 3758 Url: http://forge.chorem.org/projects/lima/repository/revisions/3758 Log: refs #669 retrait du bouton de gen?\195?\169ration du rapport de TVA (le code est toujours pr?\195?\169sent) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-03-14 14:24:10 UTC (rev 3757) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-03-14 14:25:38 UTC (rev 3758) @@ -177,9 +177,10 @@ <JMenuItem text="lima.reports.financialstatement" onActionPerformed='getHandler().showFinancialStatementReportsView(this)' actionIcon='reports-financialstatement'/> - <JMenuItem text="lima.reports.vat" - onActionPerformed='getHandler().showVatReportView(this)' - actionIcon='reports-vatstatement'/> +  +  +  +  </JMenu>

1 0

r3757 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by dcosse＠users.chorem.org 14 Mar '14

14 Mar '14

Author: dcosse Date: 2014-03-14 15:24:10 +0100 (Fri, 14 Mar 2014) New Revision: 3757 Url: http://forge.chorem.org/projects/lima/repository/revisions/3757 Log: fixes# #966 suppression de code mort Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-07 10:05:06 UTC (rev 3756) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-14 14:24:10 UTC (rev 3757) @@ -185,14 +185,6 @@ provisionDeprecationAmount = new BigDecimal(0); } - String fontColor = ""; - if (financialStatementAmount.getSubAmount() && level == 1) { - fontColor = "#CCCCCC"; - } else if (financialStatementAmount.getSubAmount()) { - fontColor = "#C0C0C0"; - } else { - fontColor = "#999999"; - } if (label == null) { if (printedType == 0) { String [] emptyColumn = {"","","",""}; @@ -375,8 +367,6 @@ } else { currentAmountCredit = currentAmountCredit.add(entry.getAmount()); } - } else { - ReportsDatas reportsDatas = (ReportsDatas) objectList; } }

1 0

Jenkins build became unstable: lima-nightly » Lima :: business #9
by admin+ci-chorem.org＠codelutin.com 07 Mar '14

07 Mar '14

See <http://ci.chorem.org/jenkins/job/lima-nightly/org.chorem.lima$lima-business…>

1 1

r3756 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: common financialtransactionunbalanced
by sbavencoff＠users.chorem.org 07 Mar '14

07 Mar '14

Author: sbavencoff Date: 2014-03-07 11:05:06 +0100 (Fri, 07 Mar 2014) New Revision: 3756 Url: http://forge.chorem.org/projects/lima/repository/revisions/3756 Log: fixes #970 : Exception lorsqu'on tente de changer de p?\195?\169riode comptable sur l'?\195?\169cran des 'entr?\195?\169es incorrectes' Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-03-06 16:45:18 UTC (rev 3755) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-03-07 10:05:06 UTC (rev 3756) @@ -1,6 +1,7 @@ package org.chorem.lima.ui.common; import com.google.common.collect.Lists; +import org.apache.commons.collections.CollectionUtils; import javax.swing.table.AbstractTableModel; import java.util.Collection; @@ -64,10 +65,12 @@ } public void addAll(Collection<E> values) { - int row = this.values.size(); - this.values.addAll(values); - fireTableRowsInserted(row, row + values.size() - 1); - sort(); + if (CollectionUtils.isNotEmpty(values)) { + int row = this.values.size(); + this.values.addAll(values); + fireTableRowsInserted(row, row + values.size() - 1); + sort(); + } } public void clear() { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2014-03-06 16:45:18 UTC (rev 3755) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2014-03-07 10:05:06 UTC (rev 3756) @@ -75,7 +75,7 @@ * @return */ protected void refresh() { - values.clear(); + clear(); if (selectedFiscalPeriod != null) { List<FinancialTransaction> financialTransactions =

1 0

r3755 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by sbavencoff＠users.chorem.org 06 Mar '14

06 Mar '14

Author: sbavencoff Date: 2014-03-06 17:45:18 +0100 (Thu, 06 Mar 2014) New Revision: 3755 Url: http://forge.chorem.org/projects/lima/repository/revisions/3755 Log: fixes #316 : Les cellules ne sont pas align?\195?\169es avec les ent?\195?\170tes dans la g?\195?\169n?\195?\169ration PDF Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-06 10:26:55 UTC (rev 3754) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-06 16:45:18 UTC (rev 3755) @@ -45,7 +45,6 @@ import org.chorem.lima.business.api.VatStatementService; import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.EntryComparator; -import org.chorem.lima.business.utils.FormatsEnum; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountDAO; import org.chorem.lima.entity.ClosedPeriodicEntryBook; @@ -63,8 +62,7 @@ import javax.ejb.Remote; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; -import javax.swing.JOptionPane; -import java.awt.*; +import javax.swing.*; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -364,6 +362,11 @@ } } + // close inner + ledgerReport += "</tbody></table>" + + "</td>" + + "</tr>"; + for (Object objectList : list) { if (objectList instanceof Entry) { Entry entry = (Entry) objectList;

1 0

r3754 - in trunk/lima-swing/src/main: java/org/chorem/lima java/org/chorem/lima/ui java/org/chorem/lima/ui/celleditor resources/i18n
by sbavencoff＠users.chorem.org 06 Mar '14

06 Mar '14

Author: sbavencoff Date: 2014-03-06 11:26:55 +0100 (Thu, 06 Mar 2014) New Revision: 3754 Url: http://forge.chorem.org/projects/lima/repository/revisions/3754 Log: fixes #370 : Options non termin?\195?\169es Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-03-06 08:51:59 UTC (rev 3753) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-03-06 10:26:55 UTC (rev 3754) @@ -25,6 +25,7 @@ package org.chorem.lima; +import com.google.common.collect.ImmutableSet; import jaxx.runtime.JAXXUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -34,9 +35,9 @@ import org.chorem.lima.entity.LimaCallaoDAOHelper; import org.chorem.lima.service.LimaServiceFactory; import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import org.nuiton.config.ConfigOptionDef; import org.nuiton.topia.TopiaContextFactory; -import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; import org.nuiton.util.converter.ConverterUtil; @@ -46,6 +47,7 @@ import java.io.File; import java.io.IOException; import java.util.Locale; +import java.util.Set; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -64,6 +66,9 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(LimaConfig.class); + static public final Set<Character> NUMBER_SEPARATOR = ImmutableSet.of(' ', ',', '.', ';'); + static public final Set<Integer> NUMBER_DECIMALS = ImmutableSet.of(0, 1, 2, 3, 4, 5, 6); + protected static LimaConfig instance; private static final String configFile = "lima-config.properties"; @@ -446,7 +451,7 @@ _("lima.config.decimalseparator.label"), n_("lima.config.decimalseparator.description"), ",", - String.class, false, false), + Character.class, false, false), SCALE("lima.data.bigDecimal.scale", _("lima.config.scale.label"), @@ -458,7 +463,7 @@ _("limma.config.thousandseparator.label"), n_("limma.config.thousandseparator.description"), " ", - String.class, false, false), + Character.class, false, false), CURRENCY("lima.config.currency", _("lima.config.currency.label"), Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-06 08:51:59 UTC (rev 3753) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-06 10:26:55 UTC (rev 3754) @@ -39,6 +39,8 @@ import org.chorem.lima.ui.account.AccountView; import org.chorem.lima.ui.accountsreports.AccountsReportsView; import org.chorem.lima.ui.balance.BalanceReportsView; +import org.chorem.lima.ui.celleditor.NumberSeparatorCellRenderer; +import org.chorem.lima.ui.celleditor.NumberSeparatorTableCellRenderer; import org.chorem.lima.ui.entrybook.EntryBookView; import org.chorem.lima.ui.entrybooksreports.EntryBooksReportsView; import org.chorem.lima.ui.financialperiod.FinancialPeriodView; @@ -257,12 +259,27 @@ helper.setOptionShortLabel(LimaConfig.Option.FULL_SCREEN.getLabel()); helper.addOption(LimaConfig.Option.LOCALE); helper.setOptionShortLabel(LimaConfig.Option.LOCALE.getLabel()); + + JComboBox<Character> comboBoxSeparator = new JComboBox<Character>(LimaConfig.NUMBER_SEPARATOR.toArray(new Character[0])); + DefaultCellEditor separatorEditor = new DefaultCellEditor(comboBoxSeparator); + comboBoxSeparator.setRenderer(new NumberSeparatorCellRenderer()); + NumberSeparatorTableCellRenderer separatorRenderer = new NumberSeparatorTableCellRenderer(); helper.addOption(LimaConfig.Option.DECIMAL_SEPARATOR); helper.setOptionShortLabel(LimaConfig.Option.DECIMAL_SEPARATOR.getLabel()); + helper.setOptionRenderer(separatorRenderer); + helper.setOptionEditor(separatorEditor); + + JComboBox<Integer> comboBoxDecimal = new JComboBox<Integer>(LimaConfig.NUMBER_DECIMALS.toArray(new Integer[0])); + DefaultCellEditor decimalEditor = new DefaultCellEditor(comboBoxDecimal); helper.addOption(LimaConfig.Option.SCALE); helper.setOptionShortLabel(LimaConfig.Option.SCALE.getLabel()); + helper.setOptionEditor(decimalEditor); + helper.addOption(LimaConfig.Option.THOUSAND_SEPARATOR); helper.setOptionShortLabel(LimaConfig.Option.THOUSAND_SEPARATOR.getLabel()); + helper.setOptionRenderer(separatorRenderer); + helper.setOptionEditor(separatorEditor); + helper.addOption(LimaConfig.Option.CURRENCY); helper.setOptionShortLabel(LimaConfig.Option.CURRENCY.getLabel()); /*Pas de 'callBack' sur le changement de comportement lors de l'édition d'une cellule, Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java 2014-03-06 10:26:55 UTC (rev 3754) @@ -0,0 +1,48 @@ +package org.chorem.lima.ui.celleditor; + +import com.google.common.collect.ImmutableMap; + +import javax.swing.*; +import java.awt.*; +import java.util.Map; + +import static org.nuiton.i18n.I18n._; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class NumberSeparatorCellRenderer extends DefaultListCellRenderer { + + protected static final Map<Character, String> LABEL_BY_SEPARATOR = ImmutableMap.of( + ' ', "lima.config.numberSeparator.space", + ',', "lima.config.numberSeparator.comma", + '.', "lima.config.numberSeparator.dot", + ';', "lima.config.numberSeparator.semicolon"); + + public static String getSeparatorLabel(Object value) { + String separatorLabel = ""; + if (value != null) { + Character separator = (Character) value; + separatorLabel = LABEL_BY_SEPARATOR.get(separator); + if (separatorLabel == null) { + separatorLabel = ""; + } else { + separatorLabel = _(separatorLabel); + } + separatorLabel += " \"" + separator + "\""; + } + return separatorLabel; + } + + @Override + public Component getListCellRendererComponent(JList list, + Object value, + int index, + boolean isSelected, + boolean cellHasFocus) { + + JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + label.setText(getSeparatorLabel(value)); + return this; + } +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java 2014-03-06 10:26:55 UTC (rev 3754) @@ -0,0 +1,14 @@ +package org.chorem.lima.ui.celleditor; + +import javax.swing.table.DefaultTableCellRenderer; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class NumberSeparatorTableCellRenderer extends DefaultTableCellRenderer { + + protected void setValue(Object value) { + super.setValue(NumberSeparatorCellRenderer.getSeparatorLabel(value)); + } + +} Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-06 08:51:59 UTC (rev 3753) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-06 10:26:55 UTC (rev 3754) @@ -162,6 +162,10 @@ lima.config.i18n.dir.label= lima.config.locale.description=Localization used by LIMA lima.config.locale.label= +lima.config.numberSeparator.comma= +lima.config.numberSeparator.dot= +lima.config.numberSeparator.semicolon= +lima.config.numberSeparator.space= lima.config.resources.dir.description= lima.config.resources.dir.label= lima.config.scale.description= @@ -520,3 +524,6 @@ lima.warning.nimbus.landf=Could not find Numbus Look&Feel limma.config.thousandseparator.description= limma.config.thousandseparator.label= +org.chorem.lima.LimaConfig.NumberSeparator.COMMA= +org.chorem.lima.LimaConfig.NumberSeparator.DOT= +org.chorem.lima.LimaConfig.NumberSeparator.SPACE= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-06 08:51:59 UTC (rev 3753) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-06 10:26:55 UTC (rev 3754) @@ -147,6 +147,10 @@ lima.config.i18n.dir.label= lima.config.locale.description=Paramétres local utilisés par l'application lima.config.locale.label=Zone +lima.config.numberSeparator.comma=Virgule +lima.config.numberSeparator.dot=Point +lima.config.numberSeparator.semicolon=Point-virgule +lima.config.numberSeparator.space=Espace lima.config.resources.dir.description= lima.config.resources.dir.label= lima.config.scale.description=Nombre de caratères décimales pour les montants @@ -493,3 +497,6 @@ lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé limma.config.thousandseparator.description=Caractère de séparation entre les blocs de milliers limma.config.thousandseparator.label=Séparateur de milliers +org.chorem.lima.LimaConfig.NumberSeparator.COMMA= +org.chorem.lima.LimaConfig.NumberSeparator.DOT= +org.chorem.lima.LimaConfig.NumberSeparator.SPACE=

1 0

r3753 - in trunk: . lima-swing
by sbavencoff＠users.chorem.org 06 Mar '14

06 Mar '14

Author: sbavencoff Date: 2014-03-06 09:51:59 +0100 (Thu, 06 Mar 2014) New Revision: 3753 Url: http://forge.chorem.org/projects/lima/repository/revisions/3753 Log: fix build Modified: trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2014-03-05 15:07:37 UTC (rev 3752) +++ trunk/lima-swing/pom.xml 2014-03-06 08:51:59 UTC (rev 3753) @@ -91,6 +91,11 @@ </dependency> <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>pdf-renderer</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-05 15:07:37 UTC (rev 3752) +++ trunk/pom.xml 2014-03-06 08:51:59 UTC (rev 3753) @@ -310,6 +310,12 @@ <version>3.0.4</version> </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>pdf-renderer</artifactId> + <version>1.0.5</version> + </dependency> +  <dependency> <groupId>org.nuiton.topia</groupId>

1 0

r3752 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui resources/i18n
by sbavencoff＠users.chorem.org 05 Mar '14

05 Mar '14

Author: sbavencoff Date: 2014-03-05 16:07:37 +0100 (Wed, 05 Mar 2014) New Revision: 3752 Url: http://forge.chorem.org/projects/lima/repository/revisions/3752 Log: refs #971 : add color in setting frame Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-05 11:59:43 UTC (rev 3751) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-05 15:07:37 UTC (rev 3752) @@ -199,6 +199,59 @@ helper.addOption(LimaConfig.Option.CONFIG_FILE); helper.setOptionShortLabel(LimaConfig.Option.CONFIG_FILE.getLabel()); + helper.addCategory(_("lima.config.category.table"), _("lima.config.category.table.description")); + helper.addOption(LimaConfig.Option.TABLE_CELL_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND.getLabel()); + helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND); + helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND.getLabel()); + helper.addOption(LimaConfig.Option.COLOR_SELECTION_FOCUS); + helper.setOptionShortLabel(LimaConfig.Option.COLOR_SELECTION_FOCUS.getLabel()); + + helper.addCategory(_("lima.config.category.other"), _("lima.config.category.other.description")); helper.addOption(LimaConfig.Option.FULL_SCREEN); helper.setOptionShortLabel(LimaConfig.Option.FULL_SCREEN.getLabel()); @@ -216,10 +269,6 @@ * car les deux éditeurs concernés rappellent la config dans un listener ('focusGained')*/ helper.addOption(LimaConfig.Option.SELECT_ALL_EDITING_CELL); helper.setOptionShortLabel(LimaConfig.Option.SELECT_ALL_EDITING_CELL.getLabel()); - helper.addOption(LimaConfig.Option.COLOR_SELECTION_FOCUS); - helper.setOptionShortLabel(LimaConfig.Option.COLOR_SELECTION_FOCUS.getLabel()); - helper.setOptionCallBack(LimaConfig.Option.COLOR_SELECTION_FOCUS.key); - helper.setOptionShortLabel(LimaConfig.Option.COLOR_SELECTION_FOCUS.getLabel()); helper.buildUI(context, _("lima.config.category.directories")); helper.displayUI(ui, false); Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-05 11:59:43 UTC (rev 3751) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-05 15:07:37 UTC (rev 3752) @@ -89,8 +89,11 @@ lima.common.update=Modify lima.config.category.directories=Directories lima.config.category.directories.description=Directories used by LIMA +lima.config.category.directories.table= lima.config.category.other=Other lima.config.category.other.description=Other configuration properties +lima.config.category.table= +lima.config.category.table.description= lima.config.cell.background.description= lima.config.cell.background.label= lima.config.cell.error.background.description= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-05 11:59:43 UTC (rev 3751) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-05 15:07:37 UTC (rev 3752) @@ -80,54 +80,56 @@ lima.config.category.directories.description=Répertoires utilisés par Lima lima.config.category.other=Autre lima.config.category.other.description=Autre propriétés de configuration -lima.config.cell.background.description= -lima.config.cell.background.label= -lima.config.cell.error.background.description= -lima.config.cell.error.background.label= -lima.config.cell.error.foreground.description= -lima.config.cell.error.foreground.label= -lima.config.cell.foreground.description= -lima.config.cell.foreground.label= -lima.config.cell.mandatory.background.description= -lima.config.cell.mandatory.background.label= -lima.config.cell.mandatory.foreground.description= -lima.config.cell.mandatory.foreground.label= -lima.config.cell.pair.background.description= -lima.config.cell.pair.background.label= -lima.config.cell.pair.error.background.description= -lima.config.cell.pair.error.background.label= -lima.config.cell.pair.error.foreground.description= -lima.config.cell.pair.error.foreground.label= -lima.config.cell.pair.foreground.description= -lima.config.cell.pair.foreground.label= -lima.config.cell.pair.mandatory.background.description= -lima.config.cell.pair.mandatory.background.label= -lima.config.cell.pair.mandatory.foreground.description= -lima.config.cell.pair.mandatory.foreground.label= -lima.config.cell.pair.selected.background.description= -lima.config.cell.pair.selected.background.label= -lima.config.cell.pair.selected.error.background.description= -lima.config.cell.pair.selected.error.background.label= -lima.config.cell.pair.selected.error.foreground.description= -lima.config.cell.pair.selected.error.foreground.label= -lima.config.cell.pair.selected.foreground.description= -lima.config.cell.pair.selected.foreground.label= -lima.config.cell.pair.selected.mandatory.background.description= -lima.config.cell.pair.selected.mandatory.background.label= -lima.config.cell.pair.selected.mandatory.foreground.description= -lima.config.cell.pair.selected.mandatory.foreground.label= -lima.config.cell.selected.background.description= -lima.config.cell.selected.background.label= -lima.config.cell.selected.error.background.description= -lima.config.cell.selected.error.background.label= -lima.config.cell.selected.error.foreground.description= -lima.config.cell.selected.error.foreground.label= -lima.config.cell.selected.foreground.description= -lima.config.cell.selected.foreground.label= -lima.config.cell.selected.mandatory.background.description= -lima.config.cell.selected.mandatory.background.label= -lima.config.cell.selected.mandatory.foreground.description= -lima.config.cell.selected.mandatory.foreground.label= +lima.config.category.table=Tableaux +lima.config.category.table.description=Propriété des tableaux +lima.config.cell.background.description=Couleur de fond d'une cellule +lima.config.cell.background.label=Couleur de fond +lima.config.cell.error.background.description=Couleur de fond d'une cellule en erreur +lima.config.cell.error.background.label=Couleur de fond en erreur +lima.config.cell.error.foreground.description=Couleur du texte d'une cellule en erreur +lima.config.cell.error.foreground.label=Couleur du texte en erreur +lima.config.cell.foreground.description=Couleur du texte d'une cellule +lima.config.cell.foreground.label=Couleur du texte +lima.config.cell.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire +lima.config.cell.mandatory.background.label=Couleur de fond obligatoire +lima.config.cell.mandatory.foreground.description=Couleur du texte d'une cellule vide dont la valeur est obligatoire +lima.config.cell.mandatory.foreground.label=Couleur du texte obligatoire +lima.config.cell.pair.background.description=Couleur de fond d'une ligne paire +lima.config.cell.pair.background.label=Couleur de fond paire +lima.config.cell.pair.error.background.description=Couleur de fond d'une ligne paire +lima.config.cell.pair.error.background.label=Couleur de fond paire +lima.config.cell.pair.error.foreground.description=Couleur du texte d'une ligne paire en erreur +lima.config.cell.pair.error.foreground.label=Couleur du texte paire en erreur +lima.config.cell.pair.foreground.description=Couleur du texte d'une ligne paire +lima.config.cell.pair.foreground.label=Couleur du texte paire +lima.config.cell.pair.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire dans une ligne paire +lima.config.cell.pair.mandatory.background.label=Couleur de fond paire en erreur +lima.config.cell.pair.mandatory.foreground.description=Couleur du texte d'une cellule en erreur et vide dont la valeur est obligatoire dans une ligne paire +lima.config.cell.pair.mandatory.foreground.label=Couleur de fond paire en erreur +lima.config.cell.pair.selected.background.description=Couleur de fond d'une ligne paire sélectionnée +lima.config.cell.pair.selected.background.label=Couleur de fond paire sélectionnée +lima.config.cell.pair.selected.error.background.description=Couleur de fond d'une cellule en erreur dans une ligne paire sélectionnée +lima.config.cell.pair.selected.error.background.label=Couleur de fond paire sélectionnée en erreur +lima.config.cell.pair.selected.error.foreground.description=Couleur du texte d'une cellule en erreur dans une ligne paire sélectionnée +lima.config.cell.pair.selected.error.foreground.label=Couleur du texte paire sélectionnée en erreur +lima.config.cell.pair.selected.foreground.description=Couleur du texte d'une ligne paire sélectionnée +lima.config.cell.pair.selected.foreground.label=Couleur du texte paire sélectionnée +lima.config.cell.pair.selected.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire pour une ligne paire selectionnée +lima.config.cell.pair.selected.mandatory.background.label=Couleur de fond paire sélectionnée obligatoire +lima.config.cell.pair.selected.mandatory.foreground.description=Couleur du texte d'une cellule vide dont la valeur est obligatoire pour une ligne paire sélectionnée +lima.config.cell.pair.selected.mandatory.foreground.label=Couleur du texte paire sélectionnée obligatoire +lima.config.cell.selected.background.description=Couleur de fond d'une ligne sélectionnée +lima.config.cell.selected.background.label=Couleur de fond sélectionnée +lima.config.cell.selected.error.background.description=Couleur de fond d'une cellule en erreur dans une ligne sélectionnée +lima.config.cell.selected.error.background.label=Couleur de fond sélectionnée en erreur +lima.config.cell.selected.error.foreground.description=Couleur du texte d'une cellule en erreur dans une ligne sélectionnée +lima.config.cell.selected.error.foreground.label=Couleur du texte sélectionnée en erreur +lima.config.cell.selected.foreground.description=Couleur du texte d'une ligne sélectionnée +lima.config.cell.selected.foreground.label=Couleur du texte sélectionnée +lima.config.cell.selected.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire pour une ligne sélectionnée +lima.config.cell.selected.mandatory.background.label=Couleur de fond sélectionnée obligatoire +lima.config.cell.selected.mandatory.foreground.description=Couleur du texte d'une cellule vide dont la valeur est obligatoire pour une ligne sélectionnée +lima.config.cell.selected.mandatory.foreground.label=Couleur du texte sélectionnée obligatoire lima.config.colorselectionfocus= lima.config.colorselectionfocus.description=Couleur des bordures de la séléction lima.config.colorselectionfocus.label=Couleur de l'encadrement de sélection d'une cellule

1 0