From mallon@users.chorem.org Wed Aug  1 18:23:35 2012
From: mallon@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3560 -
	trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
Date: Wed, 01 Aug 2012 18:23:35 +0200
Message-ID: <20120801162335.C44CB162C4@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5722446228805055970=="

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

Author: mallon
Date: 2012-08-01 18:23:35 +0200 (Wed, 01 Aug 2012)
New Revision: 3560

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

Log:
fixes #711 Correction permettant de ne pas avoir de d?\195?\169s?\195?\169lec=
tion lors du d?\195?\169 / lettrage.

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/LetteringViewH=
andler.java

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	2012-08-01 12:27:37 UTC (rev 3559)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView=
.jaxx	2012-08-01 16:23:35 UTC (rev 3560)
@@ -1,7 +1,7 @@
 <!--
   #%L
   Lima Swing
- =20
+
   $Id$
   $HeadURL$
   %%
@@ -23,167 +23,167 @@
   #L%
   -->
=20
-<Table constraints=3D'BorderLayout.NORTH'>
+<Table >
=20
-  <import>
-    org.chorem.lima.ui.common.AccountComboBoxModel
-    org.chorem.lima.ui.common.FinancialPeriodComboBoxModel
-    org.chorem.lima.entity.Account
-    javax.swing.ListSelectionModel
-    org.jdesktop.swingx.JXDatePicker
-    org.chorem.lima.beans.LetteringFilter
-    org.chorem.lima.beans.LetteringFilterImpl
-  </import>
+    <import>
+        org.chorem.lima.ui.common.AccountComboBoxModel
+        org.chorem.lima.ui.common.FinancialPeriodComboBoxModel
+        org.chorem.lima.entity.Account
+        javax.swing.ListSelectionModel
+        org.jdesktop.swingx.JXDatePicker
+        org.chorem.lima.beans.LetteringFilter
+        org.chorem.lima.beans.LetteringFilterImpl
+    </import>
=20
-  <LetteringViewHandler id=3D"handler" constructorParams=3D"this"/>
-  <LetteringTableModel id=3D"tableModel"/>
+    <LetteringViewHandler id=3D"handler" constructorParams=3D"this"/>
+    <LetteringTableModel id=3D"tableModel"/>
=20
-  <LetteringFilterImpl id=3D'filterModel' initializer=3D'new LetteringFilter=
Impl()'/>
-  <LetteringEditModel id=3D'editModel'/>
+    <LetteringFilterImpl id=3D'filterModel' initializer=3D'new LetteringFilt=
erImpl()'/>
+    <LetteringEditModel id=3D'editModel'/>
=20
-  <LettringSelectionModel id=3D'lettringSelectionModel' constructorParams=3D=
' tableModel'
-                          onValueChanged=3D"handler.balanceAndActions()"/>
+    <LettringSelectionModel id=3D'lettringSelectionModel' constructorParams=
=3D' tableModel'
+                            onValueChanged=3D"handler.balanceAndActions()"/>
=20
-  <script>
-    <![CDATA[
+    <script>
+        <![CDATA[
     void $afterCompleteSetup() {
         handler.init();
     }
     ]]>
-  </script>
+    </script>
=20
-  <row>
-     <cell>
-        <JPanel layout=3D'{new BorderLayout()}' id=3D"panelAccountComboBox" =
border=3D'{new TitledBorder(_("lima.ui.lettering.account"))}'>
-           <org.chorem.lima.ui.common.AccountComboBoxModel id=3D"accountComb=
oBoxModel"/>
-               <JComboBox id=3D"accountComboBox" model=3D"{accountComboBoxMo=
del}"
-                          renderer=3D"{new org.chorem.lima.ui.common.Account=
ListRenderer()}"
-                          onActionPerformed=3D"filterModel.setAccount((Accou=
nt)accountComboBoxModel.getSelectedItem())"
-                          constraints=3D'BorderLayout.WEST'/>
-               <JButton id=3D"backCount" text=3D"lima.ui.account.buttonback"
-                        onActionPerformed=3D"handler.back(accountComboBox)"
-                        constraints=3D'BorderLayout.CENTER'/>
-               <JButton id=3D"nextCount" text=3D"lima.ui.account.buttonnext"
-                        onActionPerformed=3D"handler.next(accountComboBox)"
-                        constraints=3D'BorderLayout.EAST'/>
-        </JPanel>
-     </cell>
-     <cell>
-        <JPanel id=3D"panelFinancialPeriodComboBox" layout=3D'{new BorderLay=
out()}' border=3D'{new TitledBorder(_("lima.ui.lettering.period"))}'>
-           <Table constraints=3D'BorderLayout.NORTH'>
-            <row>
-                <cell>
-                        <JLabel text=3D"lima.ui.lettering.beginFinancialPeri=
od"/>
-                </cell>
-                <cell>
-                        <JXDatePicker id=3D"pickerDebut"
-                                      onActionPerformed=3D"filterModel.setDa=
teStart(pickerDebut.getDate())"/>
-                </cell>
-            </row>
-            <row>
-                <cell>
-                        <JLabel text=3D"lima.ui.lettering.endFinancialPeriod=
"/>
-                </cell>
-                <cell>
-                        <JXDatePicker id=3D"pickerFin"
-                                      onActionPerformed=3D"filterModel.setDa=
teEnd(pickerFin.getDate())"/>
-                </cell>
-            </row>
-           </Table>
-        </JPanel>
-     </cell>
-     <cell anchor=3D"center" weightx=3D"1">
-       <JPanel id=3D"entryPanel"  layout=3D'{new BorderLayout()}' border=3D'=
{new TitledBorder(_("lima.ui.lettering.entry"))}'>
-        <Table constraints=3D'BorderLayout.NORTH'>
-            <row>
-                <cell>
-                    <JRadioButton id=3D"lettredEntryCheckBox" buttonGroup=3D=
"letteredCheckGroup"
-                                  onActionPerformed=3D"filterModel.setDispla=
yLettered(true) ; filterModel.setDisplayUnlettred(false)"/>
-                </cell>
-                <cell>
-                    <JLabel text=3D"lima.ui.lettering.checkLettredEntry"/>
-                </cell>
-            </row>
-            <row>
-                <cell>
-                    <JRadioButton id=3D"noLettredEntryCheckBox" selected=3D"=
true" buttonGroup=3D"letteredCheckGroup"
-                                  onActionPerformed=3D"filterModel.setDispla=
yUnlettred(true); filterModel.setDisplayLettered(false)"/>
-                </cell>
-                <cell>
-                    <JLabel text=3D"lima.ui.lettering.checkNoLettredEntry"/>
-                </cell>
-            </row>
-            <row>
-                <cell>
-                    <JRadioButton id=3D"allCheckBox" buttonGroup=3D"lettered=
CheckGroup"
-                                  onActionPerformed=3D"filterModel.setDispla=
yLettered(false) ; filterModel.setDisplayUnlettred(false)"/>
-                </cell>
-                <cell>
-                    <JLabel text=3D"lima.ui.lettering.checkAll"/>
-                </cell>
-            </row>
-        </Table>
-       </JPanel>
-     </cell>
-  </row>
-  <row>
-      <cell fill=3D"horizontal" columns=3D"4">
-          <JPanel id=3D"selectedEntry" layout=3D'{new BorderLayout()}' borde=
r=3D'{new TitledBorder(_("lima.ui.lettering.selectEntry"))}'>
-              <Table constraints=3D'BorderLayout.NORTH'>
-                  <row>
-                    <cell anchor=3D"center" weightx=3D"0.6">
-                     <JLabel text=3D"lima.ui.lettering.selectDebit" labelFor=
=3D'{debitTexttField}'/>
-                    </cell>
-                    <cell fill=3D"horizontal" weightx=3D"0.6">
-                      <JTextField id=3D"debitTexttField" editable=3D"false" =
text=3D"{editModel.getDebit().toString()}"
-                                  focusable=3D"false"/>
-                    </cell>
-                    <cell anchor=3D"center" weightx=3D"0.6">
-                     <JLabel text=3D"lima.ui.lettering.selectCredit" labelFo=
r=3D'{creditTextField}'/>
-                    </cell>
-                    <cell fill=3D"horizontal" weightx=3D"0.6">
-                      <JTextField id=3D"creditTextField" editable=3D"false" =
text=3D"{editModel.getCredit().toString()}"
-                                  focusable=3D"false"/>
-                    </cell>
-                    <cell anchor=3D"center" weightx=3D"0.6">
-                     <JLabel text=3D"lima.ui.lettering.selectSolde" labelFor=
=3D'{soldeTextField}'/>
-                    </cell>
-                    <cell fill=3D"horizontal" weightx=3D"0.6">
-                        <JTextField id=3D"soldeTextField" editable=3D"false"=
 text=3D"{editModel.getSolde().toString()}"
