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

r3068 - trunk
by tchemit＠users.chorem.org 27 Jan '11

27 Jan '11

Author: tchemit Date: 2011-01-27 10:31:34 +0100 (Thu, 27 Jan 2011) New Revision: 3068 Url: http://chorem.org/repositories/revision/lima/3068 Log: Update mavenpom4redmine to 2.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-17 15:00:16 UTC (rev 3067) +++ trunk/pom.xml 2011-01-27 09:31:34 UTC (rev 3068) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> + <version>2.4.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3067 - trunk/lima-swing/src/main/assembly
by echatellier＠users.chorem.org 17 Dec '10

17 Dec '10

Author: echatellier Date: 2010-12-17 16:00:16 +0100 (Fri, 17 Dec 2010) New Revision: 3067 Url: http://chorem.org/repositories/revision/lima/3067 Log: Rename script from go.sh to lima Added: trunk/lima-swing/src/main/assembly/lima Modified: trunk/lima-swing/src/main/assembly/bin.xml Modified: trunk/lima-swing/src/main/assembly/bin.xml =================================================================== --- trunk/lima-swing/src/main/assembly/bin.xml 2010-12-09 13:58:19 UTC (rev 3066) +++ trunk/lima-swing/src/main/assembly/bin.xml 2010-12-17 15:00:16 UTC (rev 3067) @@ -51,7 +51,7 @@ <source>src/main/assembly/lima.exe</source> </file> <file> - <source>src/main/assembly/go.sh</source> + <source>src/main/assembly/lima</source> <fileMode>0755</fileMode> </file> </files> Copied: trunk/lima-swing/src/main/assembly/lima (from rev 3066, trunk/lima-swing/src/main/assembly/go.sh) =================================================================== --- trunk/lima-swing/src/main/assembly/lima (rev 0) +++ trunk/lima-swing/src/main/assembly/lima 2010-12-17 15:00:16 UTC (rev 3067) @@ -0,0 +1,34 @@ +### +# #%L +# Lima Swing +# +# $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% +### +#!/bin/sh +MX=512M +cd `dirname $0` +if [ -n "$JAVA_HOME" ]; then + $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar ./lima.jar $* +else + java -Xmx$MX -Xms$MX -jar ./lima.jar $* +fi +cd "$OLDPWD" +

1 0

r3066 - trunk/lima-swing/src/main/assembly
by echatellier＠users.chorem.org 09 Dec '10

09 Dec '10

Author: echatellier Date: 2010-12-09 14:58:19 +0100 (Thu, 09 Dec 2010) New Revision: 3066 Url: http://chorem.org/repositories/revision/lima/3066 Log: Fix go script Modified: trunk/lima-swing/src/main/assembly/go.sh Modified: trunk/lima-swing/src/main/assembly/go.sh =================================================================== --- trunk/lima-swing/src/main/assembly/go.sh 2010-12-04 21:51:33 UTC (rev 3065) +++ trunk/lima-swing/src/main/assembly/go.sh 2010-12-09 13:58:19 UTC (rev 3066) @@ -23,6 +23,12 @@ # #L% ### #!/bin/sh +MX=512M +cd `dirname $0` +if [ -n "$JAVA_HOME" ]; then + $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -jar ./lima.jar $* +else + java -Xmx$MX -Xms$MX -jar ./lima.jar $* +fi +cd "$OLDPWD" -MX=512M -java -Xmx$MX -Xms$MX -jar lima.jar "$@" \ No newline at end of file

1 0

r3065 - trunk/lima-swing/src/main/java/org/chorem/lima
by jpepin＠users.chorem.org 04 Dec '10

04 Dec '10

Author: jpepin Date: 2010-12-04 22:51:33 +0100 (Sat, 04 Dec 2010) New Revision: 3065 Url: http://chorem.org/repositories/revision/lima/3065 Log: fix lima splash bug on main if first run Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-12-04 21:01:22 UTC (rev 3064) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-12-04 21:51:33 UTC (rev 3065) @@ -198,8 +198,9 @@ openingView.setSize(800, 400); openingView.setLocationRelativeTo(null); openingView.setVisible(true); + }else { + splash.updateProgression(1, _("lima.splash.3")); } - splash.updateProgression(1, _("lima.splash.3")); // show ui SwingUtilities.invokeLater(new Runnable() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-12-04 21:01:22 UTC (rev 3064) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-12-04 21:51:33 UTC (rev 3065) @@ -127,9 +127,7 @@ splashGraphics.setFont(font); splashGraphics.drawString(message + "...", 65, 249); } - if (splash != null ){ - splash.update(); - } + splash.update(); } }

1 0

r3064 - in trunk/lima-swing/src/main: java/org/chorem/lima java/org/chorem/lima/ui/financialtransaction java/org/chorem/lima/ui/financialtransactionunbalanced java/org/chorem/lima/ui/importexport resources/i18n
by jpepin＠users.chorem.org 04 Dec '10

