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

r3113 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:43:28 +0200 (Thu, 12 May 2011) New Revision: 3113 Url: http://chorem.org/repositories/revision/lima/3113 Log: #267 ajout du renderer pour les objets de type BigDecimal dans le lettrage 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/LetteringTableModel.java 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-12 08:42:07 UTC (rev 3112) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-12 08:43:28 UTC (rev 3113) @@ -38,6 +38,8 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.Letter; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.celleditor.LetterTableCellEditor; @@ -80,8 +82,12 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); - //Get new letter editor + //Get new letter editor setDefaultEditor(Letter.class, new LetterTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -132,7 +138,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-12 08:42:07 UTC (rev 3112) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-12 08:43:28 UTC (rev 3113) @@ -330,10 +330,10 @@ } break; case 6: - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 7: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 8: result = null;

1 0

r3112 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:42:07 +0200 (Thu, 12 May 2011) New Revision: 3112 Url: http://chorem.org/repositories/revision/lima/3112 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition du grand livre Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-12 08:40:28 UTC (rev 3111) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-12 08:42:07 UTC (rev 3112) @@ -27,6 +27,9 @@ import java.awt.Color; import java.awt.Component; +import java.math.BigDecimal; + +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -54,6 +57,10 @@ public LedgerTable(LedgerViewHandler handler) { this.handler = handler; + + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //highlight financial financial transactions addColorReportsDatas(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2011-05-12 08:40:28 UTC (rev 3111) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2011-05-12 08:42:07 UTC (rev 3112) @@ -29,12 +29,16 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.Letter; /** * Entry book table model. @@ -73,7 +77,44 @@ public int getColumnCount() { return 8; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Account.class; + break; + case 1: + result = Date.class; + break; + case 2: + result = EntryBook.class; + break; + case 3: + result = String.class; + break; + case 4: + result = String.class; + break; + case 5: + result = BigDecimal.class; + break; + case 6: + result = BigDecimal.class; + break; + case 7: + result = BigDecimal.class; + break; + } + + return result; + } + + + @Override public String getColumnName(int column) { String res = "n/a"; @@ -155,8 +196,8 @@ } else if (result instanceof Entry) { Entry currentRow = (Entry)result; - BigDecimal amountDebit = new BigDecimal(0), - amountCredit = new BigDecimal(0); + BigDecimal amountDebit = BigDecimal.ZERO, + amountCredit = BigDecimal.ZERO; if (currentRow.getDebit()){ amountDebit = currentRow.getAmount(); }

1 0

r3111 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:40:28 +0200 (Thu, 12 May 2011) New Revision: 3111 Url: http://chorem.org/repositories/revision/lima/3111 Log: #267 ajout du renderer pour les objets de type BigDecimal dans la saisie des ecritures non equilibrees 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/FinancialTransactionUnbalancedTableModel.java 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-12 08:37:36 UTC (rev 3110) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-12 08:40:28 UTC (rev 3111) @@ -34,6 +34,8 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedViewHandler; @@ -75,6 +77,10 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -123,7 +129,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { 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-12 08:37:36 UTC (rev 3110) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-12 08:40:28 UTC (rev 3111) @@ -312,10 +312,10 @@ result = currentEntry.getDescription(); break; case 5 : - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 6: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 7: result = null; @@ -367,7 +367,7 @@ FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); - entry.setAmount(new BigDecimal(0)); + entry.setAmount(BigDecimal.ZERO); entry.setDescription(description); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { @@ -433,13 +433,11 @@ currentEntry.setDescription((String)value); break; case 5 : - //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName - // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(true); break; case 6: - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(false); break; case 8:

1 0

r3110 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:37:36 +0200 (Thu, 12 May 2011) New Revision: 3110 Url: http://chorem.org/repositories/revision/lima/3110 Log: #267 ajout du renderer pour les objets de type BigDecimal dans la recherche des transactions 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/FinancialTransactionSearchTableModel.java 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-12 08:35:16 UTC (rev 3109) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-12 08:37:36 UTC (rev 3110) @@ -32,6 +32,8 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.jdesktop.swingx.JXTable; @@ -70,6 +72,10 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -118,7 +124,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-05-12 08:35:16 UTC (rev 3109) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-05-12 08:37:36 UTC (rev 3110) @@ -293,10 +293,10 @@ result = currentEntry.getDescription(); break; case 5 : - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 6: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 7: result = null; @@ -348,7 +348,7 @@ FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); - entry.setAmount(new BigDecimal(0)); + entry.setAmount(BigDecimal.ZERO); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow;

