r3135 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering - Lima-commits

20 May 2011

Author: vsalaun
Date: 2011-05-20 15:51:46 +0200 (Fri, 20 May 2011)
New Revision: 3135

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

Log:
#369 mise en relation des combobox fiscalPeriods/financialPeriods (2/2)

Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java
===================================================================

--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java	2011-05-18 15:28:28 UTC (rev 3134)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java	2011-05-20 13:51:46 UTC (rev 3135)
@@ -25,17 +25,13 @@
 
 package org.chorem.lima.ui.lettering;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import javax.swing.JComboBox;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.entity.FinancialPeriod;
-import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel;
-import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer;
 
 
-public class LetteringFinancialPeriodComboBox extends JComboBox implements ActionListener {
+public class LetteringFinancialPeriodComboBox extends JComboBox {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,14 +42,6 @@
     
     public LetteringFinancialPeriodComboBox(LetteringViewHandler handler) {
         this.handler = handler;
-
-        FinancialPeriodComboBoxModel comboBoxModel = new FinancialPeriodComboBoxModel();
-        FinancialPeriodComboBoxRenderer comboBoxRenderer = new FinancialPeriodComboBoxRenderer();
-
-        setModel(comboBoxModel);
-        setRenderer(comboBoxRenderer);
-        addActionListener(this);
-
     }
 
     public void back(){
@@ -78,12 +66,4 @@
         }
     }
     
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        Object object = this.getSelectedItem();
-        if (object instanceof FinancialPeriod){
-            handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem());
-        }
-    }
-    
 }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx	2011-05-18 15:28:28 UTC (rev 3134)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx	2011-05-20 13:51:46 UTC (rev 3135)
@@ -26,17 +26,14 @@
 <Table>
     <LetteringViewHandler id="handler" javaBean="new LetteringViewHandler(this)" />
     <Boolean id="selectedRow" javaBean="false" />
-    <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/>
-    <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/>
+    
     <script>
     <![CDATA[
     import org.chorem.lima.entity.FiscalPeriod;
     import org.chorem.lima.entity.FinancialPeriod;
     import org.chorem.lima.ui.lettering.LetteringFinancialPeriodComboBox;
+    import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer;    
     
-    LetteringFinancialPeriodComboBox financialPeriodComboBox = new LetteringFinancialPeriodComboBox(handler);
-    
-    
     void $afterCompleteSetup() {
         getHandler().refresh();
     }
@@ -49,11 +46,11 @@
             <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/>
         </cell>
         <cell anchor="west">
+            <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/>
             <JComboBox id="fiscalPeriodComboBox"
                 model="{getModelFiscalPeriod()}"
                 renderer="{new org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer()}"
-                onActionPerformed="getModelFinancialPeriod().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem());
-                getHandler().refresh()"
+                onActionPerformed="getModelFinancialPeriod().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())"
                 editable="false"/>
         </cell>
         <cell anchor="east">
@@ -61,7 +58,11 @@
             />
         </cell>
         <cell anchor="west">
-            <JComboBox javaBean="financialPeriodComboBox"/>
+            <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/>
+            <LetteringFinancialPeriodComboBox id="financialPeriodComboBox"
+                constructorParams="getHandler()"
+                model="{getModelFinancialPeriod()}" renderer="{new FinancialPeriodComboBoxRenderer()}"
+                onActionPerformed="tableModel.setFinancialPeriod((FinancialPeriod)financialPeriodComboBox.getSelectedItem())"/>
         </cell>
         <cell>
             <JButton id="back" text="lima.common.buttonback"

    

r3135 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering

vsalaun＠users.chorem.org

tags

participants (1)