August 2012 - Lima-commits - mailman.cloud.codelutin.com

r3582 - trunk/lima-callao
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:43:20 +0200 (Wed, 08 Aug 2012) New Revision: 3582 Url: http://chorem.org/repositories/revision/lima/3582 Log: optimize dependencies Modified: trunk/lima-callao/pom.xml Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 14:21:22 UTC (rev 3581) +++ trunk/lima-callao/pom.xml 2012-08-08 14:43:20 UTC (rev 3582) @@ -27,7 +27,13 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency>

1 0

r3581 - trunk/lima-swing/src/main/java/org/chorem/lima/ui
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:21:22 +0200 (Wed, 08 Aug 2012) New Revision: 3581 Url: http://chorem.org/repositories/revision/lima/3581 Log: do not use variable for constant + add missing directory Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 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 2012-08-08 14:20:55 UTC (rev 3580) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-08-08 14:21:22 UTC (rev 3581) @@ -188,8 +188,7 @@ ConfigUIHelper helper = new ConfigUIHelper(config); - LimaConfig.Option colorSelectionFocus = LimaConfig.Option.COLOR_SELECTION_FOCUS; - helper.registerCallBack(colorSelectionFocus.key, _("lima.config.colorselectionfocus"), new ImageIcon(), new Runnable() { + helper.registerCallBack(LimaConfig.Option.COLOR_SELECTION_FOCUS.key, _("lima.config.colorselectionfocus"), new ImageIcon(), new Runnable() { @Override public void run() { UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource(new LineBorder(config.getColorSelectionFocus(), 2))); @@ -209,8 +208,8 @@ /*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(colorSelectionFocus); - helper.setOptionCallBack(colorSelectionFocus.key); + helper.addOption(LimaConfig.Option.COLOR_SELECTION_FOCUS); + helper.setOptionCallBack(LimaConfig.Option.COLOR_SELECTION_FOCUS.key); helper.buildUI(context, _("lima.config.category.directories")); helper.displayUI(ui, false);

1 0

r3580 - trunk/lima-swing/src/main/java/org/chorem/lima
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:20:55 +0200 (Wed, 08 Aug 2012) New Revision: 3580 Url: http://chorem.org/repositories/revision/lima/3580 Log: do not translate i18n option keys Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-08-08 14:20:17 UTC (rev 3579) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-08-08 14:20:55 UTC (rev 3580) @@ -106,9 +106,7 @@ public LimaConfig() { // set defaut option (included configuration file name : important) - for (Option o : Option.values()) { - setDefaultOption(o.key, o.defaultValue); - } + loadDefaultOptions(Option.values()); // set action alias for (Action a : Action.values()) { @@ -140,7 +138,7 @@ instance.setConfigFileName(configFileName); try { - instance.parse(new String[0]); + instance.parse(); } catch (ArgumentsParserException ex) { if (log.isErrorEnabled()) { log.error("Can't read configuration", ex); @@ -428,8 +426,8 @@ 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", _("lima.config.colorselectionfocus"), "#000000", Color.class, false, false), - COMPORTMENT_EDITING_CELL("lima.ui.table.cell.comportmentEditingCell", _("lima.config.comportmenteditingcell"), "ALL", comportmentEditingCellEnum.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); public enum comportmentEditingCellEnum {ALL, NOTHING}

1 0

