r3106 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance - Lima-commits

12 May 2011

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 {

    

r3106 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance

vsalaun＠users.chorem.org

tags

participants (1)