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; } }