r3579 - trunk/src/site
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:20:17 +0200 (Wed, 08 Aug 2012) New Revision: 3579 Url: http://chorem.org/repositories/revision/lima/3579 Log: site configuration 2 Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-08 14:19:59 UTC (rev 3578) +++ trunk/src/site/site_fr.xml 2012-08-08 14:20:17 UTC (rev 3579) @@ -26,39 +26,91 @@ <project name="Lima"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> - <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" img="${project.url}/images/jaxx-logo.png"/> - </poweredBy> - - <body> - <menu name="Le projet" inherit="top"> - <item name="Présentation" href="presentation.html"/> - <item name="Fonctionnalités" href="features.html"/> - <item name="Lancer Lima en ligne" href="lima-swing/jnlp/launch.jnlp" /> - <item name="Téléchargements" href="http://www.chorem.org/projects/lima/files" /> - <item name="Contacts" href="contact.html" /> - <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> - </menu> - <menu name="Mode d'emploi" inherit="top" > - <item name="Installer et lancer" href="install.html" /> - <item name="Créer sa comptabilité" href="assistant.html" /> - <item name="Saisie d'écritures" href="saisie.html" /> - <item name="Rapports" href="rapports.html" /> - <item name="Import / Export" href="importexport.html" /> - <item name="Lexique comptable" href="lexique.html" /> - </menu> - <menu name="Développeur" inherit="top" > - <item name="Mode serveur" href="devel/server.html" /> - </menu> - <menu ref="reports"/> - </body> - + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>false</topBarEnabled> + <googleSearch/> + <sideBarEnabled>true</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" + img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" + img="http://maven-site.nuiton.org/jrst/images/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx" + img="${project.url}/images/jaxx-logo.png"/> + </poweredBy> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <menu name="Le projet" inherit="top"> + <item name="Présentation" href="presentation.html"/> + <item name="Fonctionnalités" href="features.html"/> + <item name="Lancer Lima en ligne" href="lima-swing/jnlp/launch.jnlp"/> + <item name="Téléchargements" + href="http://www.chorem.org/projects/lima/files"/> + <item name="Contacts" href="contact.html"/> + <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> + </menu> + <menu name="Mode d'emploi" inherit="top"> + <item name="Installer et lancer" href="install.html"/> + <item name="Créer sa comptabilité" href="assistant.html"/> + <item name="Saisie d'écritures" href="saisie.html"/> + <item name="Rapports" href="rapports.html"/> + <item name="Import / Export" href="importexport.html"/> + <item name="Lexique comptable" href="lexique.html"/> + </menu> + <menu name="Développeur" inherit="top"> + <item name="Mode serveur" href="devel/server.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + </project>

1 0

r3578 - trunk/lima-swing
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:19:59 +0200 (Wed, 08 Aug 2012) New Revision: 3578 Url: http://chorem.org/repositories/revision/lima/3578 Log: site configuration 2 Modified: trunk/lima-swing/pom.xml Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) +++ trunk/lima-swing/pom.xml 2012-08-08 14:19:59 UTC (rev 3578) @@ -469,6 +469,42 @@ </plugins> </build> </profile> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> </profiles> </project>

1 0

r3577 - in trunk: . lima-business lima-business/src lima-business/src/site lima-business-api lima-business-api/src lima-business-api/src/site lima-callao lima-callao/src lima-callao/src/site lima-swing/src/site
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 16:19:31 +0200 (Wed, 08 Aug 2012) New Revision: 3577 Url: http://chorem.org/repositories/revision/lima/3577 Log: back to jaxx snapshot + improve generaited site configuration (why modules have no site ? :() Added: trunk/lima-business-api/src/site/ trunk/lima-business-api/src/site/site_fr.xml trunk/lima-business/src/site/ trunk/lima-business/src/site/site_fr.xml trunk/lima-callao/src/site/ trunk/lima-callao/src/site/site_fr.xml trunk/lima-swing/src/site/site_fr.xml Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/lima-business/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -198,5 +198,42 @@ </plugins> </build> </profile> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> + </profiles> </project> Added: trunk/lima-business/src/site/site_fr.xml =================================================================== --- trunk/lima-business/src/site/site_fr.xml (rev 0) +++ trunk/lima-business/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-business/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/lima-business-api/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -34,17 +34,46 @@ <name>Lima :: business API</name> <description>Business API module for lima</description> - <properties> - </properties> -    - <build> - </build> + <profiles> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <profiles> + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> </profiles> </project> Added: trunk/lima-business-api/src/site/site_fr.xml =================================================================== --- trunk/lima-business-api/src/site/site_fr.xml (rev 0) +++ trunk/lima-business-api/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-business-api/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/lima-callao/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -117,4 +117,44 @@ </plugins> </build> + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> + </project> Added: trunk/lima-callao/src/site/site_fr.xml =================================================================== --- trunk/lima-callao/src/site/site_fr.xml (rev 0) +++ trunk/lima-callao/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-callao/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/lima-swing/src/site/site_fr.xml =================================================================== --- trunk/lima-swing/src/site/site_fr.xml (rev 0) +++ trunk/lima-swing/src/site/site_fr.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <head> + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="http://maven-site.chorem.org/public/css/maven-site-chorem.org.css"/> + </head> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/lima-swing/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-08 13:55:42 UTC (rev 3576) +++ trunk/pom.xml 2012-08-08 14:19:31 UTC (rev 3577) @@ -359,7 +359,7 @@ <nuitonUtilsVersion>2.5.3-SNAPSHOT</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> - <jaxxVersion>2.5.3</jaxxVersion> + <jaxxVersion>2.5.4-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion> @@ -466,4 +466,43 @@ </releases> </pluginRepository> </pluginRepositories> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + + </profile> + + </profiles> </project>

1 0

