From mallon@users.chorem.org Mon Jun 25 18:45:50 2012
From: mallon@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3475 -
	trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
Date: Mon, 25 Jun 2012 18:45:50 +0200
Message-ID: <20120625164550.7CB351605A@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0421753008530826903=="

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

Author: mallon
Date: 2012-06-25 18:45:50 +0200 (Mon, 25 Jun 2012)
New Revision: 3475

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

Log:
Correction sur la saisie des ?\195?\169critures : il est d?\195?\169sormais p=
ossible d'ajouter une transaction via les deux boutons copier / coller.

Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Fin=
ancialTransactionView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Fin=
ancialTransactionViewHandler.java

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransact=
ion/FinancialTransactionView.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/financialtransaction/Fi=
nancialTransactionView.jaxx	2012-06-25 15:32:20 UTC (rev 3474)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Fi=
nancialTransactionView.jaxx	2012-06-25 16:45:50 UTC (rev 3475)
@@ -34,7 +34,6 @@
=20
   <FinancialTransactionViewHandler id=3D"handler" constructorParams=3D"this"=
/>
   <Boolean id=3D"selectedRow" javaBean=3D"false"/>
-  <Boolean id=3D"noEntryBooks" javaBean=3D"false"/>
=20
   <script>
     <![CDATA[

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransact=
ion/FinancialTransactionViewHandler.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/financialtransaction/Fi=
nancialTransactionViewHandler.java	2012-06-25 15:32:20 UTC (rev 3474)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/Fi=
nancialTransactionViewHandler.java	2012-06-25 16:45:50 UTC (rev 3475)
@@ -198,34 +198,50 @@
     }
=20
     /**
-     * Copy selected transaction or entry.
+     * Copy selected row
      *=20
      * @param indexSelectedRow
      */
-    public void copyRow(int indexSelectedRow) {
-        clipBoard =3D view.getFinancialTransactionTableModel().getElementAt(=
indexSelectedRow);
+    public void copyRow(int indexSelectedRow){
+            clipBoard =3D view.getFinancialTransactionTableModel().getElemen=
tAt(indexSelectedRow);
     }
-
+   =20
     /**
-     * Paste entry.
+     * Paste row.
      *=20
-     * @param indexSelectedRow selected row to paste entry
+     * @param indexSelectedRow selected row to paste=20
      */
-    public void pasteRow(int indexSelectedRow) {
+    public void pasteRow(int indexSelectedRow){
         FinancialTransactionTable table =3D view.getFinancialTransactionTabl=
e();
+        //select the new line
+        ListSelectionModel selectionModel =3D table.getSelectionModel();
=20
         if (clipBoard instanceof Entry) {
             int index =3D addEntry((Entry) clipBoard, indexSelectedRow);
-
-            //select the new line
-            ListSelectionModel selectionModel =3D table.getSelectionModel();
+           =20
             selectionModel.setSelectionInterval(indexSelectedRow + 1, indexS=
electedRow + 1);
             //focus on second column
             table.changeSelection(index, 1, false, false);
             table.requestFocusInWindow();
+        }else{
+            FinancialTransactionTableModel tableModel =3D view.getFinancialT=
ransactionTableModel();
+            FinancialTransaction financialTransactionTemp =3D (FinancialTran=
saction) clipBoard;
+           =20
+            //need to know number of entries of copied transaction
+            //to select the new transaction
+            int nbentries =3D financialTransactionTemp.getEntry().size()+1;
+           =20
+            //new transaction with only entrybook and date
+            FinancialTransaction financialTransaction =3D new FinancialTrans=
actionImpl();
+            financialTransaction.setEntryBook(financialTransactionTemp.getEn=
tryBook());
+            financialTransaction.setTransactionDate(financialTransactionTemp=
.getTransactionDate());
+           =20
+            financialTransactionService.createFinancialTransaction(financial=
Transaction);
+            tableModel.addRow(financialTransaction);
+            selectionModel.setSelectionInterval(indexSelectedRow + nbentries=
, indexSelectedRow + nbentries);
         }
     }
-
+   =20
     /**
      * @param entry
      * @param row


--===============0421753008530826903==--