-                        focusable=3D"false"/>
-                    </cell>
-                  </row>
-              </Table>
-          </JPanel>
-      </cell>
-  </row>
-  <row>
-      <cell anchor=3D"center" columns=3D'4'>
-        <JPanel id=3D"actionsPanel">
-           <JButton id=3D"lettered" text=3D"lima.ui.lettering.buttonLettered"
-                    enabled=3D"{editModel.isLettred()}"
-                    onActionPerformed=3D"handler.addLetter()"/>
-           <JButton id=3D"noLettered" text=3D"lima.ui.lettering.buttonNoLett=
ered"
-                    enabled=3D"{editModel.isUnLettred()}"
-                    onActionPerformed=3D"handler.removeLetter()"/>
-           <JButton id=3D"refresh" text=3D"lima.ui.lettering.buttonRefresh"
-                    enabled=3D"true"
-                    onActionPerformed=3D"handler.updateAllEntries()"/>
-           <JButton id=3D"round" text=3D"lima.ui.lettering.buttonEqualize"
-                    enabled=3D"{editModel.isEqualized()}"
-                    onActionPerformed=3D"handler.roundAndCreateEntry()"/>
-        </JPanel>
-      </cell>
-  </row>
-  <row>
-	   <cell fill=3D"both" weightx=3D"1" weighty=3D"1" columns=3D"4">
-	    <JScrollPane>
-	      <LetteringTable
-	        id=3D"table" sortable=3D"false" rowHeight=3D"22"
-	        constructorParams=3D"getTableModel()"
-	        selectionModel=3D"{lettringSelectionModel}"
-	       />
-	    </JScrollPane>
-	   </cell>
-  </row>
+    <row>
+        <cell>
+            <JPanel layout=3D'{new BorderLayout()}' id=3D"panelAccountComboB=
ox" border=3D'{new TitledBorder(_("lima.ui.lettering.account"))}'>
+                <org.chorem.lima.ui.common.AccountComboBoxModel id=3D"accoun=
tComboBoxModel"/>
+                <JComboBox id=3D"accountComboBox" model=3D"{accountComboBoxM=
odel}"
+                           renderer=3D"{new org.chorem.lima.ui.common.Accoun=
tListRenderer()}"
+                           onActionPerformed=3D"filterModel.setAccount((Acco=
unt)accountComboBoxModel.getSelectedItem())"
+                           constraints=3D'BorderLayout.WEST'/>
+                <JButton id=3D"backCount" text=3D"lima.ui.account.buttonback"
+                         onActionPerformed=3D"handler.back(accountComboBox)"
+                         constraints=3D'BorderLayout.CENTER'/>
+                <JButton id=3D"nextCount" text=3D"lima.ui.account.buttonnext"
+                         onActionPerformed=3D"handler.next(accountComboBox)"
+                         constraints=3D'BorderLayout.EAST'/>
+            </JPanel>
+        </cell>
+        <cell>
+            <JPanel id=3D"panelFinancialPeriodComboBox" layout=3D'{new Borde=
rLayout()}' border=3D'{new TitledBorder(_("lima.ui.lettering.period"))}'>
+                <Table constraints=3D'BorderLayout.NORTH'>
+                    <row>
+                        <cell>
+                            <JLabel text=3D"lima.ui.lettering.beginFinancial=
Period"/>
+                        </cell>
+                        <cell>
+                            <JXDatePicker id=3D"pickerDebut"
+                                          onActionPerformed=3D"filterModel.s=
etDateStart(pickerDebut.getDate())"/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell>
+                            <JLabel text=3D"lima.ui.lettering.endFinancialPe=
riod"/>
+                        </cell>
+                        <cell>
+                            <JXDatePicker id=3D"pickerFin"
+                                          onActionPerformed=3D"filterModel.s=
etDateEnd(pickerFin.getDate())"/>
+                        </cell>
+                    </row>
+                </Table>
+            </JPanel>
+        </cell>
+        <cell>
+            <JPanel id=3D"entryPanel"  layout=3D'{new BorderLayout()}' borde=
r=3D'{new TitledBorder(_("lima.ui.lettering.entry"))}'>
+                <Table constraints=3D'BorderLayout.NORTH'>
+                    <row>
+                        <cell>
+                            <JRadioButton id=3D"lettredEntryCheckBox" button=
Group=3D"letteredCheckGroup"
+                                          onActionPerformed=3D"filterModel.s=
etDisplayLettered(true) ; filterModel.setDisplayUnlettred(false)"/>
+                        </cell>
+                        <cell>
+                            <JLabel text=3D"lima.ui.lettering.checkLettredEn=
try"/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell>
+                            <JRadioButton id=3D"noLettredEntryCheckBox" sele=
cted=3D"true" buttonGroup=3D"letteredCheckGroup"
+                                          onActionPerformed=3D"filterModel.s=
etDisplayUnlettred(true); filterModel.setDisplayLettered(false)"/>
+                        </cell>
+                        <cell>
+                            <JLabel text=3D"lima.ui.lettering.checkNoLettred=
Entry"/>
+                        </cell>
+                    </row>
+                    <row>
+                        <cell>
+                            <JRadioButton id=3D"allCheckBox" buttonGroup=3D"=
letteredCheckGroup"
+                                          onActionPerformed=3D"filterModel.s=
etDisplayLettered(false) ; filterModel.setDisplayUnlettred(false)"/>
+                        </cell>
+                        <cell>
+                            <JLabel text=3D"lima.ui.lettering.checkAll"/>
+                        </cell>
+                    </row>
+                </Table>
+            </JPanel>
+        </cell>
+    </row>
+    <row>
+        <cell fill=3D"horizontal" columns=3D"4">
+            <JPanel id=3D"selectedEntry" layout=3D'{new BorderLayout()}' bor=
der=3D'{new TitledBorder(_("lima.ui.lettering.selectEntry"))}'>
+                <Table constraints=3D'BorderLayout.NORTH'>
+                    <row>
+                        <cell anchor=3D"center" weightx=3D"0.6">
+                            <JLabel text=3D"lima.ui.lettering.selectDebit" l=
abelFor=3D'{debitTexttField}'/>
+                        </cell>
+                        <cell fill=3D"horizontal" weightx=3D"0.6">
+                            <JTextField id=3D"debitTexttField" editable=3D"f=
alse" text=3D"{editModel.getDebit().toString()}"
+                                        focusable=3D"false"/>
+                        </cell>
+                        <cell anchor=3D"center" weightx=3D"0.6">
+                            <JLabel text=3D"lima.ui.lettering.selectCredit" =
labelFor=3D'{creditTextField}'/>
+                        </cell>
+                        <cell fill=3D"horizontal" weightx=3D"0.6">
+                            <JTextField id=3D"creditTextField" editable=3D"f=
alse" text=3D"{editModel.getCredit().toString()}"
+                                        focusable=3D"false"/>
+                        </cell>
+                        <cell anchor=3D"center" weightx=3D"0.6">
+                            <JLabel text=3D"lima.ui.lettering.selectSolde" l=
abelFor=3D'{soldeTextField}'/>
+                        </cell>
+                        <cell fill=3D"horizontal" weightx=3D"0.6">
+                            <JTextField id=3D"soldeTextField" editable=3D"fa=
lse" text=3D"{editModel.getSolde().toString()}"
+                                        focusable=3D"false"/>
+                        </cell>
+                    </row>
+                </Table>
+            </JPanel>
+        </cell>
+    </row>
+    <row>
+        <cell anchor=3D"center" columns=3D'4'>
+            <JPanel id=3D"actionsPanel">
+                <JButton id=3D"lettered" text=3D"lima.ui.lettering.buttonLet=
tered"
+                         enabled=3D"{editModel.isLettred()}"
+                         onActionPerformed=3D"handler.addLetter()"/>
+                <JButton id=3D"noLettered" text=3D"lima.ui.lettering.buttonN=
oLettered"
+                         enabled=3D"{editModel.isUnLettred()}"
+                         onActionPerformed=3D"handler.removeLetter()"/>
+                <JButton id=3D"refresh" text=3D"lima.ui.lettering.buttonRefr=
esh"
+                         enabled=3D"true"
+                         onActionPerformed=3D"handler.updateAllEntries()"/>
+                <JButton id=3D"round" text=3D"lima.ui.lettering.buttonEquali=
ze"
+                         enabled=3D"{editModel.isEqualized()}"
+                         onActionPerformed=3D"handler.roundAndCreateEntry()"=
/>
+            </JPanel>
+        </cell>
+    </row>
+    <row>
+        <cell fill=3D"both" weightx=3D"1" weighty=3D"1" columns=3D"4">
+            <JScrollPane>
+                <LetteringTable
+                        id=3D"table" sortable=3D"false" rowHeight=3D"22"
+                        constructorParams=3D"getTableModel()"
+                        selectionModel=3D"{lettringSelectionModel}"
+                        />
+            </JScrollPane>
+        </cell>
+    </row>
 </Table>