r3576 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/resources
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 15:55:42 +0200 (Wed, 08 Aug 2012) New Revision: 3576 Url: http://chorem.org/repositories/revision/lima/3576 Log: refs #747 Correction conernant le probleme de format sur les BigDecimal, pour le montant recherche. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 13:37:46 UTC (rev 3575) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 13:55:42 UTC (rev 3576) @@ -26,12 +26,16 @@ package org.chorem.lima.entity; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; import org.hibernate.HibernateException; import org.nuiton.topia.TopiaException; import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.ParsePosition; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -47,6 +51,8 @@ */ public class FinancialTransactionDAOImpl<E extends FinancialTransaction> extends FinancialTransactionDAOAbstract<FinancialTransaction> { + private static final Log log = LogFactory.getLog(FinancialTransactionDAOImpl.class); + /** * FIXME echatellier, remove this method when implemented in topia * just overriden to use merge() instead of saveOrUpdate() @@ -274,7 +280,7 @@ List<Account> accounts) throws TopiaException { String query = "SELECT T FROM " + FinancialTransaction.class.getName() + " T"+ " LEFT JOIN T.entry AS E" + - " WHERE TRUE "; // to not manage first where in all condition + " WHERE 1=1 "; // to not manage first where in all condition List<Object> args = new ArrayList<Object>(); @@ -320,7 +326,7 @@ // accounts Account account = financialTransactionSearch.getAccount(); - String accountsList = financialTransactionSearch.getAccountList(); + //String accountsList = financialTransactionSearch.getAccountList(); if (account != null) { query += " AND E.account = :account"; args.add("account"); @@ -353,18 +359,26 @@ String operator = financialTransactionSearch.getOperator(); FinancialStatementWayEnum fStWayEnum = financialTransactionSearch.getAmountWayEnum(); if (amount != null) { + DecimalFormat decimalFormat = new DecimalFormat(); + BigDecimal amountBigDecimal = new BigDecimal(decimalFormat.parse(amount, new ParsePosition(0)).toString()); + if (log.isDebugEnabled()) { + log.debug("Value of first amount : " + amount); + log.debug("Value of first amount - BigDecimal : " + amountBigDecimal); + } if (amount2 != null) { - BigDecimal value1 = new BigDecimal(amount); - BigDecimal value2 = new BigDecimal(amount2); + BigDecimal secondAmountBigDecimal = new BigDecimal(decimalFormat.parse(amount2, new ParsePosition(0)).toString()); + if (log.isDebugEnabled()) { + log.debug("Value of second amount : " + secondAmountBigDecimal); + } query += " AND :amount <= E.amount AND E.amount <= :amount2"; args.add("amount"); - args.add(amount); + args.add(amountBigDecimal); args.add("amount2"); - args.add(amount2); + args.add(secondAmountBigDecimal); } else if (operator != null) { query += " AND E.amount " + operator + " :amount"; args.add("amount"); - args.add(amount); + args.add(amountBigDecimal); } switch (fStWayEnum) { case CREDIT: Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-08 13:37:46 UTC (rev 3575) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-08 13:55:42 UTC (rev 3576) @@ -49,4 +49,5 @@ log4j.logger.org.chorem.lima.business.ui.celleditor.BigDecimalTableCellEditor=DEBUG log4j.logger.org.chorem.lima.business.ui.financialtransaction.FinancialTransactionTableModel=DEBUG log4j.logger.org.chorem.lima.entity.EntryDAOImpl=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG +log4j.logger.org.chorem.lima.entity.FinancialTransactionDAOImpl=DEBUG \ No newline at end of file

1 0

r3575 - in trunk: . lima-business lima-business-api lima-callao lima-swing
by echatellier＠users.chorem.org 08 Aug '12

08 Aug '12

Author: echatellier Date: 2012-08-08 15:37:46 +0200 (Wed, 08 Aug 2012) New Revision: 3575 Url: http://chorem.org/repositories/revision/lima/3575 Log: Set version to alpha for release Modified: trunk/lima-business-api/pom.xml trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-business/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-business-api/pom.xml =================================================================== --- trunk/lima-business-api/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-business-api/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-callao/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/lima-swing/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) +++ trunk/pom.xml 2012-08-08 13:37:46 UTC (rev 3575) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6-alpha-1-SNAPSHOT</version> <modules> <module>lima-callao</module>

1 0

