Author: vsalaun Date: 2011-06-17 17:32:15 +0200 (Fri, 17 Jun 2011) New Revision: 3184 Url: http://chorem.org/repositories/revision/lima/3184 Log: correct the selection on the right row while updating datas (FinancialTransactionUnbalanced) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -242,11 +242,6 @@ y_tab++; } - System.out.println("x_tab : " + x_tab); - System.out.println("max_x : " + max_x); - System.out.println("y_tab : " + y_tab); - System.out.println("max_y : " + max_y); - //skip all cell while not editable or if end of table add entry or transaction or end of table while (!isCellEditable(y_tab, x_tab) && end ){ //if end of row Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -407,14 +407,12 @@ } } - - /** * * @param value * @param description * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEmptyEntry(Object value, String description, int row) throws LimaException { @@ -450,7 +448,7 @@ * @param value * @param entry * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEntry(Object value, Entry entry, int row) throws LimaException { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -427,7 +427,7 @@ * * @param value * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEmptyEntry(Object value, int row) throws LimaException { @@ -564,7 +564,7 @@ * @param value * @param description * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEmptyEntry(Object value, String description, int row) throws LimaException { @@ -595,6 +595,14 @@ return newrow; } + /** + * + * @param value + * @param entry + * @param row + * @return int: indexOf new Entry + * @throws LimaException + */ public int addEntry(Object value, Entry entry, int row) throws LimaException { FinancialTransaction currentTransaction = null; int financialTransactionRow = 0; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -360,10 +360,16 @@ } + /** - * @throws LimaException + * + * @param value + * @param description + * @param row + * @return int: indexOf new Entry + * @throws LimaException */ - public void addEmptyEntry(Object value, String description, int row) throws LimaException { + public int addEmptyEntry(Object value, String description, int row) throws LimaException { FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); @@ -382,9 +388,11 @@ } //create it entry.setFinancialTransaction(currentTransaction); - financialTransactionService.createEntry(entry); + Entry newEntry = financialTransactionService.createEntry(entry); //on recharge la liste - refresh(); + int newrow = cacheDataList.indexOf(newEntry); + fireTableRowsInserted(row, row); + return newrow; } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -78,13 +78,13 @@ try { //copy + paste the description String description = (String) tableModel.getValueAt(indexSelectedRow, 4); - tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); + int index = tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval(indexSelectedRow+1, indexSelectedRow+1); //focus on second column - table.changeSelection(indexSelectedRow+1, 1, false, false); + table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); } catch (LimaException eee){ if (log.isErrorEnabled()) {