From vsalaun@users.chorem.org Fri May 20 15:51:46 2011
From: vsalaun@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3135 -
	trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
Date: Fri, 20 May 2011 15:51:46 +0200
Message-ID: <20110520135146.209151596F@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3913063527327370435=="

--===============3913063527327370435==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/LetteringFinan=
cialPeriodComboBox.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/Letteri=
ngFinancialPeriodComboBox.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFina=
ncialPeriodComboBox.java	2011-05-18 15:28:28 UTC (rev 3134)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFina=
ncialPeriodComboBox.java	2011-05-20 13:51:46 UTC (rev 3135)
@@ -25,17 +25,13 @@
=20
 package org.chorem.lima.ui.lettering;
=20
-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;
=20
=20
-public class LetteringFinancialPeriodComboBox extends JComboBox implements A=
ctionListener {
+public class LetteringFinancialPeriodComboBox extends JComboBox {
=20
     private static final long serialVersionUID =3D 1L;
=20
@@ -46,14 +42,6 @@
    =20
     public LetteringFinancialPeriodComboBox(LetteringViewHandler handler) {
         this.handler =3D handler;
-
-        FinancialPeriodComboBoxModel comboBoxModel =3D new FinancialPeriodCo=
mboBoxModel();
-        FinancialPeriodComboBoxRenderer comboBoxRenderer =3D new FinancialPe=
riodComboBoxRenderer();
-
-        setModel(comboBoxModel);
-        setRenderer(comboBoxRenderer);
-        addActionListener(this);
-
     }
=20
     public void back(){
@@ -78,12 +66,4 @@
         }
     }
    =20
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        Object object =3D this.getSelectedItem();
-        if (object instanceof FinancialPeriod){
-            handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.ge=
tSelectedItem());
-        }
-    }
-   =20
 }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/Letteri=
ngView.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"handler" javaBean=3D"new LetteringViewHandle=
r(this)" />
     <Boolean id=3D"selectedRow" javaBean=3D"false" />
-    <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id=3D"modelFin=
ancialPeriod"/>
-    <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id=3D"modelFiscal=
Period"/>
+   =20
     <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;   =20
    =20
-    LetteringFinancialPeriodComboBox financialPeriodComboBox =3D new Letteri=
ngFinancialPeriodComboBox(handler);
-   =20
-   =20
     void $afterCompleteSetup() {
         getHandler().refresh();
     }
@@ -49,11 +46,11 @@
             <JLabel id=3D"fiscalPeriodLabel" text=3D"lima.charts.fiscalyear"=
/>
         </cell>
         <cell anchor=3D"west">
+            <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id=3D"mod=
elFiscalPeriod"/>
             <JComboBox id=3D"fiscalPeriodComboBox"
                 model=3D"{getModelFiscalPeriod()}"
                 renderer=3D"{new org.chorem.lima.ui.combobox.FiscalPeriodCom=
boBoxRenderer()}"
-                onActionPerformed=3D"getModelFinancialPeriod().setFiscalPeri=
od( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem());
-                getHandler().refresh()"
+                onActionPerformed=3D"getModelFinancialPeriod().setFiscalPeri=
od((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())"
                 editable=3D"false"/>
         </cell>
         <cell anchor=3D"east">
@@ -61,7 +58,11 @@
             />
         </cell>
         <cell anchor=3D"west">
-            <JComboBox javaBean=3D"financialPeriodComboBox"/>
+            <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id=3D"=
modelFinancialPeriod"/>
+            <LetteringFinancialPeriodComboBox id=3D"financialPeriodComboBox"
+                constructorParams=3D"getHandler()"
+                model=3D"{getModelFinancialPeriod()}" renderer=3D"{new Finan=
cialPeriodComboBoxRenderer()}"
+                onActionPerformed=3D"tableModel.setFinancialPeriod((Financia=
lPeriod)financialPeriodComboBox.getSelectedItem())"/>
         </cell>
         <cell>
             <JButton id=3D"back" text=3D"lima.common.buttonback"


--===============3913063527327370435==--