r3574 - in trunk: lima-business/src/main/resources/i18n lima-callao lima-callao/src/main/java/org/chorem/lima lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch lima-swing/src/main/resources/i18n
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 15:04:04 +0200 (Wed, 08 Aug 2012) New Revision: 3574 Url: http://chorem.org/repositories/revision/lima/3574 Log: fixes #745 Apres modification du fichier pom de lima-callao, afin de prendre en compte le plugin i18n, les valeurs s'affichent correctement. Added: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java Removed: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -100,3 +100,4 @@ lima.config.rulesnationality.description=Rules Nationality lima.config.scale.description=Scale lima.config.serveraddress.description=Server Address +lima.ui.lettering.accountRegularization= Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -100,3 +100,4 @@ lima.config.rulesnationality.description=Règles nationales lima.config.scale.description=Précision lima.config.serveraddress.description=Addresse serveur +lima.ui.lettering.accountRegularization= Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-callao/pom.xml 2012-08-08 13:04:04 UTC (rev 3574) @@ -102,6 +102,18 @@ </dependency> </dependencies> </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -1,68 +0,0 @@ -/* - * #%L - * Lima callao - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima; - -import static org.nuiton.i18n.I18n._; - -public enum FinancialStatementWayEnum { - - BOTH(_("lima.enum.comboboxamount.both")), - DEBIT(_("lima.enum.comboboxamount.debit")), - CREDIT(_("lima.enum.comboboxamount.credit")); - - private final String description; - - FinancialStatementWayEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } - - public static String[] descriptions(){ - int nbElts = FinancialStatementWayEnum.values().length; - String[] descriptions = new String[nbElts]; - FinancialStatementWayEnum[] enums = FinancialStatementWayEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; - } - - public static FinancialStatementWayEnum valueOfDescription(String description){ - FinancialStatementWayEnum value = null; - - for (FinancialStatementWayEnum enums : FinancialStatementWayEnum.values()) { - if (description.equals(enums.description)){ - value = enums; - break; - } - } - return value; - } - -} Added: trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -0,0 +1,68 @@ +/* + * #%L + * Lima callao + * + * $Id: FinancialStatementWayEnum.java 3289 2011-09-17 12:55:16Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/lima/trunk/lima-callao/src/main/java/org/chorem/l… $ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package org.chorem.lima; + +import static org.nuiton.i18n.I18n._; + +public enum FinancialStatementWayEnum { + + BOTH(_("lima.enum.comboboxamount.both")), + DEBIT(_("lima.enum.comboboxamount.debit")), + CREDIT(_("lima.enum.comboboxamount.credit")); + + private final String description; + + FinancialStatementWayEnum(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } + + public static String[] descriptions(){ + int nbElts = FinancialStatementWayEnum.values().length; + String[] descriptions = new String[nbElts]; + FinancialStatementWayEnum[] enums = FinancialStatementWayEnum.values(); + for (int i = 0; i < nbElts; i++) { + descriptions[i] = enums[i].getDescription(); + } + return descriptions; + } + + public static FinancialStatementWayEnum valueOfDescription(String description){ + FinancialStatementWayEnum value = null; + + for (FinancialStatementWayEnum enums : FinancialStatementWayEnum.values()) { + if (description.equals(enums.description)){ + value = enums; + break; + } + } + return value; + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2012-08-08 13:04:04 UTC (rev 3574) @@ -28,10 +28,10 @@ onWindowClosing="performCancel();"> <import> - javax.swing.text.Document - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.entity.FinancialStatement - org.chorem.lima.entity.FinancialStatementImpl + javax.swing.text.Document + org.chorem.lima.FinancialStatementWayEnum + org.chorem.lima.entity.FinancialStatement + org.chorem.lima.entity.FinancialStatementImpl </import> <FinancialStatement id="financialStatement" javaBean='null'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2012-08-08 13:04:04 UTC (rev 3574) @@ -25,17 +25,17 @@ <Table> <import> - java.awt.Dimension - javax.swing.ListSelectionModel - javax.swing.text.Document - org.chorem.lima.enums.ComboBoxPeriodEnum - org.chorem.lima.enums.ComboBoxAccountsEnum - org.chorem.lima.enums.ComboBoxEntryBooksEnum - org.chorem.lima.enums.ComboBoxLetterEnum - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.enums.ComboBoxOperatorsEnum - org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel - org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTable + java.awt.Dimension + javax.swing.ListSelectionModel + javax.swing.text.Document + org.chorem.lima.enums.ComboBoxPeriodEnum + org.chorem.lima.enums.ComboBoxAccountsEnum + org.chorem.lima.enums.ComboBoxEntryBooksEnum + org.chorem.lima.enums.ComboBoxLetterEnum + org.chorem.lima.FinancialStatementWayEnum + org.chorem.lima.enums.ComboBoxOperatorsEnum + org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel + org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTable </import> <FinancialTransactionSearchViewHandler id="handler" javaBean="new FinancialTransactionSearchViewHandler(this)"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-08 13:04:04 UTC (rev 3574) @@ -37,7 +37,6 @@ import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; import org.chorem.lima.beans.FinancialTransactionSearchImpl; -import org.chorem.lima.business.LimaException; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -67,8 +66,6 @@ protected FinancialTransactionSearchTableModel tableModel; - protected FiscalPeriodComboBoxModel comboBoxModel; - /** Transaction service. */ protected final FinancialTransactionService financialTransactionService; 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 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -104,6 +104,9 @@ lima.enum.comboboxaccount.account=Account lima.enum.comboboxaccount.accountlist=Account list lima.enum.comboboxaccount.allaccount=All accounts +lima.enum.comboboxamount.both=All +lima.enum.comboboxamount.credit=Credit +lima.enum.comboboxamount.debit=Debit lima.enum.comboboxentrybook.all=All entrybooks lima.enum.comboboxentrybook.select_one=EntryBook lima.enum.comboboxletter.all=All letters 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 2012-08-08 10:12:31 UTC (rev 3573) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-08-08 13:04:04 UTC (rev 3574) @@ -104,6 +104,9 @@ lima.enum.comboboxaccount.account=Compte lima.enum.comboboxaccount.accountlist=Liste de comptes lima.enum.comboboxaccount.allaccount=Tous les comptes +lima.enum.comboboxamount.both=Tous +lima.enum.comboboxamount.credit=Crédit +lima.enum.comboboxamount.debit=Débit lima.enum.comboboxentrybook.all=Tous les journaux lima.enum.comboboxentrybook.select_one=Journal lima.enum.comboboxletter.all=Toutes les lettres

