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

06 May '11

Author: vsalaun Date: 2011-05-06 18:08:00 +0200 (Fri, 06 May 2011) New Revision: 3103 Url: http://chorem.org/repositories/revision/lima/3103 Log: #364 remplacement des toutes les occurences de double utilisees dans les calculs par des BigDecimal Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -422,7 +422,7 @@ c.setHorizontalAlignment(Element.ALIGN_LEFT); t.addCell(c); //cell2 - if (grossAmount.doubleValue() != 0){ + if (grossAmount != BigDecimal.ZERO){ phrase = new Phrase(String.valueOf( grossAmount), normalFont); } @@ -431,7 +431,7 @@ } t.addCell(phrase); //cell 3 - if (provisionDeprecationAmount.doubleValue() != 0){ + if (provisionDeprecationAmount != BigDecimal.ZERO){ phrase = new Phrase(String.valueOf( provisionDeprecationAmount), normalFont); } @@ -442,7 +442,7 @@ //cell 4 BigDecimal solde = grossAmount; solde = solde.subtract(provisionDeprecationAmount); - if (solde.doubleValue() != 0){ + if (solde != BigDecimal.ZERO){ phrase = new Phrase(solde.toString(), normalFont); } else { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -246,7 +246,7 @@ entry.setAccount(account); BigDecimal debit = new BigDecimal(entryEBP.getDebit()); BigDecimal credit = new BigDecimal(entryEBP.getCredit()); - if (debit.doubleValue() == 0) { + if (debit == BigDecimal.ZERO) { entry.setDebit(false); entry.setAmount(credit); } else { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -146,7 +146,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -235,7 +235,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -308,7 +308,7 @@ solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } @@ -385,7 +385,7 @@ //solde = debit - credit; solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ reportsDatas.setSoldeDebit(true); } solde = solde.abs(); @@ -484,7 +484,8 @@ amount = new BigDecimal(0); } if (movementedFilter){ - if (reportsDatas.getAmountCredit().doubleValue() != 0 || reportsDatas.getAmountDebit().doubleValue() != 0){ + if (reportsDatas.getAmountCredit() != BigDecimal.ZERO + || reportsDatas.getAmountDebit() != BigDecimal.ZERO) { // add balance sheet to balance trial balanceTrial.addReportsDatas(reportsDatas); } @@ -505,7 +506,7 @@ //solde = debit - credit; solde = solde.add(debit); solde = solde.subtract(credit); - if (solde.doubleValue() > 0){ + if (solde.compareTo(BigDecimal.ZERO) == 1){ balanceTrial.setSoldeDebit(true); } solde = solde.abs(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -138,7 +138,7 @@ view.amountSoldeLabel.setText(amountSolde.toString()); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -151,7 +151,7 @@ String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -157,7 +157,7 @@ BigDecimal amountSolde = datasList.getAmountSolde(); view.amountSoldeLabel.setText(String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -173,7 +173,7 @@ } break; case 1: - if (grossAmount.doubleValue() == 0){ + if (grossAmount == BigDecimal.ZERO){ result = null; } else { @@ -181,7 +181,7 @@ } break; case 2: - if (provisionDeprecationAmount.doubleValue() == 0){ + if (provisionDeprecationAmount == BigDecimal.ZERO){ result = null; } else { @@ -190,7 +190,7 @@ break; case 3: BigDecimal solde = grossAmount.subtract(provisionDeprecationAmount); - if (solde.doubleValue() == 0){ + if (solde == BigDecimal.ZERO) { result = null; } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -131,7 +131,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } 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 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -169,10 +169,10 @@ result = Letter.class; break; case 6: - result = Double.class; + result = BigDecimal.class; break; case 7: - result = Double.class; + result = BigDecimal.class; break; case 8: result = BigDecimal.class; @@ -515,11 +515,11 @@ case 6: //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.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(false); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -118,7 +118,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -123,7 +123,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } } 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 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -175,10 +175,10 @@ result = String.class; break; case 5: - result = Double.class; + result = BigDecimal.class; break; case 6: - result = Double.class; + result = BigDecimal.class; break; case 7: result = BigDecimal.class; @@ -435,11 +435,11 @@ case 5 : //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.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(true); break; case 6: - currentEntry.setAmount(new BigDecimal((Double)value)); + currentEntry.setAmount(new BigDecimal((Long)value)); currentEntry.setDebit(false); break; case 8: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -172,7 +172,7 @@ view.amountSoldeLabel.setText( String.valueOf(amountSolde)); - if (amountSolde.doubleValue() == 0){ + if (amountSolde == BigDecimal.ZERO){ view.soldeLabel.setText(_("lima.common.solde")); } else { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-06 13:50:36 UTC (rev 3102) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-06 16:08:00 UTC (rev 3103) @@ -132,7 +132,7 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance.doubleValue() != 0) { + if (currentBalance != BigDecimal.ZERO) { isHighlighted = true; } }