04 Dec '10

Author: jpepin Date: 2010-12-04 22:01:22 +0100 (Sat, 04 Dec 2010) New Revision: 3064 Url: http://chorem.org/repositories/revision/lima/3064 Log: - fix splash bug on lima first run - fix bigdecimal bug on tablemodel (new bug from 0.4.1 >) - fix importexport message dialog Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -127,8 +127,9 @@ splashGraphics.setFont(font); splashGraphics.drawString(message + "...", 65, 249); } - - splash.update(); + if (splash != null ){ + splash.update(); + } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -169,10 +169,10 @@ result = Letter.class; break; case 6: - result = BigDecimal.class; + result = Double.class; break; case 7: - result = BigDecimal.class; + result = Double.class; break; case 8: result = BigDecimal.class; @@ -510,11 +510,13 @@ currentEntry.setLetter((Letter)value); break; case 6: - currentEntry.setAmount((BigDecimal)value); + //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName + // qui ne fonctionne plus avec les BigDecimal + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount((BigDecimal)value); + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(false); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -175,10 +175,10 @@ result = String.class; break; case 5: - result = BigDecimal.class; + result = Double.class; break; case 6: - result = BigDecimal.class; + result = Double.class; break; case 7: result = BigDecimal.class; @@ -432,11 +432,13 @@ currentEntry.setDescription((String)value); break; case 5 : - currentEntry.setAmount((BigDecimal)value); + //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName + // qui ne fonctionne plus avec les BigDecimal + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(true); break; case 6: - currentEntry.setAmount((BigDecimal)value); + currentEntry.setAmount(new BigDecimal((Double)value)); currentEntry.setDebit(false); break; case 8: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-12-04 21:01:22 UTC (rev 3064) @@ -115,6 +115,7 @@ final EncodingEnum charset = encodingEnum; final String filePath = file; final Boolean verboseMode = verbose; + final Boolean importMode = importExportMethode.getImportMode(); new SwingWorker<String,Void>() { @Override protected String doInBackground() throws LimaException { String datas = ""; @@ -186,7 +187,12 @@ DialogHelper.showReportDialog(result, _("lima.importexport.import"), viewComponent); } else { - DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); + if (importMode){ + DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); + } + else { + DialogHelper.showMessageDialog(_("lima.importexport.export.terminated")); + } } } } catch (InterruptedException eee) { 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 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-12-04 21:01:22 UTC (rev 3064) @@ -165,6 +165,7 @@ lima.importexport.ebp=Import/Export EBP lima.importexport.entries=Entries lima.importexport.export=Export +lima.importexport.export.terminated=Export terminated lima.importexport.financialstatements=FinancialStatements chart lima.importexport.import=Import lima.importexport.import.terminated=Import terminated 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 2010-12-01 09:50:28 UTC (rev 3063) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-12-04 21:01:22 UTC (rev 3064) @@ -165,6 +165,7 @@ lima.importexport.ebp=Import/Export EBP lima.importexport.entries=\u00C9critures lima.importexport.export=Export +lima.importexport.export.terminated=Export termin\u00E9 lima.importexport.financialstatements=Plan BCR lima.importexport.import=Import lima.importexport.import.terminated=Import termin\u00E9

1 0

r3063 - in trunk: . lima-business lima-callao lima-swing
by echatellier＠users.chorem.org 01 Dec '10

01 Dec '10

Author: echatellier Date: 2010-12-01 10:50:28 +0100 (Wed, 01 Dec 2010) New Revision: 3063 Url: http://chorem.org/repositories/revision/lima/3063 Log: [maven-release-plugin] prepare for next development iteration Modified: 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 2010-12-01 09:50:27 UTC (rev 3062) +++ trunk/lima-business/pom.xml 2010-12-01 09:50:28 UTC (rev 3063) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2</version> + <version>0.4.3-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2010-12-01 09:50:27 UTC (rev 3062) +++ trunk/lima-callao/pom.xml 2010-12-01 09:50:28 UTC (rev 3063) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2</version> + <version>0.4.3-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2010-12-01 09:50:27 UTC (rev 3062) +++ trunk/lima-swing/pom.xml 2010-12-01 09:50:28 UTC (rev 3063) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2</version> + <version>0.4.3-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-01 09:50:27 UTC (rev 3062) +++ trunk/pom.xml 2010-12-01 09:50:28 UTC (rev 3063) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2</version> + <version>0.4.3-SNAPSHOT</version> <modules> <module>lima-callao</module> @@ -331,10 +331,10 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.2</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.2 + <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.4.2</url> + <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm> <repositories>

1 0

r3062 - in tags: . lima-0.4.2
by echatellier＠users.chorem.org 01 Dec '10

01 Dec '10