1 0

r3573 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 12:12:31 +0200 (Wed, 08 Aug 2012) New Revision: 3573 Url: http://chorem.org/repositories/revision/lima/3573 Log: refs #705 Correction sur l editeur, concernant la gestion de la virgule. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-07 16:58:51 UTC (rev 3572) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-08 10:12:31 UTC (rev 3573) @@ -30,13 +30,18 @@ import javax.swing.DefaultCellEditor; import javax.swing.JTextField; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; +import java.text.ParsePosition; /** * @author sletellier <letellier(a)codelutin.com> @@ -45,12 +50,30 @@ public class BigDecimalTableCellEditor extends DefaultCellEditor { protected int row; + protected String comma = ""; private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); public BigDecimalTableCellEditor() { super(new JTextField()); setClickCountToStart(1); + getComponent().setHorizontalAlignment(SwingConstants.RIGHT); + getComponent().addKeyListener(new KeyListener() { + @Override + public void keyTyped(KeyEvent e) { + // nothing to do + } + + @Override + public void keyPressed(KeyEvent e) { + // nothing to do + } + + @Override + public void keyReleased(KeyEvent e) { + limitComma(e); + } + }); getComponent().addFocusListener(new FocusListener() { @Override @@ -87,6 +110,9 @@ return (JTextField) super.getComponent(); } + /** + * Two kinds of edition, with LimaConfig value + * */ public void runEdition() { String comportmentEditingCell = LimaConfig.getInstance().getComportmentEditingCell(); if (comportmentEditingCell.equals("ALL")) { @@ -97,17 +123,36 @@ } } + /** + * Round the value to higher, and the number of decimal to 2; + * Parse string value to BigDecimal when it contains comma + * @return bigDecimal value + * */ @Override public BigDecimal getCellEditorValue() { String editorStringValue = super.getCellEditorValue().toString(); if (StringUtils.isBlank(editorStringValue)) { editorStringValue = "0"; } - BigDecimal cellEditorValue = (BigDecimal.valueOf(Double.valueOf(editorStringValue))); + BigDecimal cellEditorValue; + DecimalFormat decimalFormat = new DecimalFormat(); + cellEditorValue = new BigDecimal(decimalFormat.parse(editorStringValue,new ParsePosition(0)).doubleValue()); if (super.getCellEditorValue() != BigDecimal.ZERO) { return cellEditorValue.setScale(2, RoundingMode.HALF_UP); } return cellEditorValue; } + /** + * Limit number of comma to one + * @param e keyEvent starting control of comma + * */ + protected void limitComma(KeyEvent e) { + if ( (String.valueOf(e.getKeyChar()).equals(",") && comma.equals(","))) { + getComponent().setText(getComponent().getText().substring(0, getComponent().getText().length()-1)); + } else if (String.valueOf(e.getKeyChar()).equals(",") && !comma.equals(",")) { + comma = ","; + } + } + }

1 0