1 0

r3102 - in trunk: . lima-business lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/migration
by vsalaun＠users.chorem.org 06 May '11

06 May '11

Author: vsalaun Date: 2011-05-06 15:50:36 +0200 (Fri, 06 May 2011) New Revision: 3102 Url: http://chorem.org/repositories/revision/lima/3102 Log: Changements dans la base de donnees Added: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java Modified: trunk/lima-business/pom.xml trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-05-06 08:30:13 UTC (rev 3101) +++ trunk/lima-business/pom.xml 2011-05-06 13:50:36 UTC (rev 3102) @@ -54,6 +54,10 @@ <artifactId>topia-persistence</artifactId> </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> 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 2011-05-06 08:30:13 UTC (rev 3101) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2011-05-06 13:50:36 UTC (rev 3102) @@ -30,7 +30,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.accountingrules.DefaultAccountingRules; +import org.chorem.lima.business.migration.DatabaseMigrationClass; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.nuiton.topia.migration.TopiaMigrationEngine; +import org.nuiton.topia.migration.TopiaMigrationService; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; @@ -60,6 +63,11 @@ for (Option o : Option.values()) { setDefaultOption(o.key, o.defaultValue); } + + setOption(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); + setOption(TopiaMigrationService.MIGRATION_CALLBACK, DatabaseMigrationClass.class.getName()); + setOption(TopiaMigrationService.MIGRATION_SHOW_SQL, Boolean.TRUE.toString()); + setOption(TopiaMigrationService.MIGRATION_SHOW_PROGRESSION, Boolean.TRUE.toString()); } public static LimaConfig getInstance() { Added: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2011-05-06 13:50:36 UTC (rev 3102) @@ -0,0 +1,51 @@ +package org.chorem.lima.business.migration; + +import java.util.List; + +import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersionResolver; +import org.nuiton.util.Version; + +public class DatabaseMigrationClass extends TopiaMigrationCallbackByClass { + + protected static final Version VERSION_0_5 = new Version("0.5"); + + + public DatabaseMigrationClass() { + super(new MigrationResolver()); + } + + protected static class MigrationResolver implements MigrationCallBackForVersionResolver { + + @Override + public Class<? extends MigrationCallBackForVersion> getCallBack(Version version) { + Class<? extends MigrationCallBackForVersion> result = null; + + if (version.equals(VERSION_0_5)) { + result = MigrationV0V0_5.class; + } + return result; + } + + } + + @Override + public Version[] getAvailableVersions() { + Version[] result = new Version[] { VERSION_0_5 }; + return result; + } + + @Override + public Version getApplicationVersion() { + Version appVersion = new Version(LimaCallaoDAOHelper.getModelVersion()); + return appVersion; + } + + @Override + public boolean askUser(Version dbVersion, List<Version> versions) { + return true; + } + + } Added: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2011-05-06 13:50:36 UTC (rev 3102) @@ -0,0 +1,24 @@ +package org.chorem.lima.business.migration; + +import java.util.List; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.util.Version; + +public class MigrationV0V0_5 extends MigrationCallBackForVersion { + + public MigrationV0V0_5(Version version, TopiaMigrationCallbackByClass callBack) { + super(version, callBack); + // TODO Auto-generated constructor stub + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, boolean showSql, boolean showProgression) + throws TopiaException { + queries.add("Alter table record alter AMOUNT clob;"); + } +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-06 08:30:13 UTC (rev 3101) +++ trunk/pom.xml 2011-05-06 13:50:36 UTC (rev 3102) @@ -81,6 +81,13 @@ </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>2.5.3</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.2.137</version>