1 0

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

12 May '11

Author: vsalaun Date: 2011-05-12 10:35:16 +0200 (Thu, 12 May 2011) New Revision: 3109 Url: http://chorem.org/repositories/revision/lima/3109 Log: #267 ajout du renderer pour les objets de type BigDecimal dans la saisie des ecritures 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/FinancialTransactionTableModel.java 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-12 08:32:13 UTC (rev 3108) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-12 08:35:16 UTC (rev 3109) @@ -39,8 +39,10 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -83,6 +85,10 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -131,7 +137,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { 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-12 08:32:13 UTC (rev 3108) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-12 08:35:16 UTC (rev 3109) @@ -312,10 +312,10 @@ } break; case 6: - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 7: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 8: result = null; @@ -360,8 +360,8 @@ public void addFinancialTransaction() throws LimaException{ /* Calling transaction service */ FinancialTransaction financialTransaction = new FinancialTransactionImpl(); - financialTransaction.setAmountDebit(new BigDecimal(0)); - financialTransaction.setAmountCredit(new BigDecimal(0)); + financialTransaction.setAmountDebit(BigDecimal.ZERO); + financialTransaction.setAmountCredit(BigDecimal.ZERO); //if a period is selected if (selectedFinancialPeriod != null){ financialTransaction.setFinancialPeriod(selectedFinancialPeriod); @@ -413,7 +413,7 @@ FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); - entry.setAmount(new BigDecimal(0)); + entry.setAmount(BigDecimal.ZERO); entry.setDescription(description); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { @@ -513,13 +513,11 @@ currentEntry.setLetter((Letter)value); break; case 6: - //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName - // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(false); break; }

1 0

r3108 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:32:13 +0200 (Thu, 12 May 2011) New Revision: 3108 Url: http://chorem.org/repositories/revision/lima/3108 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition du bilan et compte de resultat Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2011-05-12 08:27:34 UTC (rev 3107) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableCellRenderer.java 2011-05-12 08:32:13 UTC (rev 3108) @@ -27,10 +27,16 @@ import java.awt.Component; import java.awt.Font; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import javax.swing.JTable; +import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; +import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaContext; import org.chorem.lima.beans.FinancialStatementAmounts; @@ -75,8 +81,33 @@ } } } + + if (object instanceof BigDecimal) { + setHorizontalAlignment(SwingConstants.LEFT); + setValue(value); + } return this; } + + public void setValue(Object aValue) { + Object result = aValue; + if (( aValue != null) && (aValue instanceof BigDecimal)) { + LimaConfig config = LimaContext.getContext().getConfig(); + String scale = ""; + for (int i = 0; i < config.getScale(); i++) { + scale += "0"; + } + DecimalFormat formatter = new DecimalFormat("##0." + scale); + DecimalFormatSymbols symbol = new DecimalFormatSymbols(); + symbol.setDecimalSeparator(config.getDecimalSeparator()); + symbol.setGroupingSeparator(config.getThousandSeparator()); + formatter.setDecimalFormatSymbols(symbol); + formatter.setGroupingUsed(true); + formatter.setGroupingSize(3); + result = formatter.format(result); + } + super.setValue(result); + } } 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-12 08:27:34 UTC (rev 3107) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-05-12 08:32:13 UTC (rev 3108) @@ -119,7 +119,30 @@ public int getColumnCount() { return 4; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = String.class; + break; + case 1: + result = BigDecimal.class; + break; + case 2: + result = BigDecimal.class; + break; + case 3: + result = BigDecimal.class; + break; + } + + return result; + } + @Override public String getColumnName(int column) { String res = "n/a"; @@ -154,12 +177,12 @@ FinancialStatementAmounts currentRow = (FinancialStatementAmounts) result; BigDecimal grossAmount = currentRow.getGrossAmount(); if (grossAmount == null ){ - grossAmount = new BigDecimal(0); + grossAmount = BigDecimal.ZERO; } BigDecimal provisionDeprecationAmount = currentRow.getProvisionDeprecationAmount(); if (provisionDeprecationAmount == null ){ - provisionDeprecationAmount = new BigDecimal(0); + provisionDeprecationAmount = BigDecimal.ZERO; } switch (column) { case 0: @@ -173,7 +196,7 @@ } break; case 1: - if (grossAmount == BigDecimal.ZERO){ + if (grossAmount.compareTo(BigDecimal.ZERO) == 0){ result = null; } else { @@ -181,7 +204,7 @@ } break; case 2: - if (provisionDeprecationAmount == BigDecimal.ZERO){ + if (provisionDeprecationAmount.compareTo(BigDecimal.ZERO) == 0){ result = null; } else { @@ -190,7 +213,7 @@ break; case 3: BigDecimal solde = grossAmount.subtract(provisionDeprecationAmount); - if (solde == BigDecimal.ZERO) { + if (solde.compareTo(BigDecimal.ZERO) == 0) { result = null; } else {