\ No newline at end of file

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-08-01 12:27:37 UTC (rev 3559)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView=
Handler.java	2012-08-01 16:23:35 UTC (rev 3560)
@@ -117,9 +117,14 @@
             //For U.I. buttons (Lettering and unlettering)
             onButtonModeChanged("delettrer");
         } else {
+            if (log.isDebugEnabled()) {
+                log.debug("unlettred entries");
+            }
             int[] selectedRows =3D view.getTable().getSelectedRows();
             if (selectedRows.length =3D=3D 2) {
-
+                if (log.isDebugEnabled()) {
+                    log.debug("2 rows selected");
+                }
                 /*Treatment only if one of values contains decimals*/
                 LetteringTableModel tableModel =3D view.getTableModel();
                 Entry firstSelectedEntry =3D tableModel.getEntryAt(selectedR=
ows[0]);
@@ -132,6 +137,9 @@
                     onButtonModeChanged("equalized");
                 }
             }else {
+                if (log.isDebugEnabled()) {
+                    log.debug("!2 rows selected");
+                }
                 onButtonModeChanged("all");
             }
=20
@@ -139,9 +147,15 @@
             onBalanceChanged(null);
             //treatment unuseful if no rows are selected
             if (!view.getLettringSelectionModel().isSelectionEmpty()) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Rows selected");