1 0

r3101 - trunk/lima-business/src/main/assembly
by echatellier＠users.chorem.org 06 May '11

06 May '11

Author: echatellier Date: 2011-05-06 10:30:13 +0200 (Fri, 06 May 2011) New Revision: 3101 Url: http://chorem.org/repositories/revision/lima/3101 Log: Update xml definition Modified: trunk/lima-business/src/main/assembly/bin.xml Modified: trunk/lima-business/src/main/assembly/bin.xml =================================================================== --- trunk/lima-business/src/main/assembly/bin.xml 2011-05-05 16:36:35 UTC (rev 3100) +++ trunk/lima-business/src/main/assembly/bin.xml 2011-05-06 08:30:13 UTC (rev 3101) @@ -24,7 +24,9 @@ #L% --> -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> <id>bin</id> <formats> <format>zip</format>

1 0

r3100 - trunk/lima-swing/src/main/java/org/chorem/lima/service
by echatellier＠users.chorem.org 05 May '11

05 May '11

Author: echatellier Date: 2011-05-05 18:36:35 +0200 (Thu, 05 May 2011) New Revision: 3100 Url: http://chorem.org/repositories/revision/lima/3100 Log: Pesudo hack pour surcharger les options de logging par defaut de openejb Modified: trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2011-05-05 13:56:23 UTC (rev 3099) +++ trunk/lima-swing/src/main/java/org/chorem/lima/service/LimaServiceFactory.java 2011-05-05 16:36:35 UTC (rev 3100) @@ -25,13 +25,18 @@ package org.chorem.lima.service; +import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; +import java.util.HashMap; import java.util.Properties; -import java.util.HashMap; + import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; + +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.openejb.OpenEJB; @@ -63,6 +68,23 @@ // TODO EC-20100407 maybe put all options in LimaConfig and allow user to configure it (remove getFlatOptions use) Properties props = LimaMain.config.getFlatOptions(); + // transmission des options de logging a openejb + // sinon, il utilise son propre pattern interne + InputStream log4jFile = null; + try { + log4jFile = LimaServiceFactory.class.getResourceAsStream("/log4j.properties"); + Properties propsLog4j = new Properties(); + propsLog4j.load(log4jFile); + props.putAll(propsLog4j); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't find log4j properties file", ex); + } + } + finally { + IOUtils.closeQuietly(log4jFile); + } + // Context.INITIAL_CONTEXT_FACTORY is a mandatory option // containsKey() does'nt work :( if (!props.containsKey(Context.INITIAL_CONTEXT_FACTORY)) {

1 0

r3099 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: balance entrybooksreports financialstatementreport ledger
by vsalaun＠users.chorem.org 05 May '11

05 May '11

Author: vsalaun Date: 2011-05-05 15:56:23 +0200 (Thu, 05 May 2011) New Revision: 3099 Url: http://chorem.org/repositories/revision/lima/3099 Log: #315 Ajout d'un bouton pour generer les impressions de rapports Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -61,9 +61,12 @@ </cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="8"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -64,9 +64,12 @@ </cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="7"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -49,9 +49,12 @@ </row></Table></cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="7"> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2011-05-05 12:15:18 UTC (rev 3098) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2011-05-05 13:56:23 UTC (rev 3099) @@ -60,9 +60,12 @@ </cell> <cell> <EnumEditor id='DocumentEditor' - constructorParams='org.chorem.lima.business.utils.FormatsEnum.class' - onActionPerformed="getHandler().createDocument()"/> + constructorParams='org.chorem.lima.business.utils.FormatsEnum.class'/> </cell> + <cell> + <JButton text="lima.common.ok" + onActionPerformed="getHandler().createDocument()"/> + </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="8">

