r3116 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: financialtransaction financialtransactionsearch financialtransactionunbalanced - Lima-commits

13 May 2011

Author: vsalaun
Date: 2011-05-13 11:28:53 +0200 (Fri, 13 May 2011)
New Revision: 3116

Url: http://chorem.org/repositories/revision/lima/3116

Log:
#286 prise en compte du renderer des champs invalides dans les transactions

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

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-13 09:03:39 UTC (rev 3115)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java	2011-05-13 09:28:53 UTC (rev 3116)
@@ -41,6 +41,7 @@
 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.EmptyCellRenderer;
 import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor;
 import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor;
 import org.jdesktop.swingx.JXTable;
@@ -89,6 +90,10 @@
         setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor());
         //Get new BigDecimal renderer
         setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer());
+        //get new String renderer for empty cells
+        setDefaultRenderer(String.class, new EmptyCellRenderer());
+        //get new Account renderer for empty cells
+        setDefaultRenderer(Account.class, new EmptyCellRenderer());
                 
         //highlight financial financial transactions
         addColorTransaction();

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-13 09:03:39 UTC (rev 3115)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java	2011-05-13 09:28:53 UTC (rev 3116)
@@ -414,7 +414,9 @@
         Object currentRow = cacheDataList.get(row);
         Entry entry = new EntryImpl();
         entry.setAmount(BigDecimal.ZERO);
-        entry.setDescription(description);
+        if (description != null) {
+            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/financialtransactionsearch/FinancialTransactionSearchTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java	2011-05-13 09:03:39 UTC (rev 3115)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java	2011-05-13 09:28:53 UTC (rev 3116)
@@ -35,6 +35,7 @@
 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.EmptyCellRenderer;
 import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor;
 import org.jdesktop.swingx.JXTable;
 import org.jdesktop.swingx.decorator.ColorHighlighter;
@@ -76,6 +77,10 @@
         setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor());
         //Get new BigDecimal renderer
         setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer());
+        //get new String renderer for empty cells
+        setDefaultRenderer(String.class, new EmptyCellRenderer());
+        //get new Account renderer for empty cells
+        setDefaultRenderer(Account.class, new EmptyCellRenderer());
                 
         //highlight financial financial transactions
         addColorTransaction();

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-13 09:03:39 UTC (rev 3115)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java	2011-05-13 09:28:53 UTC (rev 3116)
@@ -37,6 +37,7 @@
 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.EmptyCellRenderer;
 import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor;
 import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedViewHandler;
 import org.jdesktop.swingx.JXTable;
@@ -81,6 +82,10 @@
         setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor());
         //Get new BigDecimal renderer
         setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer());
+        //get new String renderer for empty cells
+        setDefaultRenderer(String.class, new EmptyCellRenderer());
+        //get new Account renderer for empty cells
+        setDefaultRenderer(Account.class, new EmptyCellRenderer());
                 
         //highlight financial financial transactions
         addColorTransaction();

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-13 09:03:39 UTC (rev 3115)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java	2011-05-13 09:28:53 UTC (rev 3116)
@@ -368,7 +368,9 @@
         Object currentRow = cacheDataList.get(row);
         Entry entry = new EntryImpl();
         entry.setAmount(BigDecimal.ZERO);
-        entry.setDescription(description);
+        if (description != null) {
+            entry.setDescription(description);
+        }
         //check if current row is a transaction or an entry
         if (currentRow instanceof FinancialTransaction) {
             currentTransaction = (FinancialTransaction)currentRow;

    

r3116 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: financialtransaction financialtransactionsearch financialtransactionunbalanced

vsalaun＠users.chorem.org

tags

participants (1)