+                }
                 setValuesForSelectedEntries();
                 onButtonModeChanged("lettrer");
             } else {
+                if (log.isDebugEnabled()) {
+                    log.debug("No Rows selected");
+                }
                 onButtonModeChanged("all");
             }
         }
@@ -288,7 +302,7 @@
             view.getTableModel().updateEntries(entries, datesEntree, journal=
Entrees);
         }
         onBalanceChanged(null);
-        view.getLettringSelectionModel().clearSelection();
+        //view.getLettringSelectionModel().clearSelection();
     }
=20
     /**To make the difference between two selected entries and
@@ -436,13 +450,13 @@
     public void addLetter() {
         String newLetters =3D financialTransactionService.getNextLetters();
         changeLetter(newLetters);
-        onBalanceChanged(null);
+        //onBalanceChanged(null);
     }
=20
     /**Remove a group of three letters to n entries*/
     public void removeLetter() {
         changeLetter(null);
-        onBalanceChanged(null);
+        //onBalanceChanged(null);
     }
=20
     /**Add or remove a group of three letters to n entries*/
@@ -453,6 +467,7 @@
=20
         for (int indexEntry : entrieSelected){
             financialTransactionService.updateEntry(view.getTableModel().get=
EntryAt(indexEntry));
+            view.getTable().addRowSelectionInterval(indexEntry, indexEntry);
         }
         editModel.setLettred(false);
         editModel.setUnLettred(false);


--===============5722446228805055970==--