1 0

r3098 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: financialtransaction financialtransactionunbalanced
by vsalaun＠users.chorem.org 05 May '11

05 May '11

Author: vsalaun Date: 2011-05-05 14:15:18 +0200 (Thu, 05 May 2011) New Revision: 3098 Url: http://chorem.org/repositories/revision/lima/3098 Log: #264 Saisie automatique de la description lors de l'ajout d'une entr?\195?\169e d'une transaction 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/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 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 2011-05-04 11:22:24 UTC (rev 3097) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-05 12:15:18 UTC (rev 3098) @@ -409,11 +409,12 @@ /** * @throws LimaException */ - public void addEmptyEntry(Object value, int row) throws LimaException { + public void addEmptyEntry(Object value, String description, int row) throws LimaException { FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); entry.setAmount(new BigDecimal(0)); + entry.setDescription(description); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow; 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 2011-05-04 11:22:24 UTC (rev 3097) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2011-05-05 12:15:18 UTC (rev 3098) @@ -146,7 +146,9 @@ if (indexSelectedRow != -1) { Object selectedValue = tableModel.getElementAt(indexSelectedRow); try { - tableModel.addEmptyEntry(selectedValue, indexSelectedRow); + //copy + paste the description + String description = (String) tableModel.getValueAt(indexSelectedRow, 4); + tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); 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 2011-05-04 11:22:24 UTC (rev 3097) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-05 12:15:18 UTC (rev 3098) @@ -363,11 +363,12 @@ /** * @throws LimaException */ - public void addEmptyEntry(Object value, int row) throws LimaException { + public void addEmptyEntry(Object value, String description, int row) throws LimaException { FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); entry.setAmount(new BigDecimal(0)); + entry.setDescription(description); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2011-05-04 11:22:24 UTC (rev 3097) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2011-05-05 12:15:18 UTC (rev 3098) @@ -76,7 +76,9 @@ if (indexSelectedRow != -1) { Object selectedValue = tableModel.getElementAt(indexSelectedRow); try { - tableModel.addEmptyEntry(selectedValue, indexSelectedRow); + //copy + paste the description + String description = (String) tableModel.getValueAt(indexSelectedRow, 4); + tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel();

1 0

r3097 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by vsalaun＠users.chorem.org 04 May '11

04 May '11

Author: vsalaun Date: 2011-05-04 13:22:24 +0200 (Wed, 04 May 2011) New Revision: 3097 Url: http://chorem.org/repositories/revision/lima/3097 Log: Correction des accents Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 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 2011-05-04 09:47:02 UTC (rev 3096) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-04 11:22:24 UTC (rev 3097) @@ -58,8 +58,8 @@ /** * Basic transaction table model. * - * Le modele est filtr� sur {@link #selectedFinancialPeriod} et - * {@link #selectedFinancialPeriod} (mont�e en charge !). + * Le modele est filtré sur {@link #selectedFinancialPeriod} et + * {@link #selectedFinancialPeriod} (montée en charge !). * * @author ore * @author chatellier @@ -512,7 +512,7 @@ currentEntry.setLetter((Letter)value); break; case 6: - //FIXME jpepin 20101231 transtypage "superflu" pour �viter un bug de getColumnName + //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);

1 0

r3096 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by vsalaun＠users.chorem.org 04 May '11

04 May '11