1 0

r3107 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:27:34 +0200 (Thu, 12 May 2011) New Revision: 3107 Url: http://chorem.org/repositories/revision/lima/3107 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition du journal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-12 08:25:46 UTC (rev 3106) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-12 08:27:34 UTC (rev 3107) @@ -27,8 +27,11 @@ import java.awt.Color; import java.awt.Component; +import java.math.BigDecimal; + import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -58,6 +61,8 @@ this.handler = handler; this.model = model; highlighterReportsDatasBoolean=true; + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorReportsDatas(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2011-05-12 08:25:46 UTC (rev 3106) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2011-05-12 08:27:34 UTC (rev 3107) @@ -26,12 +26,18 @@ package org.chorem.lima.ui.entrybooksreports; import static org.nuiton.i18n.I18n._; + +import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Date; + import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.Letter; /** @@ -65,7 +71,39 @@ public int getColumnCount() { return 7; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Date.class; + break; + case 1: + result = Account.class; + break; + case 2: + result = String.class; + break; + case 3: + result = String.class; + break; + case 4: + result = Letter.class; + break; + case 5: + result = BigDecimal.class; + break; + case 6: + result = BigDecimal.class; + break; + } + + return result; + } + @Override public String getColumnName(int column) { String res = "n/a"; @@ -131,10 +169,10 @@ } break; case 5: - result = currentRow.getDebit() ? currentRow.getAmount() : 0; + result = currentRow.getDebit() ? currentRow.getAmount() : BigDecimal.ZERO; break; case 6: - result = currentRow.getDebit() ? 0 : currentRow.getAmount(); + result = currentRow.getDebit() ? BigDecimal.ZERO : currentRow.getAmount(); break; } }

1 0

r3106 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:25:46 +0200 (Thu, 12 May 2011) New Revision: 3106 Url: http://chorem.org/repositories/revision/lima/3106 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition de la balance Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-05-12 08:25:46 UTC (rev 3106) @@ -0,0 +1,30 @@ +package org.chorem.lima.ui.balance; + +import java.math.BigDecimal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.chorem.lima.ui.balance.BalanceViewHandler; +import org.jdesktop.swingx.JXTable; + +public class BalanceTable extends JXTable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6093850347322834480L; + + /** log. */ + private static final Log log = LogFactory + .getLog(BalanceTable.class); + + protected BalanceViewHandler handler; + + public BalanceTable(BalanceViewHandler handler) { + + this.handler = handler; + + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2011-05-12 08:23:54 UTC (rev 3105) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2011-05-12 08:25:46 UTC (rev 3106) @@ -26,12 +26,15 @@ package org.chorem.lima.ui.balance; import static org.nuiton.i18n.I18n._; + +import java.math.BigDecimal; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; /** @@ -62,7 +65,36 @@ public int getColumnCount() { return 6; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Account.class; + break; + case 1: + result = String.class; + break; + case 2: + result = BigDecimal.class; + break; + case 3: + result = BigDecimal.class; + break; + case 4: + result = BigDecimal.class; + break; + case 5: + result = BigDecimal.class; + break; + } + + return result; + } + @Override public String getColumnName(int column) { String res = "n/a"; @@ -113,7 +145,7 @@ result = currentRow.getAmountSolde(); } else { - result = 0; + result = BigDecimal.ZERO; } break; case 5: // solde credit @@ -121,7 +153,7 @@ result = currentRow.getAmountSolde(); } else { - result = 0; + result = BigDecimal.ZERO; } break; } 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-12 08:23:54 UTC (rev 3105) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2011-05-12 08:25:46 UTC (rev 3106) @@ -71,7 +71,8 @@ <row> <cell fill="both" weightx="1" weighty="1" columns="8"> <JScrollPane> - <org.jdesktop.swingx.JXTable id="balanceTable" rowHeight="24" + <org.chorem.lima.ui.balance.BalanceTable id="balanceTable" rowHeight="24" + constructorParams="getHandler()" model="{getModelBalanceTable()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" 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-12 08:23:54 UTC (rev 3105) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2011-05-12 08:25:46 UTC (rev 3106) @@ -72,6 +72,8 @@ /** Text field Accounts */ protected String selectedAccounts; + + protected BalanceTable table; protected BalanceTableModel model; @@ -151,7 +153,7 @@ String.valueOf(amountSolde)); - if (amountSolde == BigDecimal.ZERO){ + if (amountSolde.compareTo(BigDecimal.ZERO) == 0){ view.soldeLabel.setText(_("lima.common.solde")); } else {

