From mallon@users.chorem.org Thu Jul 12 17:26:15 2012
From: mallon@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3520 -
	trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
Date: Thu, 12 Jul 2012 17:26:15 +0200
Message-ID: <20120712152615.8C02E15883@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0727575552236300683=="

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

Author: mallon
Date: 2012-07-12 17:26:15 +0200 (Thu, 12 Jul 2012)
New Revision: 3520

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

Log:
fixes #692 R?\195?\169initialisation de la liste des entr?\195?\169es lors du=
 changement de mod?\195?\168le de s?\195?\169lection, et remise ?\195?\160 z?=
\195?\169ro des debit / credit / solde lors du delettrage.

Removed:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.=
jaxx
Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditM=
odel.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelec=
tionModel.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewH=
andler.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnl=
ettringSelectionModel.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSele=
ctionModel.java

Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLette=
rForm.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/AddLetterForm=
.jaxx	2012-07-12 10:27:43 UTC (rev 3519)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm=
.jaxx	2012-07-12 15:26:15 UTC (rev 3520)
@@ -1,81 +0,0 @@
-<!--
-  #%L
-  Lima Swing
- =20
-  $Id$
-  $HeadURL$
-  %%
-  Copyright (C) 2008 - 2010 CodeLutin
-  %%
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the=20
-  License, or (at your option) any later version.
- =20
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- =20
-  You should have received a copy of the GNU General Public=20
-  License along with this program.  If not, see
-  <http://www.gnu.org/licenses/gpl-3.0.html>.
-  #L%
-  -->
-
-<JDialog modal=3D"true"
-         defaultCloseOperation=3D"{JDialog.DO_NOTHING_ON_CLOSE}"
-         onWindowClosing=3D"performCancel();">
-  <import>
-    jaxx.runtime.swing.JAXXButtonGroup
-  </import>
-
-  <JAXXButtonGroup id=3D"radioButtons" javaBean=3D'new JAXXButtonGroup()'/>
-  <Boolean id=3D"validOk" javaBean=3D'true'/>
-
-  <script>
-    <![CDATA[
-
-    getRootPane().setDefaultButton(ok);
-    protected void performCancel() {
-        setValidOk(false);
-        dispose();
-    }
-    ]]>
-  </script>
-
-  <Table>
-    <row fill=3D"horizontal">
-      <cell>
-        <JRadioButton id=3D"newLetter"
-                      text=3D'lima.entries.lettering.radiobutton.new'
-                      value=3D'{true}' buttonGroup=3D"{getRadioButtons()}"
-                      selected=3D'true'/>
-      </cell>
-      <cell>
-        <JTextField editable=3D"false" visible=3D"{newLetter.isSelected()}"
-                    id=3D'newLetterTextField'/>
-      </cell>
-    </row>
-    <row>
-      <cell>
-        <JRadioButton id=3D"listLetter"
-                      text=3D'lima.entries.lettering.radiobutton.list'
-                      value=3D'{false}' buttonGroup=3D"{getRadioButtons()}"
-                      selected=3D'true'/>
-      </cell>
-      <cell>
-        <JComboBox id=3D'LetterListComboBox' visible=3D"{listLetter.isSelect=
ed()}"
-                   javaBean=3D"new JComboBox()"/>
-      </cell>
-    </row>
-    <row>
-      <cell fill=3D"none">
-        <JButton text=3D"lima.common.cancel" onActionPerformed=3D"performCan=
cel()"/>
-      </cell>
-      <cell fill=3D"none">
-        <JButton id=3D"ok" text=3D"lima.common.ok" onActionPerformed=3D"disp=
ose()"/>
-      </cell>
-    </row>
-  </Table>
-</JDialog>
\ No newline at end of file

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/Letteri=
ngEditModel.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/LetteringEdit=
Model.java	2012-07-12 10:27:43 UTC (rev 3519)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEdit=
Model.java	2012-07-12 15:26:15 UTC (rev 3520)
@@ -108,9 +108,16 @@
     public void setCredit(BigDecimal credit) {
         BigDecimal oldCredit =3D getCredit();
=20
+        if (log.isInfoEnabled()) {
+            log.info("Credit : " + credit);
+        }
+
         if (credit !=3D BigDecimal.ZERO){
             this.credit =3D credit.add(oldCredit);
         }else{
+            if (log.isInfoEnabled()) {
+                log.info("Credit passe a zero");
+            }
             this.credit=3DBigDecimal.ZERO;
         }
=20

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/Letteri=
ngSelectionModel.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/LetteringSele=
ctionModel.java	2012-07-12 10:27:43 UTC (rev 3519)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSele=
ctionModel.java	2012-07-12 15:26:15 UTC (rev 3520)
@@ -23,16 +23,15 @@
  * #L%
  */
=20
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.DefaultListSelectionModel;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.chorem.lima.entity.Entry;
=20
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author sletellier <letellier@codelutin.com>
  */
@@ -42,7 +41,7 @@
     protected LetteringTableModel letteringTableModel;
     protected LetteringEditModel editModel;
     protected int lineSelected;
-    protected List<Integer> selectedRows;
+    protected List<Integer> selectedRows =3D new ArrayList<Integer>();
=20
     //Modele de selection du tableau lors de la selection d une entree lettr=
ee
=20
@@ -57,7 +56,7 @@
         if (log.isInfoEnabled()) {
             log.info("Selection ligne...");
         }
-        selectedRows =3D new ArrayList<Integer>();
+        resetAttribute();
         super.clearSelection();
=20
         lineSelected =3D row;
@@ -103,6 +102,13 @@
         editModel.setLettred(lettering);
     }