Author: echatellier Date: 2010-12-01 10:50:27 +0100 (Wed, 01 Dec 2010) New Revision: 3062 Url: http://chorem.org/repositories/revision/lima/3062 Log: [maven-release-plugin] copy for tag lima-0.4.2 Added: tags/lima-0.4.2/ Property changes on: tags/lima-0.4.2 ___________________________________________________________________ Added: svn:ignore + *.log target bin .classpath .project *.ipr *.iws *.iml Added: svn:mergeinfo +

1 0

r3061 - in trunk: . lima-business lima-callao lima-swing
by echatellier＠users.chorem.org 01 Dec '10

01 Dec '10

Author: echatellier Date: 2010-12-01 10:50:24 +0100 (Wed, 01 Dec 2010) New Revision: 3061 Url: http://chorem.org/repositories/revision/lima/3061 Log: [maven-release-plugin] prepare release lima-0.4.2 Modified: 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 2010-12-01 09:39:53 UTC (rev 3060) +++ trunk/lima-business/pom.xml 2010-12-01 09:50:24 UTC (rev 3061) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2-SNAPSHOT</version> + <version>0.4.2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2010-12-01 09:39:53 UTC (rev 3060) +++ trunk/lima-callao/pom.xml 2010-12-01 09:50:24 UTC (rev 3061) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2-SNAPSHOT</version> + <version>0.4.2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2010-12-01 09:39:53 UTC (rev 3060) +++ trunk/lima-swing/pom.xml 2010-12-01 09:50:24 UTC (rev 3061) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2-SNAPSHOT</version> + <version>0.4.2</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-01 09:39:53 UTC (rev 3060) +++ trunk/pom.xml 2010-12-01 09:50:24 UTC (rev 3061) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.2-SNAPSHOT</version> + <version>0.4.2</version> <modules> <module>lima-callao</module> @@ -331,10 +331,10 @@   <scm> - <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk + <connection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.2</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/tags/lima-0.4.2 </developerConnection> - <url>http://www.chorem.org/repositories/browse/lima/trunk</url> + <url>http://www.chorem.org/repositories/browse/lima/tags/lima-0.4.2</url> </scm> <repositories>

1 0

r3060 - trunk/src/site
by echatellier＠users.chorem.org 01 Dec '10

01 Dec '10

Author: echatellier Date: 2010-12-01 10:39:53 +0100 (Wed, 01 Dec 2010) New Revision: 3060 Url: http://chorem.org/repositories/revision/lima/3060 Log: Add powered by Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-12-01 09:28:32 UTC (rev 3059) +++ trunk/src/site/site_fr.xml 2010-12-01 09:39:53 UTC (rev 3060) @@ -35,6 +35,7 @@ <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>

1 0

r3059 - in trunk/lima-swing: . src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org 01 Dec '10

01 Dec '10

Author: echatellier Date: 2010-12-01 10:28:32 +0100 (Wed, 01 Dec 2010) New Revision: 3059 Url: http://chorem.org/repositories/revision/lima/3059 Log: Fix license file names Modified: trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2010-12-01 09:15:28 UTC (rev 3058) +++ trunk/lima-swing/pom.xml 2010-12-01 09:28:32 UTC (rev 3059) @@ -129,12 +129,8 @@ </redmine.releaseFiles> <license.generateBundle>true</license.generateBundle> - <license.bundleLicensePath> - META-INF/lima-main-LICENSE.txt - </license.bundleLicensePath> - <license.bundleThirdPartyPath> - META-INF/lima-main-THIRD-PARTY.txt - </license.bundleThirdPartyPath> + <license.bundleLicensePath>META-INF/lima-swing-LICENSE.txt</license.bundleLicensePath> + <license.bundleThirdPartyPath>META-INF/lima-swing-THIRD-PARTY.txt</license.bundleThirdPartyPath> </properties> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-12-01 09:15:28 UTC (rev 3058) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2010-12-01 09:28:32 UTC (rev 3059) @@ -201,19 +201,13 @@ public void showAbout(MainView ui) { - AboutPanel about = new AboutPanel()/* { - @Override - public void buildTopPanel() { - setIconPath("/icons/lima.png"); - super.buildTopPanel(); - } - }*/; + AboutPanel about = new AboutPanel(); about.setTitle(_("lima.title.about")); about.setAboutText(_("lima.title.about.description")); about.setBottomText(ui.getConfig().getCopyrightText()); about.setIconPath("/icons/lima.png"); - about.setLicenseFile("META-INF/lima-main-LICENSE.txt"); - about.setThirdpartyFile("META-INF/lima-main-THIRD-PARTY.txt"); + about.setLicenseFile("META-INF/lima-swing-LICENSE.txt"); + about.setThirdpartyFile("META-INF/lima-swing-THIRD-PARTY.txt"); about.init(); about.showInDialog(ui, true); } @@ -296,13 +290,11 @@ AccountView accountView = new AccountView(mainView); mainView.showTab(_("lima.charts.account"), accountView); } + /** * Show account tree table view to create or modify accounts * @param rootContext */ - - - public void showEntryBookView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); EntryBookView entryBookView= new EntryBookView(mainView);

1 0