1 0

r3105 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:23:54 +0200 (Thu, 12 May 2011) New Revision: 3105 Url: http://chorem.org/repositories/revision/lima/3105 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition des comptes Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-05-12 08:23:54 UTC (rev 3105) @@ -0,0 +1,32 @@ +package org.chorem.lima.ui.accountsreports; + +import java.math.BigDecimal; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.ui.accountsreports.AccountsReportsTable; +import org.chorem.lima.ui.accountsreports.AccountsReportsViewHandler; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.jdesktop.swingx.JXTable; + +public class AccountsReportsTable extends JXTable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6093850347322834480L; + + /** log. */ + private static final Log log = LogFactory + .getLog(AccountsReportsTable.class); + + protected AccountsReportsViewHandler handler; + + public AccountsReportsTable(AccountsReportsViewHandler handler) { + + this.handler = handler; + + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2011-05-12 08:15:34 UTC (rev 3104) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2011-05-12 08:23:54 UTC (rev 3105) @@ -26,12 +26,18 @@ package org.chorem.lima.ui.accountsreports; import static org.nuiton.i18n.I18n._; + +import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Date; + import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.Letter; /** * Entry book table model. @@ -67,7 +73,43 @@ public int getColumnCount() { return 8; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Account.class; + break; + case 1: + result = Date.class; + break; + case 2: + result = Entry.class; + break; + case 3: + result = String.class; + break; + case 4: + result = String.class; + break; + case 5: + result = Letter.class; + break; + case 6: + result = BigDecimal.class; + break; + case 7: + result = BigDecimal.class; + break; + } + + return result; + } + + @Override public String getColumnName(int column) { String res = "n/a"; @@ -139,10 +181,10 @@ } break; case 6: - result = currentRow.getDebit() ? currentRow.getAmount() : 0; + result = currentRow.getDebit() ? currentRow.getAmount() : BigDecimal.ZERO; break; case 7: - result = currentRow.getDebit() ? 0 : currentRow.getAmount(); + result = currentRow.getDebit() ? BigDecimal.ZERO : currentRow.getAmount(); break; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2011-05-12 08:15:34 UTC (rev 3104) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2011-05-12 08:23:54 UTC (rev 3105) @@ -65,7 +65,8 @@ <row> <cell fill="both" weightx="1" weighty="1" columns="6"> <JScrollPane> - <org.jdesktop.swingx.JXTable id="accountsReportsTable" rowHeight="24" + <org.chorem.lima.ui.accountsreports.AccountsReportsTable id="accountsReportsTable" rowHeight="24" + constructorParams="getHandler()" model="{getModelAccountsReportsTable()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" 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-12 08:15:34 UTC (rev 3104) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2011-05-12 08:23:54 UTC (rev 3105) @@ -51,6 +51,8 @@ protected AccountsReportsView view; + protected AccountsReportsTable table; + protected AccountsReportsTableModel tableModel; protected AccountComboBoxModel comboBoxModel;

1 0

r3104 - in trunk/lima-swing/src/main/java/org/chorem/lima: . ui
by vsalaun＠users.chorem.org 12 May '11

12 May '11

