Lima-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- 1853 discussions
See <http://ci.nuiton.org/jenkins/job/lima/2638/changes>
Changes:
[sbavencoff] Financial transaction : fire model if values is clear
[sbavencoff] refs #370 : fix spelling
[sbavencoff] refs #370 : update JAXX to 2.6 fix application settings
[sbavencoff] refs #777 : paste transaction even if no rows are select. no past transaction date and entry book
------------------------------------------
[...truncated 212 lines...]
[INFO] No tests to run.
[JENKINS] Recording test results
[INFO]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ lima-business-api ---
[INFO] Building jar: <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business-api/target/lim…>
[INFO]
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ lima-business-api ---
[INFO]
[INFO] --- maven-install-plugin:2.4:install (default-install) @ lima-business-api ---
[INFO] Installing <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business-api/target/lim…> to /var/local/maven/data/repository/org/chorem/lima/lima-business-api/0.8-SNAPSHOT/lima-business-api-0.8-SNAPSHOT.jar
[INFO] Installing <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business-api/pom.xml> to /var/local/maven/data/repository/org/chorem/lima/lima-business-api/0.8-SNAPSHOT/lima-business-api-0.8-SNAPSHOT.pom
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Lima :: business 0.8-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ lima-business ---
[INFO] Deleting <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target>
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ lima-business ---
[INFO]
[INFO] --- maven-dependency-plugin:2.8:copy-dependencies (copy-dependencies) @ lima-business ---
[INFO] Copying openejb-jpa-integration-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying commons-beanutils-1.8.3.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying lima-callao-0.8-SNAPSHOT.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/lim…>
[INFO] Copying commons-beanutils-core-1.8.3.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying swingx-action-1.6.5-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying nuiton-config-3.0-alpha-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/nui…>
[INFO] Copying openejb-ejbd-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying quartz-2.1.6.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/qua…>
[INFO] Copying activemq-protobuf-1.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/act…>
[INFO] Copying commons-dbcp-1.4.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying bval-core-0.5.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/bva…>
[INFO] Copying commons-jxpath-1.3.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying jaxb-impl-2.2.6.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jax…>
[INFO] Copying fontbox-1.8.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/fon…>
[INFO] Copying mbean-annotation-api-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/mbe…>
[INFO] Copying nuiton-decorator-3.0-alpha-2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/nui…>
[INFO] Copying commons-logging-1.1.3.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying hibernate-ehcache-3.6.10.Final.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/hib…>
[INFO] Copying jempbox-1.8.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jem…>
[INFO] Copying swingx-common-1.6.5-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying jetty-server-8.1.12.v20130726.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jet…>
[INFO] Copying javassist-3.12.1.GA.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jav…>
[INFO] Copying swingx-painters-1.6.5-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying itext-4.2.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ite…>
[INFO] Copying commons-cli-1.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying bval-jsr303-0.5.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/bva…>
[INFO] Copying jaxx-config-2.6.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jax…>
[INFO] Copying hibernate-commons-annotations-3.2.0.Final.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/hib…>
[INFO] Copying xbean-asm-shaded-3.12.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/xbe…>
[INFO] Copying jxlayer-3.0.4.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jxl…>
[INFO] Copying xbean-reflect-3.12.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/xbe…>
[INFO] Copying junit-4.11.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jun…>
[INFO] Copying openjpa-asm-shaded-2.2.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying slf4j-api-1.7.5.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/slf…>
[INFO] Copying openejb-jee-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying geronimo-transaction-3.1.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ger…>
[INFO] Copying jcommon-1.0.15.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jco…>
[INFO] Copying activemq-ra-5.7.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/act…>
[INFO] Copying serp-1.13.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ser…>
[INFO] Copying openejb-loader-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying openwebbeans-impl-1.1.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying jansi-1.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jan…>
[INFO] Copying swingx-graphics-1.6.5-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying ehcache-core-2.4.3.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ehc…>
[INFO] Copying nuiton-csv-2.6.4.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/nui…>
[INFO] Copying hsqldb-2.2.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/hsq…>
[INFO] Copying topia-persistence-2.7.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/top…>
[INFO] Copying guava-14.0.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/gua…>
[INFO] Copying commons-io-2.4.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying openejb-api-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying dom4j-1.6.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/dom…>
[INFO] Copying hibernate-core-3.6.10.Final.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/hib…>
[INFO] Copying commons-primitives-1.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying jfreechart-1.0.12.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jfr…>
[INFO] Copying commons-net-3.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying topia-service-migration-2.7.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/top…>
[INFO] Copying javax.servlet-3.0.0.v201112011016.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jav…>
[INFO] Copying openejb-javaagent-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying swingx-autocomplete-1.6.5-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying lima-business-api-0.8-SNAPSHOT.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/lim…>
[INFO] Copying commons-pool-1.5.7.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying h2-1.3.172.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/h2-…>
[INFO] Copying jetty-servlet-8.1.12.v20130726.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jet…>
[INFO] Copying nuiton-utils-2.6.12.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/nui…>
[INFO] Copying openwebbeans-spi-1.1.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying openwebbeans-ee-common-1.1.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying commons-lang-2.6.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying nuiton-i18n-2.5.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/nui…>
[INFO] Copying openejb-server-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying howl-1.0.1-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/how…>
[INFO] Copying openejb-client-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying log4j-1.2.17.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/log…>
[INFO] Copying jetty-security-8.1.12.v20130726.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jet…>
[INFO] Copying xml-apis-1.0.b2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/xml…>
[INFO] Copying swizzle-stream-1.6.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying jetty-util-8.1.12.v20130726.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jet…>
[INFO] Copying openwebbeans-web-1.1.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying jaxx-widgets-2.6.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jax…>
[INFO] Copying jetty-continuation-8.1.12.v20130726.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jet…>
[INFO] Copying javaee-api-6.0-5.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jav…>
[INFO] Copying openwebbeans-ee-1.1.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying jta-1.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jta…>
[INFO] Copying geronimo-connector-3.1.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ger…>
[INFO] Copying xbean-finder-shaded-3.12.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/xbe…>
[INFO] Copying swingx-plaf-1.6.5-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying geronimo-javamail_1.4_mail-1.8.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ger…>
[INFO] Copying xbean-naming-3.12.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/xbe…>
[INFO] Copying antlr-2.7.6.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ant…>
[INFO] Copying pdfbox-1.8.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/pdf…>
[INFO] Copying hamcrest-core-1.3.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ham…>
[INFO] Copying jaxx-runtime-2.6.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jax…>
[INFO] Copying commons-collections-3.2.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying pdfbox-examples-1.8.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/pdf…>
[INFO] Copying activemq-core-5.7.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/act…>
[INFO] Copying geronimo-j2ee-connector_1.6_spec-1.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ger…>
[INFO] Copying swingx-core-1.6.5-1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/swi…>
[INFO] Copying slf4j-log4j12-1.7.5.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/slf…>
[INFO] Copying openejb-core-4.5.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying openwebbeans-ejb-1.1.8.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying commons-vfs2-2.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying xbean-bundleutils-3.12.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/xbe…>
[INFO] Copying javacsv-2.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jav…>
[INFO] Copying opencsv-2.3.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/ope…>
[INFO] Copying hibernate-jpa-2.0-api-1.0.1.Final.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/hib…>
[INFO] Copying jetty-http-8.1.12.v20130726.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jet…>
[INFO] Copying javassist-3.17.1-GA.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jav…>
[INFO] Copying commons-lang3-3.1.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/com…>
[INFO] Copying kahadb-5.7.0.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/kah…>
[INFO] Copying pdf-renderer-1.0.5.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/pdf…>
[INFO] Copying jetty-io-8.1.12.v20130726.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jet…>
[INFO] Copying wsdl4j-1.6.2.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/wsd…>
[INFO] Copying javahelp-2.0.05.jar to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/lib/jav…>
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:parserJava (default) @ lima-business ---
[INFO] start entry basedir:<http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java,> includes:[**/*.java]
[INFO] 41 file(s) to process (among 41 files)
[INFO] Parsing is done. [treated file(s) : 12/41](total time:332.988ms) ( ~ 8.122ms / file)
[INFO]
[INFO] >>> i18n-maven-plugin:2.5.1:gen (default) @ lima-business >>>
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:get (get) @ lima-business ---
[INFO] config - basedir : <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/generat…>
[INFO] config - locales : [fr_FR, en_GB]
[INFO] import getter java.getter in 241729ns
[INFO] Copying lima-business.properties to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/generat…>
[INFO] Copying lima-business.properties to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/generat…>
[INFO]
[INFO] <<< i18n-maven-plugin:2.5.1:gen (default) @ lima-business <<<
[INFO]
[INFO] --- i18n-maven-plugin:2.5.1:gen (default) @ lima-business ---
[INFO] config - src basedir : <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/resou…>
[INFO] config - out basedir : <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/generat…>
[INFO] config - locales : [fr_FR, en_GB]
[INFO] prepare bundle for locale fr_FR
[INFO] merge bundle fr_FR to out
[WARNING] bundle fr_FR contains 95/164 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO] copy bundle fr_FR to src
[INFO] prepare bundle for locale en_GB
[INFO] merge bundle en_GB to out
[WARNING] bundle en_GB contains 94/162 empty entries! (use -Di18n.showEmpty to see these entries)
[INFO] copy bundle en_GB to src
[INFO]
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ lima-business ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 18 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ lima-business ---
[INFO] Compiling 41 source files to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/classes>
[WARNING] bootstrap class path not set in conjunction with -source 1.6
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[37,23] org.nuiton.util.ApplicationConfig in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[38,23] org.nuiton.util.ArgumentsParserException in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[56,33] org.nuiton.util.ApplicationConfig in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[37,23] org.nuiton.util.ApplicationConfig in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[38,23] org.nuiton.util.ArgumentsParserException in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[56,33] org.nuiton.util.ApplicationConfig in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[37,23] org.nuiton.util.ApplicationConfig in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[38,23] org.nuiton.util.ArgumentsParserException in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[56,33] org.nuiton.util.ApplicationConfig in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[232,52] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[66,9] <O,A>ApplicationConfig(java.lang.Class<O>,java.lang.Class<A>,java.util.Properties,java.lang.String) in org.nuiton.util.ApplicationConfig has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[161,18] org.nuiton.util.ArgumentsParserException in org.nuiton.util has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[328,38] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[423,56] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[474,35] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[478,35] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[482,35] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[486,35] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>:[581,19] importAsPDF(java.lang.String,org.chorem.lima.business.utils.ImportExportEntityEnum,boolean) in org.chorem.lima.business.api.ImportService has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>: Some input files use unchecked or unsafe operations.
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/main/java/…>: Recompile with -Xlint:unchecked for details.
[INFO]
[INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ lima-business ---
[INFO] Executing tasks
main:
[mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/surefir…>
[INFO] Executed tasks
[INFO]
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ lima-business ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 8 resources
[INFO]
[INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ lima-business ---
[INFO] Compiling 22 source files to <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/target/test-cl…>
[INFO] -------------------------------------------------------------
[WARNING] COMPILATION WARNING :
[INFO] -------------------------------------------------------------
[WARNING] bootstrap class path not set in conjunction with -source 1.6
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/test/java/…>:[61,44] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[WARNING] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/test/java/…>:[64,30] stringToListAccounts(java.lang.String,java.lang.Boolean) in org.chorem.lima.entity.AccountDAOImpl has been deprecated
[INFO] 3 warnings
[INFO] -------------------------------------------------------------
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/src/test/java/…>:[174,27] method initFactory in class org.chorem.lima.service.LimaServiceFactory cannot be applied to given types;
required: org.nuiton.config.ApplicationConfig
found: org.chorem.lima.business.LimaConfig
reason: actual argument org.chorem.lima.business.LimaConfig cannot be converted to org.nuiton.config.ApplicationConfig by method invocation conversion
[INFO] 1 error
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Lima .............................................. SUCCESS [6.418s]
[INFO] Lima :: callao .................................... SUCCESS [10.840s]
[INFO] Lima :: business API .............................. SUCCESS [0.764s]
[INFO] Lima :: business .................................. FAILURE [5.525s]
[INFO] Lima :: Swing ..................................... SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 29.216s
[INFO] Finished at: Sat Jan 04 13:01:27 CET 2014
[INFO] Final Memory: 42M/296M
[INFO] ------------------------------------------------------------------------
Waiting for Jenkins to finish collecting data
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business-api/pom.xml> to org.chorem.lima/lima-business-api/0.8-SNAPSHOT/lima-business-api-0.8-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business-api/target/lim…> to org.chorem.lima/lima-business-api/0.8-SNAPSHOT/lima-business-api-0.8-SNAPSHOT.jar
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-callao/pom.xml> to org.chorem.lima/lima-callao/0.8-SNAPSHOT/lima-callao-0.8-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-callao/target/lima-call…> to org.chorem.lima/lima-callao/0.8-SNAPSHOT/lima-callao-0.8-SNAPSHOT.jar
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-swing/pom.xml> to org.chorem.lima/lima-swing/0.8-SNAPSHOT/lima-swing-0.8-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/pom.xml> to org.chorem/lima/0.8-SNAPSHOT/lima-0.8-SNAPSHOT.pom
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/target/lima-0.8-SNAPSHOT-sit…> to org.chorem/lima/0.8-SNAPSHOT/lima-0.8-SNAPSHOT-site_fr.xml
[JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/lima/ws/trunk/lima-business/pom.xml> to org.chorem.lima/lima-business/0.8-SNAPSHOT/lima-business-0.8-SNAPSHOT.pom
Sending e-mails to: lima-commits(a)list.chorem.org
channel stopped
1
1
r3737 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by sbavencoff@users.chorem.org 06 Jan '14
by sbavencoff@users.chorem.org 06 Jan '14
06 Jan '14
Author: sbavencoff
Date: 2014-01-06 17:50:14 +0100 (Mon, 06 Jan 2014)
New Revision: 3737
Url: http://chorem.org/projects/lima/repository/revisions/3737
Log:
fixes #968 : fix bug if entryTarget.getVoucher() is null
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-01-06 16:20:04 UTC (rev 3736)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-01-06 16:50:14 UTC (rev 3737)
@@ -25,6 +25,7 @@
package org.chorem.lima.ui.financialtransaction;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -452,7 +453,7 @@
}
}
- /**
+ /**
* Add new transaction.
*/
public void addFinancialTransaction() {
@@ -668,10 +669,7 @@
FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel();
ListSelectionModel selectionModel = table.getSelectionModel();
- if (table.isEditing()) {
- TableCellEditor editor = table.getCellEditor();
- editor.stopCellEditing();
- }
+ table.exit();
int selectedRow = table.getSelectedRow();
int selectedColumn = table.getSelectedColumn();
@@ -682,13 +680,13 @@
if (entrySource != entryTarget) {
switch (selectedColumn) {
case 1 :
- if (entryTarget.getVoucher().compareTo(entrySource.getVoucher()) != 0) {
+ if (!StringUtils.equals(entryTarget.getVoucher(), entrySource.getVoucher())) {
entryTarget.setVoucher(entrySource.getVoucher());
financialTransactionService.updateEntry(entryTarget);
}
break;
case 3 :
- if (entryTarget.getDescription().compareTo(entrySource.getDescription()) != 0) {
+ if (!StringUtils.equals(entryTarget.getDescription(), entrySource.getDescription())) {
entryTarget.setDescription(entrySource.getDescription());
financialTransactionService.updateEntry(entryTarget);
}
1
0
r3736 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/service lima-swing lima-swing/src/main/resources/i18n
by sbavencoff@users.chorem.org 06 Jan '14
by sbavencoff@users.chorem.org 06 Jan '14
06 Jan '14
Author: sbavencoff
Date: 2014-01-06 17:20:04 +0100 (Mon, 06 Jan 2014)
New Revision: 3736
Url: http://chorem.org/projects/lima/repository/revisions/3736
Log:
refs #370 : update JAXX to 2.6
Modified:
trunk/lima-business/pom.xml
trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java
trunk/lima-swing/pom.xml
trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
trunk/pom.xml
Modified: trunk/lima-business/pom.xml
===================================================================
--- trunk/lima-business/pom.xml 2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-business/pom.xml 2014-01-06 16:20:04 UTC (rev 3736)
@@ -83,6 +83,10 @@
<artifactId>topia-service-migration</artifactId>
</dependency>
<dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-config</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
@@ -95,6 +99,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -106,10 +114,9 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
</dependency>
-
<dependency>
- <groupId>org.nuiton.jaxx</groupId>
- <artifactId>jaxx-config</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
</dependencies>
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2014-01-06 16:20:04 UTC (rev 3736)
@@ -34,8 +34,9 @@
import org.nuiton.topia.TopiaContextFactory;
import org.nuiton.topia.migration.TopiaMigrationEngine;
import org.nuiton.topia.migration.TopiaMigrationService;
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ArgumentsParserException;
+import org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ConfigOptionDef;
+import org.nuiton.config.ArgumentsParserException;
import java.io.File;
@@ -174,7 +175,7 @@
* information for jaxx configuration frame ({@link #type},
* {@link #transientBoolean}, {@link #finalBoolean}...)
*/
- public enum Option implements OptionDef {
+ public enum Option implements ConfigOptionDef {
CONFIG_FILE(CONFIG_FILE_NAME, n_("lima.config.configFileName.description"), "lima.properties", String.class, true, true),
DATA_DIR("lima.data.dir", n_("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false),
Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2014-01-06 16:20:04 UTC (rev 3736)
@@ -30,7 +30,7 @@
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.business.ServiceListener;
import org.chorem.lima.business.ServiceMonitorable;
-import org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
import javax.ejb.embeddable.EJBContainer;
import javax.naming.NamingException;
Modified: trunk/lima-swing/pom.xml
===================================================================
--- trunk/lima-swing/pom.xml 2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-swing/pom.xml 2014-01-06 16:20:04 UTC (rev 3736)
@@ -93,6 +93,16 @@
</dependency>
<dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-config</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-decorator</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.nuiton.i18n</groupId>
<artifactId>nuiton-i18n</artifactId>
</dependency>
@@ -103,10 +113,6 @@
</dependency>
<dependency>
<groupId>org.swinglabs.swingx</groupId>
- <artifactId>swingx-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.swinglabs.swingx</groupId>
<artifactId>swingx-autocomplete</artifactId>
</dependency>
<dependency>
@@ -131,6 +137,11 @@
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
<!-- for remote mode only -->
<dependency>
<groupId>org.apache.openejb</groupId>
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-01-03 14:45:29 UTC (rev 3735)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-01-06 16:20:04 UTC (rev 3736)
@@ -79,6 +79,7 @@
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.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
lima.config.configFileName.description=Le nom du fichier de configuration de l'application
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-01-03 14:45:29 UTC (rev 3735)
+++ trunk/pom.xml 2014-01-06 16:20:04 UTC (rev 3736)
@@ -152,6 +152,8 @@
<!-- customized libs version -->
<nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
+ <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion>
+ <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion>
<nuitonProfilingVersion>2.7</nuitonProfilingVersion>
<eugenePluginVersion>2.6.3</eugenePluginVersion>
<!-- Do not move since
@@ -233,6 +235,18 @@
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>14.0.1</version>
+ </dependency>
+
+ <dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
<version>${nuitonUtilsVersion}</version>
@@ -240,6 +254,18 @@
<dependency>
<groupId>org.nuiton</groupId>
+ <artifactId>nuiton-config</artifactId>
+ <version>${nuitonConfigVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-decorator</artifactId>
+ <version>${nuitonDecoratorVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
<artifactId>nuiton-profiling</artifactId>
<version>${nuitonProfilingVersion}</version>
</dependency>
@@ -362,13 +388,6 @@
<dependency>
<groupId>org.swinglabs.swingx</groupId>
- <artifactId>swingx-common</artifactId>
- <version>${swingxVersion}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.swinglabs.swingx</groupId>
<artifactId>swingx-autocomplete</artifactId>
<version>${swingxVersion}</version>
<scope>compile</scope>
1
0
r3735 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/common
by sbavencoff@users.chorem.org 03 Jan '14
by sbavencoff@users.chorem.org 03 Jan '14
03 Jan '14
Author: sbavencoff
Date: 2014-01-03 15:45:29 +0100 (Fri, 03 Jan 2014)
New Revision: 3735
Url: http://chorem.org/projects/lima/repository/revisions/3735
Log:
Financial transaction : fire model if values is clear
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.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-01-03 14:40:15 UTC (rev 3734)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-01-03 14:45:29 UTC (rev 3735)
@@ -71,7 +71,11 @@
}
public void clear() {
- values.clear();
+ if (!values.isEmpty()) {
+ int rowCount = getRowCount();
+ values.clear();
+ fireTableRowsDeleted(0, rowCount-1);
+ }
}
public List<E> getValues() {
1
0
03 Jan '14
Author: sbavencoff
Date: 2014-01-03 15:40:15 +0100 (Fri, 03 Jan 2014)
New Revision: 3734
Url: http://chorem.org/projects/lima/repository/revisions/3734
Log:
refs #370 : fix spelling
Modified:
trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
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-01-03 14:36:55 UTC (rev 3733)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-01-03 14:40:15 UTC (rev 3734)
@@ -99,8 +99,8 @@
lima.config.resources.dir.label=
lima.config.scale.description=Nombre de caratères décimales pour les montants
lima.config.scale.label=Nombre de décimales
-lima.config.selectAllEditingCell.description=Sélectionner tous le contenue à édition d'une cellule
-lima.config.selectAllEditingCell.label=Tous Sélectiones à l'édition
+lima.config.selectAllEditingCell.description=Sélectionner tous le contenu à édition d'une cellule
+lima.config.selectAllEditingCell.label=Tous Sélectioner à l'édition
lima.config.state.file=Fichier d'état de l'application
lima.config.state.file.description=
lima.config.state.file.label=
1
0
r3733 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/service lima-swing lima-swing/src/main/java/org/chorem/lima lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/celleditor lima-swing/src/main/resources/i18n
by sbavencoff@users.chorem.org 03 Jan '14
by sbavencoff@users.chorem.org 03 Jan '14
03 Jan '14
Author: sbavencoff
Date: 2014-01-03 15:36:55 +0100 (Fri, 03 Jan 2014)
New Revision: 3733
Url: http://chorem.org/projects/lima/repository/revisions/3733
Log:
refs #370 : update JAXX to 2.6 fix application settings
Modified:
trunk/lima-business/pom.xml
trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java
trunk/lima-swing/pom.xml
trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.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
trunk/pom.xml
Modified: trunk/lima-business/pom.xml
===================================================================
--- trunk/lima-business/pom.xml 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-business/pom.xml 2014-01-03 14:36:55 UTC (rev 3733)
@@ -106,6 +106,12 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-config</artifactId>
+ </dependency>
+
</dependencies>
<build>
Modified: trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -30,7 +30,7 @@
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.business.ServiceListener;
import org.chorem.lima.business.ServiceMonitorable;
-import org.nuiton.util.ApplicationConfig;
+import org.nuiton.config.ApplicationConfig;
import javax.ejb.embeddable.EJBContainer;
import javax.naming.NamingException;
Modified: trunk/lima-swing/pom.xml
===================================================================
--- trunk/lima-swing/pom.xml 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/pom.xml 2014-01-03 14:36:55 UTC (rev 3733)
@@ -78,6 +78,11 @@
</dependency>
<dependency>
+ <groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-config</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.swinglabs</groupId>
<artifactId>jxlayer</artifactId>
</dependency>
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -33,14 +33,15 @@
import org.chorem.lima.business.api.OptionsService;
import org.chorem.lima.entity.LimaCallaoDAOHelper;
import org.chorem.lima.service.LimaServiceFactory;
+import org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ConfigOptionDef;
import org.nuiton.topia.TopiaContextFactory;
-import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.ArgumentsParserException;
+import org.nuiton.config.ArgumentsParserException;
import org.nuiton.util.Version;
import org.nuiton.util.VersionUtil;
import org.nuiton.util.converter.ConverterUtil;
-import java.awt.Color;
+import java.awt.*;
import java.beans.PropertyChangeListener;
import java.io.File;
import java.io.IOException;
@@ -277,8 +278,8 @@
*
* @param currency the new currency to set in configuration
*/
- public void setCurrency(String currency) {
- setOption(Option.CURRENCY.key, currency);
+ public void setCurrency(boolean currency) {
+ setOption(Option.CURRENCY.key, Boolean.toString(currency));
saveForUser();
firePropertyChange("currency", null, currency);
}
@@ -371,12 +372,12 @@
return getOptionAsColor((Option.COLOR_SELECTION_FOCUS.key));
}
- public void setComportmentEditingCell(String comportmentEditingCell) {
- setOption(Option.COMPORTMENT_EDITING_CELL.key, comportmentEditingCell);
+ public void setSelectAllEditingCell(boolean selectAllEditingCell) {
+ setOption(Option.SELECT_ALL_EDITING_CELL.key, Boolean.toString(selectAllEditingCell));
}
- public String getComportmentEditingCell() {
- return getOption((Option.COMPORTMENT_EDITING_CELL.key));
+ public boolean isSelectAllEditingCell() {
+ return getOptionAsBoolean((Option.SELECT_ALL_EDITING_CELL.key));
}
/** Used in ???? */
@@ -408,31 +409,116 @@
* information for jaxx configuration frame ({@link #type},
* {@link #_transient}, {@link #_final}...)
*/
- public enum Option implements OptionDef {
+ public enum Option implements ConfigOptionDef {
- CONFIG_FILE(CONFIG_FILE_NAME, n_("lima.config.configFileName.description"), "lima-config.properties", String.class, true, true),
- DATA_DIR("lima.data.dir", n_("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false),
- RESOURCES_DIRECTORY("lima.resources.dir", n_("lima.config.resources.dir.description"), "${lima.data.dir}/resources-${application.version}", String.class, false, false),
- I18N_DIRECTORY("lima.i18n.dir", n_("lima.config.i18n.dir.description"), "${lima.resources.dir}/i18n", String.class, false, false),
- LOCALE("lima.ui.locale", n_("lima.config.locale.description"), "fr_FR", Locale.class, false, false),
- DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator", n_("lima.config.decimalseparator.description"), ",", String.class, false, false),
- SCALE("lima.data.bigDecimal.scale", n_("lima.config.scale.description"), "2", Integer.class, false, false),
- THOUSAND_SEPARATOR("lima.thousandSeparator", n_("limma.config.thousandseparator.description"), " ", String.class, false, false),
- CURRENCY("lima.config.currency", n_("lima.config.currency.description"), "none", Boolean.class, false, false),
- FULL_SCREEN("lima.ui.fullscreen", n_("lima.config.ui.fullscreen.description"), "false", Boolean.class, false, false),
- LAUNCH_UI("lima.ui.launchui", n_("lima.config.ui.flaunchui.description"), "true", Boolean.class, true, true),
- SUPPORT_EMAIL("lima.misc.supportemail", n_("lima.misc.supportemail.description"), "support(a)codelutin.com", String.class, false, false),
- OPENEJB_REMOTEMODE("lima.openejb.remotemode", n_("lima.openejb.remotemode.description"), "false", String.class, false, false),
- LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false),
- LIMA_STATE_FILE("lima.ui.state.file", n_("lima.config.state.file"), "${lima.data.dir}/limaState.xml", String.class, false, false),
- COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus", n_("lima.config.colorselectionfocus"), "#000000", Color.class, false, false),
- COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell",n_("lima.config.comportmenteditingcell"), "ALL", ComportmentEditingCellEnum.class, false, false);
+ CONFIG_FILE(CONFIG_FILE_NAME,
+ _("lima.config.configFileName.label"),
+ n_("lima.config.configFileName.description"),
+ "lima-config.properties",
+ String.class, true, true),
+ DATA_DIR("lima.data.dir",
+ _("lima.config.data.dir.label"),
+ n_("lima.config.data.dir.description"),
+ "${user.home}/.lima",
+ File.class, false, false),
+
+ RESOURCES_DIRECTORY("lima.resources.dir",
+ _("lima.config.resources.dir.label"),
+ n_("lima.config.resources.dir.description"),
+ "${lima.data.dir}/resources-${application.version}",
+ String.class, false, false),
+
+ I18N_DIRECTORY("lima.i18n.dir",
+ _("lima.config.i18n.dir.label"),
+ n_("lima.config.i18n.dir.description"),
+ "${lima.resources.dir}/i18n",
+ String.class, false, false),
+
+ LOCALE("lima.ui.locale",
+ _("lima.config.locale.label"),
+ n_("lima.config.locale.description"),
+ "fr_FR",
+ Locale.class, false, false),
+
+ DECIMAL_SEPARATOR("lima.data.bigDecimal.decimalSeparator",
+ _("lima.config.decimalseparator.label"),
+ n_("lima.config.decimalseparator.description"),
+ ",",
+ String.class, false, false),
+
+ SCALE("lima.data.bigDecimal.scale",
+ _("lima.config.scale.label"),
+ n_("lima.config.scale.description"),
+ "2",
+ Integer.class, false, false),
+
+ THOUSAND_SEPARATOR("lima.thousandSeparator",
+ _("limma.config.thousandseparator.label"),
+ n_("limma.config.thousandseparator.description"),
+ " ",
+ String.class, false, false),
+
+ CURRENCY("lima.config.currency",
+ _("lima.config.currency.label"),
+ n_("lima.config.currency.description"),
+ "false",
+ Boolean.class, false, false),
+
+ FULL_SCREEN("lima.ui.fullscreen",
+ _("lima.config.ui.fullscreen.label"),
+ n_("lima.config.ui.fullscreen.description"),
+ "false",
+ Boolean.class, false, false),
+
+ LAUNCH_UI("lima.ui.launchui",
+ _("lima.config.ui.flaunchui.label"),
+ n_("lima.config.ui.flaunchui.description"),
+ "true", Boolean.class, true, true),
+
+ SUPPORT_EMAIL("lima.misc.supportemail",
+ _("lima.misc.supportemail.label"),
+ n_("lima.misc.supportemail.description"),
+ "support(a)codelutin.com",
+ String.class, false, false),
+
+ OPENEJB_REMOTEMODE("lima.openejb.remotemode",
+ _("lima.openejb.remotemode.label"),
+ n_("lima.openejb.remotemode.description"),
+ "false",
+ String.class, false, false),
+
+ LIMA_HOST_ADDRESS("lima.host.address",
+ _("lima.config.host.adress.label"),
+ n_("lima.config.host.adress.description"),
+ "localhost",
+ String.class, false, false),
+
+ LIMA_STATE_FILE("lima.ui.state.file",
+ _("lima.config.state.file.label"),
+ n_("lima.config.state.file.description"),
+ "${lima.data.dir}/limaState.xml",
+ String.class, false, false),
+
+ COLOR_SELECTION_FOCUS("lima.ui.table.cell.colorSelectionFocus",
+ _("lima.config.colorselectionfocus.label"),
+ n_("lima.config.colorselectionfocus.description"),
+ "#000000",
+ Color.class, false, false),
+
+ SELECT_ALL_EDITING_CELL("lima.ui.table.cell.selectAllEditingCell",
+ _("lima.config.selectAllEditingCell.label"),
+ n_("lima.config.selectAllEditingCell.description"),
+ "true",
+ Boolean.class, false, false);
+
public enum ComportmentEditingCellEnum {ALL, NOTHING}
public final String key;
+ public final String label;
+
public final String description;
public String defaultValue;
@@ -443,9 +529,10 @@
public boolean _final;
- Option(String key, String description, String defaultValue,
+ Option(String key, String label, String description, String defaultValue,
Class<?> type, boolean _transient, boolean _final) {
this.key = key;
+ this.label = label;
this.description = description;
this.defaultValue = defaultValue;
this.type = type;
@@ -483,6 +570,10 @@
this.defaultValue = defaultValue;
}
+ public String getLabel () {
+ return label;
+ }
+
@Override
public String getDescription() {
return _(description);
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaContext.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -25,23 +25,22 @@
package org.chorem.lima;
-import java.util.Locale;
-
import jaxx.runtime.JAXXUtil;
import jaxx.runtime.context.DefaultApplicationContext;
import jaxx.runtime.context.JAXXContextEntryDef;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.ui.LimaDecoratorProvider;
import org.chorem.lima.ui.MainView;
import org.chorem.lima.ui.MainViewHandler;
+import org.nuiton.decorator.DecoratorProvider;
import org.nuiton.i18n.I18n;
import org.nuiton.i18n.init.DefaultI18nInitializer;
import org.nuiton.i18n.init.I18nInitializer;
import org.nuiton.util.StringUtil;
-import org.nuiton.util.decorator.DecoratorProvider;
+import java.util.Locale;
+
/** @author chemit */
public class LimaContext extends DefaultApplicationContext {
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -28,8 +28,7 @@
import org.chorem.lima.entity.EntryBook;
import org.chorem.lima.entity.FinancialPeriod;
import org.chorem.lima.entity.FiscalPeriod;
-import org.nuiton.util.decorator.Decorator;
-import org.nuiton.util.decorator.DecoratorProvider;
+import org.nuiton.decorator.DecoratorProvider;
/**
* To provide decorations for entities.
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaRendererUtil.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -27,10 +27,10 @@
import jaxx.runtime.swing.renderer.DecoratorListCellRenderer;
import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer;
import org.chorem.lima.LimaContext;
-import org.nuiton.util.decorator.Decorator;
-import org.nuiton.util.decorator.DecoratorProvider;
+import org.nuiton.decorator.Decorator;
+import org.nuiton.decorator.DecoratorProvider;
-import javax.swing.ListCellRenderer;
+import javax.swing.*;
/**
* Helper class to deal with renderers.
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-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -28,7 +28,7 @@
import jaxx.runtime.JAXXContext;
import jaxx.runtime.SwingUtil;
import jaxx.runtime.swing.AboutPanel;
-import jaxx.runtime.swing.editor.config.ConfigUIHelper;
+import jaxx.runtime.swing.config.ConfigUIHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.LimaConfig;
@@ -58,16 +58,10 @@
import org.nuiton.util.DesktopUtil;
import org.nuiton.widget.SwingSession;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JEditorPane;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.UIManager;
+import javax.swing.*;
import javax.swing.border.LineBorder;
import javax.swing.plaf.BorderUIResource;
-import java.awt.Component;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -203,19 +197,29 @@
helper.addCategory(_("lima.config.category.directories"), _("lima.config.category.directories.description"));
helper.addOption(LimaConfig.Option.CONFIG_FILE);
+ helper.setOptionShortLabel(LimaConfig.Option.CONFIG_FILE.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());
helper.addOption(LimaConfig.Option.LOCALE);
+ helper.setOptionShortLabel(LimaConfig.Option.LOCALE.getLabel());
helper.addOption(LimaConfig.Option.DECIMAL_SEPARATOR);
+ helper.setOptionShortLabel(LimaConfig.Option.DECIMAL_SEPARATOR.getLabel());
helper.addOption(LimaConfig.Option.SCALE);
+ helper.setOptionShortLabel(LimaConfig.Option.SCALE.getLabel());
helper.addOption(LimaConfig.Option.THOUSAND_SEPARATOR);
+ helper.setOptionShortLabel(LimaConfig.Option.THOUSAND_SEPARATOR.getLabel());
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,
* car les deux éditeurs concernés rappellent la config dans un listener ('focusGained')*/
- helper.addOption(LimaConfig.Option.COMPORTMENT_EDITING_CELL);
+ 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/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -55,10 +55,15 @@
for (int i = 0; i < config.getScale(); i++) {
scale += "0";
}
- DecimalFormat formatter = new DecimalFormat("##0." + scale);
+ String currency = "";
+ if (config.getCurrency()) {
+ currency = " ¤";
+ }
+ DecimalFormat formatter = new DecimalFormat("##0." + scale + currency);
DecimalFormatSymbols symbol = new DecimalFormatSymbols();
//set decimalSeparator and thousandSeparator preferences
symbol.setDecimalSeparator(config.getDecimalSeparator());
+ symbol.setMonetaryDecimalSeparator(config.getDecimalSeparator());
symbol.setGroupingSeparator(config.getThousandSeparator());
formatter.setDecimalFormatSymbols(symbol);
//always set grouping
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -118,8 +118,8 @@
SwingUtilities.invokeLater(new Runnable() {
public void run() {
JFormattedTextField dateFormattedTextField = datePicker.getEditor();
- String comportmentEditingCell = LimaConfig.getInstance().getComportmentEditingCell();
- if (comportmentEditingCell.equals("ALL")) {
+ LimaConfig config = LimaConfig.getInstance();
+ if (config.isSelectAllEditingCell()) {
dateFormattedTextField.selectAll();
} else {
int textFieldSize = dateFormattedTextField.getText().length();
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.java 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/StringTableCellEditor.java 2014-01-03 14:36:55 UTC (rev 3733)
@@ -106,8 +106,8 @@
* Two kinds of edition, with LimaConfig value
* */
public void runEdition() {
- String comportmentEditingCell = LimaConfig.getInstance().getComportmentEditingCell();
- if (comportmentEditingCell.equals("ALL")) {
+ LimaConfig config = LimaConfig.getInstance();
+ if (config.isSelectAllEditingCell()) {
getComponent().selectAll();
} else {
int textFieldSize = getComponent().getText().length();
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-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-01-03 14:36:55 UTC (rev 3733)
@@ -91,19 +91,41 @@
lima.config.category.other=Other
lima.config.category.other.description=Other configuration properties
lima.config.colorselectionfocus=Cadring color of the selection of a cell
+lima.config.colorselectionfocus.description=
+lima.config.colorselectionfocus.label=
lima.config.comportmenteditingcell=Comportment selection of the containing on the edition of a cell
lima.config.configFileName.description=
+lima.config.configFileName.label=
+lima.config.currency=
lima.config.currency.description=
+lima.config.currency.label=
lima.config.data.dir.description=
+lima.config.data.dir.label=
lima.config.decimalseparator.description=
+lima.config.decimalseparator.label=
lima.config.host.adress=Host adress
+lima.config.host.adress.description=
+lima.config.host.adress.label=
lima.config.i18n.dir.description=
+lima.config.i18n.dir.label=
lima.config.locale.description=Localization used by LIMA
+lima.config.locale.label=
lima.config.resources.dir.description=
+lima.config.resources.dir.label=
lima.config.scale.description=
+lima.config.scale.label=
+lima.config.selectAllEditingCell=
+lima.config.selectAllEditingCell.description=
+lima.config.selectAllEditingCell.label=
lima.config.state.file=State file of LIMA
+lima.config.state.file.description=
+lima.config.state.file.label=
lima.config.ui.flaunchui.description=
+lima.config.ui.flaunchui.label=
lima.config.ui.fullscreen.description=FullScreen
+lima.config.ui.fullscreen.label=
+lima.data.bigDecimal.decimalSeparator=
+lima.data.bigDecimal.scale=
lima.documents=Documents…
lima.entries=Entries
lima.entries.addEntry=New entry
@@ -212,7 +234,9 @@
lima.menu.window=Window
lima.message.help.usage=Options (set with --option <key> <value>\:
lima.misc.supportemail.description=Support email
+lima.misc.supportemail.label=
lima.openejb.remotemode.description=
+lima.openejb.remotemode.label=
lima.opening.accounts=Import accounts from\:
lima.preferences=Preferences
lima.reports=Reports
@@ -250,6 +274,7 @@
lima.table.solde.debit=Debit solde
lima.table.sum=Sums
lima.table.voucher=Voucher
+lima.thousandSeparator=
lima.title.about=About Lima...
lima.title.about.description=Open sources accounting software
lima.title.about.translate=Translate Lima
@@ -343,6 +368,7 @@
lima.ui.fiscalperiod.fiscalperiod.status=
lima.ui.fiscalperiod.open=
lima.ui.fiscalperiod.status=
+lima.ui.fullscreen=
lima.ui.home.account=Chart of accounts
lima.ui.home.chartaccounts.create=Create the chart of accounts
lima.ui.home.chartaccounts.modify=Edit the chart of accounts
@@ -411,6 +437,7 @@
lima.ui.lettering.selectDebit=
lima.ui.lettering.selectEntry=Actual selection
lima.ui.lettering.selectSolde=Balance
+lima.ui.locale=
lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting
lima.ui.nonaffect=
lima.ui.opening.accounts=<html><center>Select a default, <br/>import your personnal<br/> or cancel to create your own account chart.</center></html>
@@ -421,6 +448,9 @@
lima.ui.opening.next=Next
lima.ui.opening.title=
lima.ui.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html>
+lima.ui.table.cell.colorSelectionFocus=
+lima.ui.table.cell.comportmentEditingCell=
+lima.ui.table.cell.selectAllEditingCell=
lima.vatreport.listerror=Can't get entries list
lima.vatstatement.accounts=List of accounts
lima.vatstatement.boxname=PDF BoxName
@@ -430,3 +460,4 @@
lima.vatstatement.movement.add=Add movement
lima.warning.nimbus.landf=Could not find Numbus Look&Feel
limma.config.thousandseparator.description=
+limma.config.thousandseparator.label=
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-01-03 13:06:37 UTC (rev 3732)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-01-03 14:36:55 UTC (rev 3733)
@@ -79,20 +79,35 @@
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.colorselectionfocus=Couleur de l'encadrement de sélection d'une cellule
-lima.config.comportmenteditingcell=Comportement de la sélection du contenu lors de l'édition d'une cellule ('ALL' \: sélection de tout le contenu; 'NOTHING' \: aucune sélection)
-lima.config.configFileName.description=
-lima.config.currency.description=
-lima.config.data.dir.description=
-lima.config.decimalseparator.description=
-lima.config.host.adress=Adresse du serveur distant
+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
+lima.config.configFileName.description=Le nom du fichier de configuration de l'application
+lima.config.configFileName.label=fichier de configuration
+lima.config.currency.description=Afficher le symbole monétaire
+lima.config.currency.label=Unité monétaire
+lima.config.data.dir.description=Répertoire d'enregistrement des données de l'application
+lima.config.data.dir.label=Répertoire des données
+lima.config.decimalseparator.description=Caractères de séparation entre la partie entière et la parti décimale d'un nombre
+lima.config.decimalseparator.label=Séparateur de décimales
+lima.config.host.adress.description=Adresse du serveur distant
+lima.config.host.adress.label=Serveur
lima.config.i18n.dir.description=
-lima.config.locale.description=Locale utilisée par l'application
+lima.config.i18n.dir.label=
+lima.config.locale.description=Paramétres local utilisés par l'application
+lima.config.locale.label=Zone
lima.config.resources.dir.description=
-lima.config.scale.description=
+lima.config.resources.dir.label=
+lima.config.scale.description=Nombre de caratères décimales pour les montants
+lima.config.scale.label=Nombre de décimales
+lima.config.selectAllEditingCell.description=Sélectionner tous le contenue à édition d'une cellule
+lima.config.selectAllEditingCell.label=Tous Sélectiones à l'édition
lima.config.state.file=Fichier d'état de l'application
+lima.config.state.file.description=
+lima.config.state.file.label=
lima.config.ui.flaunchui.description=
-lima.config.ui.fullscreen.description=Plein écran
+lima.config.ui.flaunchui.label=
+lima.config.ui.fullscreen.description=demarrer l'application en mode plein écran
+lima.config.ui.fullscreen.label=Plein écran
lima.documents=Documents…
lima.entries=Traitement
lima.entries.addEntry=Créer une entrée dans la transaction
@@ -202,7 +217,9 @@
lima.menu.window=Fenêtre
lima.message.help.usage=Options (set with --option <key> <value>\:
lima.misc.supportemail.description=Adresse email de support
+lima.misc.supportemail.label=support
lima.openejb.remotemode.description=
+lima.openejb.remotemode.label=
lima.opening.accounts=Importer le plan de comptes depuis \:
lima.preferences=Préférences
lima.reports=Rapports
@@ -399,7 +416,7 @@
lima.ui.lettering.selectEntry=Sélection courante
lima.ui.lettering.selectSolde=Solde
lima.ui.mainview.title=Lutin Invoice Monitoring and Accounting
-lima.ui.nonaffect=
+lima.ui.nonaffect=N.R
lima.ui.opening.accounts=<html><center>Veuillez sélectionner un plan par défault, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html>
lima.ui.opening.close=Fermer
lima.ui.opening.end=Terminer
@@ -416,4 +433,5 @@
lima.vatstatement.mastervatstatement=
lima.vatstatement.movement.add=Ajouter un regrouprement
lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé
-limma.config.thousandseparator.description=
+limma.config.thousandseparator.description=Caractère de séparation entre les blocs de milliers
+limma.config.thousandseparator.label=Séparateur de milliers
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-01-03 13:06:37 UTC (rev 3732)
+++ trunk/pom.xml 2014-01-03 14:36:55 UTC (rev 3733)
@@ -159,7 +159,7 @@
<topiaVersion>2.7.1</topiaVersion>
<!-- Version cannot be upgraded because of incompatibility with OpenEJB
-chatellier ???-->
- <jaxxVersion>2.5.23</jaxxVersion>
+ <jaxxVersion>2.6</jaxxVersion>
<nuitonI18nVersion>2.5.1</nuitonI18nVersion>
<openEjbVersion>4.5.2</openEjbVersion>
<slf4jVersion>1.7.5</slf4jVersion>
@@ -260,6 +260,13 @@
<dependency>
<groupId>org.nuiton.jaxx</groupId>
+ <artifactId>jaxx-config</artifactId>
+ <version>${jaxxVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton.jaxx</groupId>
<artifactId>jaxx-widgets</artifactId>
<version>${jaxxVersion}</version>
<scope>compile</scope>
1
0
r3732 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by sbavencoff@users.chorem.org 03 Jan '14
by sbavencoff@users.chorem.org 03 Jan '14
03 Jan '14
Author: sbavencoff
Date: 2014-01-03 14:06:37 +0100 (Fri, 03 Jan 2014)
New Revision: 3732
Url: http://chorem.org/projects/lima/repository/revisions/3732
Log:
refs #777 : paste transaction even if no rows are select. no past transaction date and entry book
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-01-02 16:17:49 UTC (rev 3731)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2014-01-03 13:06:37 UTC (rev 3732)
@@ -393,11 +393,16 @@
//select the new line
ListSelectionModel selectionModel = table.getSelectionModel();
- int indexSelectedRow = table.getSelectedRow();
- if (indexSelectedRow != -1 && clipBoard != null && clipBoard instanceof FinancialTransaction) {
+ if (clipBoard != null && clipBoard instanceof FinancialTransaction) {
FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel();
FinancialTransaction transaction = (FinancialTransaction) clipBoard;
+ FinancialPeriod financialPeriod = (FinancialPeriod) view.getFinancialPeriodComboBox().getSelectedItem();
+ EntryBook entryBook = (EntryBook)view.getEntryBookComboBox().getSelectedItem();
+
+ transaction.setEntryBook(entryBook);
+ transaction.setTransactionDate(financialPeriod.getBeginDate());
+
tableModel.addTransaction(transaction);
if (table.isEditing()) {
1
0
r3731 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by sbavencoff@users.chorem.org 02 Jan '14
by sbavencoff@users.chorem.org 02 Jan '14
02 Jan '14
Author: sbavencoff
Date: 2014-01-02 17:17:49 +0100 (Thu, 02 Jan 2014)
New Revision: 3731
Url: http://chorem.org/projects/lima/repository/revisions/3731
Log:
sort fiscal period
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2014-01-02 15:01:00 UTC (rev 3730)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2014-01-02 16:17:49 UTC (rev 3731)
@@ -27,6 +27,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.chorem.lima.business.utils.FiscalPeriodComparator;
import org.chorem.lima.entity.FiscalPeriod;
import org.chorem.lima.ui.common.AbstractColumn;
import org.chorem.lima.ui.common.AbstractLimaTableModel;
@@ -51,6 +52,10 @@
private static final Log log = LogFactory.getLog(FiscalPeriodTableModel.class);
+ public FiscalPeriodTableModel() {
+ comparator = new FiscalPeriodComparator();
+ }
+
@Override
protected void initColumn() {
addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, _("lima.ui.fiscalperiod.begin"), false) {
1
0
r3730 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/vatchart resources/icons
by sbavencoff@users.chorem.org 02 Jan '14
by sbavencoff@users.chorem.org 02 Jan '14
02 Jan '14
Author: sbavencoff
Date: 2014-01-02 16:01:00 +0100 (Thu, 02 Jan 2014)
New Revision: 3730
Url: http://chorem.org/projects/lima/repository/revisions/3730
Log:
refactor vat statement
Added:
trunk/lima-swing/src/main/resources/icons/action-vatstatement-edit.png
trunk/lima-swing/src/main/resources/icons/action-vatstatement-import.png
trunk/lima-swing/src/main/resources/icons/action-vatstatement-new.png
trunk/lima-swing/src/main/resources/icons/action-vatstatement-remove.png
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-01-02 14:30:39 UTC (rev 3729)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-01-02 15:01:00 UTC (rev 3730)
@@ -38,7 +38,37 @@
</script>
<row>
- <cell fill="both" weightx="1" weighty="1" rows='6'>
+ <cell fill="horizontal">
+ <JToolBar floatable="false">
+
+ <JButton id="addVatStatementMovement"
+ toolTipText="{ _("lima.vatstatement.movement.add") + " (Ctrl+N)"}"
+ actionIcon='vatstatement-new'
+ onActionPerformed="handler.addVatStatementMovement()"/>
+
+ <JButton id="updateButton"
+ toolTipText="{ _("lima.common.update") + " (Ctrl+M)"}"
+ actionIcon='vatstatement-edit'
+ onActionPerformed="handler.updateVatStatement()"
+ enabled="{isSelectedRow()}"/>
+
+ <JButton id="removeButton"
+ toolTipText="{ _("lima.common.remove") + " (Del)"}"
+ actionIcon='vatstatement-remove'
+ onActionPerformed="handler.removeVatStatement()"
+ enabled="{isSelectedRow()}"/>
+
+ <JButton id="importButton"
+ actionIcon='vatstatement-import'
+ toolTipText="lima.ui.importexport.import"
+ onActionPerformed="handler.importVatStatementChart()"/>
+
+ </JToolBar>
+ </cell>
+ </row>
+
+ <row>
+ <cell fill="both" weightx="1" weighty="1" >
<JScrollPane>
<VatChartTreeTableModel id="vatTreeTableModel"/>
<VatChartTreeTable id="treeTable"
@@ -51,31 +81,4 @@
</JScrollPane>
</cell>
</row>
- <row>
- <cell fill="horizontal">
- <JButton id="addVatStatementMovement"
- text="lima.vatstatement.movement.add"
- onActionPerformed="getHandler().addVatStatementMovement()"/>
- </cell>
- </row>
- <row>
- <cell fill="horizontal">
- <JButton id="updateButton" text="lima.common.update"
- onActionPerformed="getHandler().updateVatStatement()"
- enabled="{isSelectedRow()}"/>
- </cell>
- </row>
- <row>
- <cell fill="horizontal">
- <JButton id="removeButton" text="lima.common.remove"
- onActionPerformed="getHandler().removeVatStatement()"
- enabled="{isSelectedRow()}"/>
- </cell>
- </row>
- <row>
- <cell fill="horizontal">
- <JButton id="importButton" text="lima.ui.importexport.import"
- onActionPerformed="getHandler().importVatStatementChart()"/>
- </cell>
- </row>
</Table>
\ No newline at end of file
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-01-02 14:30:39 UTC (rev 3729)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-01-02 15:01:00 UTC (rev 3730)
@@ -24,11 +24,6 @@
*/
package org.chorem.lima.ui.vatchart;
-import static org.nuiton.i18n.I18n._;
-
-import javax.swing.JOptionPane;
-import javax.swing.tree.TreePath;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.business.LimaBusinessException;
@@ -44,6 +39,13 @@
import org.chorem.lima.ui.importexport.ImportExport;
import org.jdesktop.swingx.JXTreeTable;
+import javax.swing.*;
+import javax.swing.tree.TreePath;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
+import static org.nuiton.i18n.I18n._;
+
public class VatChartViewHandler implements ServiceListener {
/** log. */
@@ -60,8 +62,47 @@
LimaServiceFactory.getService(
VatStatementService.class);
LimaServiceFactory.addServiceListener(ImportService.class, this);
+
+ init();
}
+ public void init() {
+
+ InputMap inputMap = view.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = view.getActionMap();
+
+ // add action on Ctrl + N
+ String binding = "new-vatStatement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ addVatStatementMovement();
+ }
+ });
+
+ // add action on Delete
+ binding = "remove-vatStatement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ removeVatStatement();
+ }
+ });
+
+ // add action on Ctrl + M
+ binding = "modify-vatStatement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ updateVatStatement();
+ }
+ });
+
+ }
+
public void addVatStatementMovement() {
VatChartTreeTableModel treeTableModel =
@@ -77,7 +118,7 @@
}
VatStatement newVatChartMovement = new VatStatementImpl();
- VatChartMovementForm vatChartMovementForm =
+ final VatChartMovementForm vatChartMovementForm =
new VatChartMovementForm(view);
VatStatement masterVatStatement = null;
if (selectedRow != -1) {
@@ -85,6 +126,18 @@
}
newVatChartMovement.setMasterVatStatement(masterVatStatement);
vatChartMovementForm.setVatStatement(newVatChartMovement);
+
+ InputMap inputMap = vatChartMovementForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = vatChartMovementForm.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ vatChartMovementForm.performCancel();
+ }
+ });
+
// jaxx constructor don't call super() ?
vatChartMovementForm.setLocationRelativeTo(view);
vatChartMovementForm.setVisible(true);
@@ -138,13 +191,25 @@
} else {
treePath = new TreePath(treeTableModel.getRoot());
}
- VatChartMovementForm vatChartMovementForm =
+ final VatChartMovementForm vatChartMovementForm =
new VatChartMovementForm(view);
if (vatStatement.getMasterVatStatement() == null) {
VatStatement masterVatStatement = new VatStatementImpl();
vatStatement.setMasterVatStatement(masterVatStatement);
}
vatChartMovementForm.setVatStatement(vatStatement);
+
+ InputMap inputMap = vatChartMovementForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = vatChartMovementForm.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ vatChartMovementForm.performCancel();
+ }
+ });
+
// jaxx constructor don't call super() ?
vatChartMovementForm.setLocationRelativeTo(view);
vatChartMovementForm.setVisible(true);
@@ -172,8 +237,20 @@
}
public void importVatStatementChart() {
- VatChartImportForm form =
+ final VatChartImportForm form =
new VatChartImportForm();
+
+ InputMap inputMap = form.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = form.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ form.performCancel();
+ }
+ });
+
form.setLocationRelativeTo(view);
form.setVisible(true);
Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-edit.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-edit.png)
===================================================================
(Binary files differ)
Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-import.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-import.png)
===================================================================
(Binary files differ)
Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-new.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-new.png)
===================================================================
(Binary files differ)
Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-remove.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-remove.png)
===================================================================
(Binary files differ)
1
0
r3729 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/account java/org/chorem/lima/ui/financialstatementchart resources/icons
by sbavencoff@users.chorem.org 02 Jan '14
by sbavencoff@users.chorem.org 02 Jan '14
02 Jan '14
Author: sbavencoff
Date: 2014-01-02 15:30:39 +0100 (Thu, 02 Jan 2014)
New Revision: 3729
Url: http://chorem.org/projects/lima/repository/revisions/3729
Log:
refactor financial statement
Added:
trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-header.png
trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-movement.png
trunk/lima-swing/src/main/resources/icons/action-financialstatement-check.png
trunk/lima-swing/src/main/resources/icons/action-financialstatement-edit.png
trunk/lima-swing/src/main/resources/icons/action-financialstatement-import.png
trunk/lima-swing/src/main/resources/icons/action-financialstatement-remove.png
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-01-02 10:35:55 UTC (rev 3728)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2014-01-02 14:30:39 UTC (rev 3729)
@@ -166,7 +166,8 @@
@Override
public void mouseClicked(MouseEvent e) {
- if (e.getClickCount() == 2 ) {
+ JXTreeTable source = (JXTreeTable) e.getSource();
+ if (source.rowAtPoint(e.getPoint()) >= 0 && e.getClickCount() == 2 ) {
updateAccount();
}
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-01-02 10:35:55 UTC (rev 3728)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-01-02 14:30:39 UTC (rev 3729)
@@ -28,6 +28,7 @@
<import>
javax.swing.ListSelectionModel
org.jdesktop.swingx.decorator.HighlighterFactory
+ static org.nuiton.i18n.I18n._
</import>
<FinancialStatementChartViewHandler id="handler"
@@ -35,7 +36,50 @@
<Boolean id="selectedRow" javaBean="false"/>
<row>
- <cell fill="both" weightx="1" weighty="1" rows='6'>
+ <cell fill="horizontal">
+ <JToolBar floatable="false">
+
+ <JButton id="addFinancialStatementHeader"
+ toolTipText="{ _("lima.financialstatement.header.add") + " (Ctrl+Maj+N)"}"
+ actionIcon='financialstatement-add-header'
+ onActionPerformed="handler.addFinancialStatementHeader()"/>
+
+ <JButton id="addFinancialStatementMovement"
+ toolTipText="{ _("lima.financialstatement.movement.add") + " (Ctrl+N)"}"
+ actionIcon='financialstatement-add-movement'
+ onActionPerformed="handler.addFinancialStatementMovement()"
+ enabled="{isSelectedRow()}"/>
+
+ <JButton id="updateButton"
+ toolTipText="{ _("lima.common.update") + " (Ctrl+M)"}"
+ actionIcon='financialstatement-edit'
+ onActionPerformed="handler.updateFinancialStatement()"
+ enabled="{isSelectedRow()}"/>
+
+ <JButton id="removeButton"
+ toolTipText="{ _("lima.common.remove") + " (Del)"}"
+ actionIcon='financialstatement-remove'
+ onActionPerformed="handler.removeFinancialStatement()"
+ enabled="{isSelectedRow()}"/>
+
+ <JButton id="importButton"
+ toolTipText="{ _("lima.ui.importexport.import") + " (Ctrl+I)"}"
+ actionIcon='financialstatement-import'
+ onActionPerformed="handler.importFinancialStatementChart()"/>
+
+ <JToolBar.Separator/>
+
+ <JButton id="checkButton"
+ toolTipText="{ _("lima.financialstatement.check") + " (Ctrl+F)"}"
+ actionIcon='financialstatement-check'
+ onActionPerformed="handler.financialStatementChartCheck()"/>
+
+ </JToolBar>
+ </cell>
+ </row>
+
+ <row>
+ <cell fill="both" weightx="1" weighty="1">
<JScrollPane>
<FinancialStatementChartTreeTable id="treeTable"
constructorParams="getHandler()"
@@ -47,44 +91,5 @@
onValueChanged="setSelectedRow(treeTable.getSelectedRow() != -1)"/>
</JScrollPane>
</cell>
- <cell fill="horizontal">
- <JButton id="addFinancialStatementHeader"
- text="lima.financialstatement.header.add"
- onActionPerformed="getHandler().addFinancialStatementHeader()"/>
- </cell>
</row>
- <row>
- <cell fill="horizontal">
- <JButton id="addFinancialStatementMovement"
- text="lima.financialstatement.movement.add"
- onActionPerformed="getHandler().addFinancialStatementMovement()"
- enabled="{isSelectedRow()}"/>
- </cell>
- </row>
- <row>
- <cell fill="horizontal">
- <JButton id="updateButton" text="lima.common.update"
- onActionPerformed="getHandler().updateFinancialStatement()"
- enabled="{isSelectedRow()}"/>
- </cell>
- </row>
- <row>
- <cell fill="horizontal">
- <JButton id="removeButton" text="lima.common.remove"
- onActionPerformed="getHandler().removeFinancialStatement()"
- enabled="{isSelectedRow()}"/>
- </cell>
- </row>
- <row>
- <cell fill="horizontal">
- <JButton id="importButton" text="lima.ui.importexport.import"
- onActionPerformed="getHandler().importFinancialStatementChart()"/>
- </cell>
- </row>
- <row>
- <cell fill="horizontal">
- <JButton id="checkButton" text="lima.financialstatement.check"
- onActionPerformed="getHandler().financialStatementChartCheck()"/>
- </cell>
- </row>
</Table>
\ No newline at end of file
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2014-01-02 10:35:55 UTC (rev 3728)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2014-01-02 14:30:39 UTC (rev 3729)
@@ -25,14 +25,6 @@
package org.chorem.lima.ui.financialstatementchart;
-import static org.nuiton.i18n.I18n._;
-
-import java.awt.Component;
-
-import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
-import javax.swing.tree.TreePath;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.lima.business.ServiceListener;
@@ -48,6 +40,15 @@
import org.jdesktop.swingx.JXTreeTable;
import org.nuiton.util.Resource;
+import javax.swing.*;
+import javax.swing.tree.TreePath;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+
+import static org.nuiton.i18n.I18n._;
+
/**
* Handler associated with account view.
*
@@ -73,8 +74,76 @@
LimaServiceFactory.getService(
FinancialStatementService.class);
LimaServiceFactory.addServiceListener(ImportService.class, this);
+
+ init();
}
+ public void init() {
+
+ InputMap inputMap = view.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = view.getActionMap();
+
+ // add action on Ctrl + Maj + N
+ String binding = "add-FinancialStatementHeader";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK + InputEvent.SHIFT_DOWN_MASK), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ addFinancialStatementHeader();
+ }
+ });
+
+ // add action on Ctrl + N
+ binding = "add-FinancialStatementMovement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ addFinancialStatementMovement();
+ }
+ });
+
+ // add action on Ctrl + M
+ binding = "update-FinancialStatement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ updateFinancialStatement();
+ }
+ });
+
+ // add action on Delete
+ binding = "remove-FinancialStatement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ removeFinancialStatement();
+ }
+ });
+
+ // add action on Ctrl + I
+ binding = "import-FinancialStatement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_I, KeyEvent.CTRL_DOWN_MASK), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ importFinancialStatementChart();
+ }
+ });
+
+ // add action on Ctrl + K
+ binding = "check-FinancialStatement";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_K, KeyEvent.CTRL_DOWN_MASK), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ financialStatementChartCheck();
+ }
+ });
+ }
+
/** Add new account with account form. */
public void addFinancialStatementHeader() {
@@ -84,9 +153,22 @@
FinancialStatement newFinancialStatementHeader =
new FinancialStatementImpl();
- FinancialStatementHeaderForm financialStatementHeaderForm =
+ final FinancialStatementHeaderForm financialStatementHeaderForm =
new FinancialStatementHeaderForm(view);
+
financialStatementHeaderForm.setFinancialStatement(newFinancialStatementHeader);
+
+ InputMap inputMap = financialStatementHeaderForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = financialStatementHeaderForm.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ financialStatementHeaderForm.performCancel();
+ }
+ });
+
// jaxx constructor don't call super() ?
financialStatementHeaderForm.setLocationRelativeTo(view);
financialStatementHeaderForm.setVisible(true);
@@ -117,9 +199,21 @@
FinancialStatement newFinancialStatementMovement =
new FinancialStatementImpl();
- FinancialStatementMovementForm financialStatementMovementForm =
+ final FinancialStatementMovementForm financialStatementMovementForm =
new FinancialStatementMovementForm(view);
financialStatementMovementForm.setFinancialStatement(newFinancialStatementMovement);
+
+ InputMap inputMap = financialStatementMovementForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = financialStatementMovementForm.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ financialStatementMovementForm.performCancel();
+ }
+ });
+
// jaxx constructor don't call super() ?
financialStatementMovementForm.setLocationRelativeTo(view);
financialStatementMovementForm.setVisible(true);
@@ -162,9 +256,20 @@
//test if selectedrow is account or ledger
log.debug(financialStatement.getHeader());
if (financialStatement.getHeader()) {
- FinancialStatementHeaderForm financialStatementHeaderForm =
+ final FinancialStatementHeaderForm financialStatementHeaderForm =
new FinancialStatementHeaderForm(view);
financialStatementHeaderForm.setFinancialStatement(financialStatement);
+
+ InputMap inputMap = financialStatementHeaderForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = financialStatementHeaderForm.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ financialStatementHeaderForm.performCancel();
+ }
+ });
// jaxx constructor don't call super() ?
financialStatementHeaderForm.setLocationRelativeTo(view);
financialStatementHeaderForm.setVisible(true);
@@ -173,9 +278,21 @@
}
// else is a movement
else {
- FinancialStatementMovementForm financialStatementMovementForm =
+ final FinancialStatementMovementForm financialStatementMovementForm =
new FinancialStatementMovementForm(view);
financialStatementMovementForm.setFinancialStatement(financialStatement);
+
+ InputMap inputMap = financialStatementMovementForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = financialStatementMovementForm.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ financialStatementMovementForm.performCancel();
+ }
+ });
+
// jaxx constructor don't call super() ?
financialStatementMovementForm.setLocationRelativeTo(view);
financialStatementMovementForm.setVisible(true);
@@ -226,8 +343,20 @@
}
public void importFinancialStatementChart() {
- FinancialStatementImportForm form =
+ final FinancialStatementImportForm form =
new FinancialStatementImportForm();
+
+ InputMap inputMap = form.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
+ ActionMap actionMap = form.getRootPane().getActionMap();
+ String binding = "dispose";
+ inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding);
+ actionMap.put(binding, new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ form.performCancel();
+ }
+ });
+
form.setLocationRelativeTo(view);
form.setVisible(true);
Copied: trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-header.png (from rev 3728, trunk/lima-swing/src/main/resources/icons/action-add-financial-transaction.png)
===================================================================
(Binary files differ)
Copied: trunk/lima-swing/src/main/resources/icons/action-financialstatement-add-movement.png (from rev 3728, trunk/lima-swing/src/main/resources/icons/action-add-entry.png)
===================================================================
(Binary files differ)
Added: trunk/lima-swing/src/main/resources/icons/action-financialstatement-check.png
===================================================================
(Binary files differ)
Property changes on: trunk/lima-swing/src/main/resources/icons/action-financialstatement-check.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Copied: trunk/lima-swing/src/main/resources/icons/action-financialstatement-edit.png (from rev 3728, trunk/lima-swing/src/main/resources/icons/action-account-edit.png)
===================================================================
(Binary files differ)
Copied: trunk/lima-swing/src/main/resources/icons/action-financialstatement-import.png (from rev 3728, trunk/lima-swing/src/main/resources/icons/action-account-import.png)
===================================================================
(Binary files differ)
Copied: trunk/lima-swing/src/main/resources/icons/action-financialstatement-remove.png (from rev 3728, trunk/lima-swing/src/main/resources/icons/action-account-remove.png)
===================================================================
(Binary files differ)
1
0