Author: vsalaun Date: 2011-05-04 11:47:02 +0200 (Wed, 04 May 2011) New Revision: 3096 Url: http://chorem.org/repositories/revision/lima/3096 Log: Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 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 2011-05-02 10:24:47 UTC (rev 3095) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-04 09:47:02 UTC (rev 3096) @@ -58,8 +58,8 @@ /** * Basic transaction table model. * - * Le modele est filtré sur {@link #selectedFinancialPeriod} et - * {@link #selectedFinancialPeriod} (montée en charge !). + * Le modele est filtr� sur {@link #selectedFinancialPeriod} et + * {@link #selectedFinancialPeriod} (mont�e en charge !). * * @author ore * @author chatellier @@ -370,13 +370,15 @@ // get the financial period date Date transactionDate = selectedFinancialPeriod.getBeginDate(); - Calendar selectedPeriodCal = Calendar.getInstance(); - selectedPeriodCal.setTime(transactionDate); - int dayMax = selectedPeriodCal.getActualMaximum(Calendar.DAY_OF_MONTH); - + Calendar calEnd = Calendar.getInstance(); + calEnd.setTime(selectedFinancialPeriod.getEndDate()); + int dayMax = calEnd.get(Calendar.DAY_OF_MONTH); + Calendar calBegin = Calendar.getInstance(); + calBegin.setTime(selectedFinancialPeriod.getBeginDate()); + int dayMin = calBegin.get(Calendar.DAY_OF_MONTH); int toDay = actualCalendar.get(Calendar.DAY_OF_MONTH); - if (toDay>dayMax){ + if ((toDay>dayMax) || (toDay<dayMin)){ // change the day transactionDate = DateUtils.setDays(transactionDate, dayMax); } @@ -510,7 +512,7 @@ currentEntry.setLetter((Letter)value); break; case 6: - //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName + //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);

1 0

r3095 - trunk
by echatellier＠users.chorem.org 02 May '11

02 May '11

Author: echatellier Date: 2011-05-02 12:24:47 +0200 (Mon, 02 May 2011) New Revision: 3095 Url: http://chorem.org/repositories/revision/lima/3095 Log: Update topia and eugene to last version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-02 10:23:18 UTC (rev 3094) +++ trunk/pom.xml 2011-05-02 10:24:47 UTC (rev 3095) @@ -276,7 +276,7 @@  <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> - <eugenePluginVersion>2.3.2</eugenePluginVersion> + <eugenePluginVersion>2.3.3</eugenePluginVersion> <topiaVersion>2.5.3</topiaVersion> <jaxxVersion>2.3</jaxxVersion> <nuitonI18nVersion>2.3.2</nuitonI18nVersion>

1 0

r3094 - in trunk: . lima-business/src/main/java/org/chorem/lima/business/ejb
by echatellier＠users.chorem.org 02 May '11

02 May '11

Author: echatellier Date: 2011-05-02 12:23:18 +0200 (Mon, 02 May 2011) New Revision: 3094 Url: http://chorem.org/repositories/revision/lima/3094 Log: Update topia and eugene to last version Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-02 09:45:00 UTC (rev 3093) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-02 10:23:18 UTC (rev 3094) @@ -609,7 +609,7 @@ try { topiaContext = beginTransaction(); LetterDAO letterDAO = LimaCallaoDAOHelper.getLetterDAO(topiaContext); - int n = letterDAO.count(); + long n = letterDAO.count(); String res = numberToString(n, null); //if already exist @@ -627,12 +627,12 @@ return letter; } - public static String numberToString(int n, StringBuffer result){ + public static String numberToString(long n, StringBuffer result){ if (result == null){ result = new StringBuffer(); } - int mod = (n-1) % 26; - int div = (n-1) / 26; + long mod = (n-1) % 26; + long div = (n-1) / 26; if (div > 0){ result.append(numberToString(div, result)); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-02 09:45:00 UTC (rev 3093) +++ trunk/pom.xml 2011-05-02 10:23:18 UTC (rev 3094) @@ -276,8 +276,8 @@  <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> - <eugenePluginVersion>2.2</eugenePluginVersion> - <topiaVersion>2.4.2</topiaVersion> + <eugenePluginVersion>2.3.2</eugenePluginVersion> + <topiaVersion>2.5.3</topiaVersion> <jaxxVersion>2.3</jaxxVersion> <nuitonI18nVersion>2.3.2</nuitonI18nVersion> <openEjbVersion>3.1.4</openEjbVersion>

1 0