Author: vsalaun Date: 2011-05-12 10:15:34 +0200 (Thu, 12 May 2011) New Revision: 3104 Url: http://chorem.org/repositories/revision/lima/3104 Log: #267 ajout des options pour l'affichage des objets type BigDecimal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-05-06 16:08:00 UTC (rev 3103) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-05-12 08:15:34 UTC (rev 3104) @@ -69,7 +69,7 @@ * @return copyright text */ public String getCopyrightText() { - return "Version " + getVersion() + " Codelutin @ 2008-2010"; + return "Version " + getVersion() + " Codelutin @ 2008-2011"; } /** @@ -180,6 +180,90 @@ } /** + * Get application decimal separator + * + * @return configuration application decimal separator + */ + public char getDecimalSeparator() { + char decimalSeparator = getOption(Option.DECIMAL_SEPARATOR.key).charAt(0); + return decimalSeparator; + } + + /** + * Change decimal separator + * Save user file. + * + * @param decimalSeparator new DecimalSeparator + */ + public void setDecimalSeparator(String decimalSeparator) { + setOption(Option.DECIMAL_SEPARATOR.key, decimalSeparator); + saveForUser(); + firePropertyChange("decimalSeparator", null, decimalSeparator); + } + + /** + * Get application scale + * + * @return configuration application scale + */ + public int getScale() { + return getOptionAsInt(Option.SCALE.key); + } + + /** + * Change scale + * Save user file. + * + * @param scale new Scale + */ + public void setScale(String scale) { + setOption(Option.SCALE.key, scale); + saveForUser(); + firePropertyChange("scale", null, scale); + } + + /** + * Get application thousand separator + * + * @return configuration application thousand separator + */ + public char getThousandSeparator() { + return getOption(Option.THOUSAND_SEPARATOR.key).charAt(0); + } + + /** + * Change the thousand separator + * Save user file. + * + * @param thousandSeparator new thousandSeparator + */ + public void setThousandSeparator(String thousandSeparator) { + setOption(Option.THOUSAND_SEPARATOR.key, thousandSeparator); + saveForUser(); + firePropertyChange("thousandSeparator", null, thousandSeparator); + } + + /** + * currency configuration boolean + * + * @return {@code true} if the currency must be displayed + */ + public boolean getCurrency() { + return getOptionAsBoolean(Option.CURRENCY.key); + } + + /** + * Change the currency displaying + * + * @param currency + */ + public void setCurrency(String currency) { + setOption(Option.CURRENCY.key, currency); + saveForUser(); + firePropertyChange("currency", null, currency); + } + + /** * Launch ui configuration value. * * @return {@code true} if ui must be displayed @@ -242,7 +326,7 @@ /** * Used in ???? */ - public static final String[] DEFAULT_JAXX_PCS = { "fullScreen", "locale" }; + public static final String[] DEFAULT_JAXX_PCS = { "fullScreen", "locale", "decimalSeparator", "scale", "thousandSeparator", "currency" }; /** * Used in ???? @@ -276,6 +360,10 @@ CONFIG_FILE(CONFIG_FILE_NAME, _("lima.config.configFileName.description"), "lima-config.properties", String.class, true, true), LOCALE("locale", _("lima.config.locale.description"), "fr_FR", Locale.class, false, false), + DECIMAL_SEPARATOR("lima.config.decimalseparator", _("lima.config.decimalseparator.description"), ",", String.class, false, false), + SCALE("scale", _("lima.config.scale.description"), "2", Integer.class, false, false), + THOUSAND_SEPARATOR("thousandSeparator", _("limma.config.thousandseparator.description"), " ", String.class, false, false), + CURRENCY("currency", _("lima.config.currency.description"), "none", Boolean.class, false, false), FULL_SCREEN("lima.ui.fullscreen", _("lima.config.ui.fullscreen.description"), "false", Boolean.class, false, false), LAUNCH_UI("lima.ui.launchui", _("lima.config.ui.flaunchui.description"), "true", Boolean.class, true, true), SUPPORT_EMAIL("lima.misc.supportemail", _("lima.misc.supportemail.description"), "", String.class, false, false), 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 2011-05-06 16:08:00 UTC (rev 3103) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2011-05-12 08:15:34 UTC (rev 3104) @@ -167,6 +167,10 @@ helper.addCategory(_("lima.config.category.other"), _("lima.config.category.other.description")); helper.addOption(LimaConfig.Option.FULL_SCREEN); helper.addOption(LimaConfig.Option.LOCALE); + helper.addOption(LimaConfig.Option.DECIMAL_SEPARATOR); + helper.addOption(LimaConfig.Option.SCALE); + helper.addOption(LimaConfig.Option.THOUSAND_SEPARATOR); + helper.addOption(LimaConfig.Option.CURRENCY); helper.buildUI(context, _("lima.config.category.directories")); helper.displayUI(ui, false); @@ -238,6 +242,7 @@ // show ui ui.setVisible(true); + showHomeView(rootContext); } /**

1 0