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 possible d'ajouter une transaction via les deux boutons copier / coller. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-25 15:32:20 UTC (rev 3474) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-25 16:45:50 UTC (rev 3475) @@ -34,7 +34,6 @@ <FinancialTransactionViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedRow" javaBean="false"/> - <Boolean id="noEntryBooks" javaBean="false"/> <script> <![CDATA[ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 15:32:20 UTC (rev 3474) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 16:45:50 UTC (rev 3475) @@ -198,34 +198,50 @@ } /** - * Copy selected transaction or entry. + * Copy selected row * * @param indexSelectedRow */ - public void copyRow(int indexSelectedRow) { - clipBoard = view.getFinancialTransactionTableModel().getElementAt(indexSelectedRow); + public void copyRow(int indexSelectedRow){ + clipBoard = view.getFinancialTransactionTableModel().getElementAt(indexSelectedRow); } - + /** - * Paste entry. + * Paste row. * - * @param indexSelectedRow selected row to paste entry + * @param indexSelectedRow selected row to paste */ - public void pasteRow(int indexSelectedRow) { + public void pasteRow(int indexSelectedRow){ FinancialTransactionTable table = view.getFinancialTransactionTable(); + //select the new line + ListSelectionModel selectionModel = table.getSelectionModel(); if (clipBoard instanceof Entry) { int index = addEntry((Entry) clipBoard, indexSelectedRow); - - //select the new line - ListSelectionModel selectionModel = table.getSelectionModel(); + selectionModel.setSelectionInterval(indexSelectedRow + 1, indexSelectedRow + 1); //focus on second column table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); + }else{ + FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); + FinancialTransaction financialTransactionTemp = (FinancialTransaction) clipBoard; + + //need to know number of entries of copied transaction + //to select the new transaction + int nbentries = financialTransactionTemp.getEntry().size()+1; + + //new transaction with only entrybook and date + FinancialTransaction financialTransaction = new FinancialTransactionImpl(); + financialTransaction.setEntryBook(financialTransactionTemp.getEntryBook()); + financialTransaction.setTransactionDate(financialTransactionTemp.getTransactionDate()); + + financialTransactionService.createFinancialTransaction(financialTransaction); + tableModel.addRow(financialTransaction); + selectionModel.setSelectionInterval(indexSelectedRow + nbentries, indexSelectedRow + nbentries); } } - + /** * @param entry * @param row