From mallon@users.chorem.org Tue Jun 19 16:45:12 2012
From: mallon@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3458 -
	trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
Date: Tue, 19 Jun 2012 16:45:12 +0200
Message-ID: <20120619144512.AF5CC162C9@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1782445215538677642=="

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

Author: mallon
Date: 2012-06-19 16:45:12 +0200 (Tue, 19 Jun 2012)
New Revision: 3458

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

Log:
Correction concernant la gestion des boutons de suppression et de cloture des=
 exercices ('onMouseClicked' supprim?\195?\169, et d?\195?\169placement de la=
 m?\195?\169thode de gestion des boutons dans le handler.).

Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPerio=
dView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPerio=
dViewHandler.java

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Fisc=
alPeriodView.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/fiscalperiod/FiscalPeri=
odView.jaxx	2012-06-19 14:15:41 UTC (rev 3457)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri=
odView.jaxx	2012-06-19 14:45:12 UTC (rev 3458)
@@ -34,30 +34,7 @@
   <FiscalPeriodViewHandler id=3D"handler" constructorParams=3D"this"/>
   <Boolean id=3D"selectedPeriod" javaBean=3D"false"/>
=20
-  <script><![CDATA[
-  import static org.nuiton.i18n.I18n._; =20
- =20
-   /**
-     * Manage the differents buttons for fiscal period
-     * */
-    public void reloadEnablingButton()
-    {       =20
-        int selectedRow =3D fiscalPeriodTable.getSelectedRow();
-       =20
-        Object valueColumnClos =3D fiscalPeriodTableModel.getValueAt(selecte=
dRow, 1 );
-       =20
-        if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod=
.closed") ) )//Cloture
-        {
-            blockButton.setEnabled(false);
-            deleteButton.setEnabled(false);
-        }
-        else
-            {
-                blockButton.setEnabled(true);
-                deleteButton.setEnabled(true);
-            }           =20
-    }
- =20
+  <script><![CDATA[ =20
     void $afterCompleteSetup() {
         getHandler().init();
     }
@@ -72,11 +49,10 @@
           constructorParams=3D"getFiscalPeriodTableModel()"
           selectionMode=3D"{ListSelectionModel.SINGLE_INTERVAL_SELECTION}"=20
           columnControlVisible=3D"true"
-          onMouseClicked=3D"reloadEnablingButton()"
           />
         <ListSelectionModel
           javaBean=3D"getFiscalPeriodTable().getSelectionModel()"
-          onValueChanged=3D"setSelectedPeriod(fiscalPeriodTable.getSelectedR=
ow() !=3D -1)"/>
+          onValueChanged=3D"getHandler().reloadEnablingButton()"/>
       </JScrollPane>
     </cell>
   </row>

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/Fisc=
alPeriodViewHandler.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/fiscalperiod/FiscalPeri=
odViewHandler.java	2012-06-19 14:15:41 UTC (rev 3457)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeri=
odViewHandler.java	2012-06-19 14:45:12 UTC (rev 3458)
@@ -109,9 +109,20 @@
         addPeriodDialog.setVisible(true);
=20
         FiscalPeriod fiscalPeriod =3D addPeriodDialog.getPeriod();
-        if (fiscalPeriod !=3D null) {           =20
-           int response =3D  JOptionPane.YES_OPTION;           =20
-            if (response =3D=3D checkTimeFiscalPeriod(fiscalPeriod)) {
+        if (fiscalPeriod !=3D null) {            =20
+          =20
+         //check if fiscalperiod have 12 months, ask a confirmation
+           int nbMonth =3D DateUtil.getDifferenceInMonths(fiscalPeriod.getBe=
ginDate(),
+               fiscalPeriod.getEndDate());
+           int response =3D JOptionPane.YES_OPTION;
+           if (nbMonth !=3D 12) {
+               response =3D JOptionPane.showConfirmDialog(view,
+                   _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"),
+                   _("lima.ui.fiscalperiod.addfiscalperiodtitle"),
+                   JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+           }
+                     =20
+            if (response =3D=3D JOptionPane.YES_OPTION) {
                 fiscalPeriod =3D fiscalPeriodService.createFiscalPeriod(fisc=
alPeriod);
                 model.addFiscalPeriod(fiscalPeriod);
             }
@@ -280,19 +291,26 @@
         }
     }
    =20
-    private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){       =20
-      //check if fiscalperiod have 12 months, ask a confirmation
-        int nbMonth =3D DateUtil.getDifferenceInMonths(fiscalPeriod.getBegin=
Date(),
-            fiscalPeriod.getEndDate());
-        int response =3D JOptionPane.YES_OPTION;
-        if (nbMonth !=3D 12) {
-            response =3D JOptionPane.showConfirmDialog(view,
-                _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"),
-                _("lima.ui.fiscalperiod.addfiscalperiodtitle"),
-                JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-        }
+    /**
+     * Manage the differents buttons for fiscal period
+     * */
+    public void reloadEnablingButton(){       =20
        =20
-        return response;
-    }
-   =20
+        JXTable fiscalPeriodeTable =3D view.getFiscalPeriodTable();
+        FiscalPeriodTableModel model =3D view.getFiscalPeriodTableModel();
+       =20
+        int selectedRow =3D fiscalPeriodeTable.getSelectedRow();
+                       =20
+        Object valueColumnClos =3D model.getValueAt(selectedRow, 1 );
+       =20
+        if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod=
.closed") ) ){
+            view.blockButton.setEnabled(false);
+            view.deleteButton.setEnabled(false);           =20
+        }else{
+                view.blockButton.setEnabled(true);
+                view.deleteButton.setEnabled(true);
+                //TODO : si l'exercice est non-vide, suppression reste a fal=
se
+            }           =20
+    } =20
+       =20
 }


--===============1782445215538677642==--