=20
+    //to reinitialize model attribute
+    public void resetAttribute(){
+        for (int i =3D 0; i < selectedRows.size(); i ++){
+            selectedRows.remove(i);
+        }
+    }
+
     public List<Entry> getEntries(){
         return letteringTableModel.getEntries();
     }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/Letteri=
ngViewHandler.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/LetteringView=
Handler.java	2012-07-12 10:27:43 UTC (rev 3519)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView=
Handler.java	2012-07-12 15:26:15 UTC (rev 3520)
@@ -216,19 +216,31 @@
                 log.info("Nb entries model : " + view.getTableModel().getNum=
berOfEntries());
             }
         }
-        view.getEditModel().resetDebitCreditBalance();
+        editModel.resetDebitCreditBalance();
         view.getLettringAndUnlettringSelectionModel().clearSelection();
     }
=20
     public void updateBalanceAndLetteringButton(){
-        view.creditTextField.setText(editModel.getCredit().toString());
-        view.debitTexttField.setText(editModel.getDebit().toString());
-        view.soldeTextField.setText(editModel.getSolde().toString());
+
+        /**Update table and reset credit / debit / balance
+         * only when one of buttons lettering/unlettering
+         * is true and goes to false and only in the case
+         * of lettring (Not in case of balance equal to zero)*/
+       /* if ( (view.lettered.isEnabled() !=3D editModel.isLettred() || view=
.noLettered.isEnabled() !=3D editModel.isUnLettred())
+            && (view.lettered.isEnabled() || view.noLettered.isEnabled())
+            && (!view.getSoldeTextField().getText().equals("0.00") && !view.=
getSoldeTextField().getText().equals("0"))){
+            if (log.isInfoEnabled()) {
+                log.info("Changing state");
+            }
+            updateAllEntries();
+        }else{*/
+            view.creditTextField.setText(editModel.getCredit().toString());
+            view.debitTexttField.setText(editModel.getDebit().toString());
+            view.soldeTextField.setText(editModel.getSolde().toString());
+        //}
         view.lettered.setEnabled(editModel.isLettred());
         view.noLettered.setEnabled(editModel.isUnLettred());
-        if (log.isInfoEnabled()) {
-            log.info("updateBalanceAndLetteringButton");
-        }
+
         //FIXME Allon-11/07/2012 : probleme de rafraichissement de la table,=
 lors
         //de la delegation de modele ('LetteringSelectionModele')
         view.getTable().repaint();
@@ -261,14 +273,6 @@
         }
     }
=20
-    /*public void setBeginDate(Date date) {
-        view.getTableModel().setSelectedBeginDate(date);
-    }*/
-
-    /*public void setEndDate(Date date) {
-       view.getTableModel().setSelectedEndDate(date);
-    }*/
-
     /**Add a group of three letters to n entries*/
     public void addLetter() {
         String newLetters =3D financialTransactionService.getNextLetters();

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/Lettrin=
gAndUnlettringSelectionModel.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/LettringAndUn=
lettringSelectionModel.java	2012-07-12 10:27:43 UTC (rev 3519)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUn=
lettringSelectionModel.java	2012-07-12 15:26:15 UTC (rev 3520)
@@ -59,12 +59,20 @@
=20
         if (!letteringNotExist(row)) {
             delegate =3D letteringSelectionModel;
+            //to reinitialize model attribute when delegation change
+            unlettringSelectionModel.resetAttribute();
         }
         else {
             delegate =3D unlettringSelectionModel;
+            letteringSelectionModel.resetAttribute();
         }
=20
         editModel.resetDebitCreditBalance();
+        if (log.isInfoEnabled()) {
+            log.info("debit : " + editModel.getDebit() + "\n" +
+                    "credit : " + editModel.getCredit() + "\n" +
+                    "solde : " + editModel.getSolde());
+        }
         delegate.setSelectionInterval(row, column);
=20
     }

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/Unlettr=
ingSelectionModel.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/UnlettringSel=
ectionModel.java	2012-07-12 10:27:43 UTC (rev 3519)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSel=
ectionModel.java	2012-07-12 15:26:15 UTC (rev 3520)
@@ -49,13 +49,30 @@
     @Override
     public void setSelectionInterval(int row, int column){
=20
+        if (log.isInfoEnabled()) {
+            if (selectedRows.isEmpty()){
+                log.info("Liste de lignes vide");
+            }else{
+                log.info("Liste de lignes pleines");
+            }
+            if (searchRowSelected(row)){
+                log.info("Ligne dans la liste");
+            }
+        }
+
         //Case where line is selected a second time (So, must deselect it on=
 second click)
         if (selectedRows.isEmpty() || !searchRowSelected(row)){
             selectedRows.add(row);
             super.addSelectionInterval(row, column);
+            if (log.isInfoEnabled()) {
+                log.info("New row selected");
+            }
         }else {
             deleteLine(row);
             super.removeSelectionInterval(row, column);
+            if (log.isInfoEnabled()) {
+                log.info("Old row : deleting...");
+            }
         }
         updateBalanceAndLetteringButton(true);
     }
@@ -118,6 +135,13 @@
         }
     }
=20
+    //to reinitialize model attribute
+    public void resetAttribute(){
+        for (int i =3D 0; i < selectedRows.size(); i ++){
+            selectedRows.remove(i);
+        }
+    }
+
     @Override
     public int getSelectionMode() {
         return MULTIPLE_INTERVAL_SELECTION;


--===============0727575552236300683==--