June 2012 - Lima-commits - mailman.cloud.codelutin.com

r3482 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by sletellier＠users.chorem.org 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 14:09:05 +0200 (Wed, 27 Jun 2012) New Revision: 3482 Url: http://chorem.org/repositories/revision/lima/3482 Log: Retrieve deleted file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 12:09:05 UTC (rev 3482) @@ -0,0 +1,31 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Component; +import java.math.BigDecimal; +import javax.swing.JTable; +import jaxx.runtime.swing.editor.cell.NumberCellEditor; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class BigDecimalTableCellEditor extends NumberCellEditor<BigDecimal> { + + protected int row; + + /** + * constructor + */ + public BigDecimalTableCellEditor() { + super(BigDecimal.class, false); + } + + public int getRow() { + return row; + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + this.row = row; + return super.getTableCellEditorComponent(table, value, isSelected, row, column); + } +}

1 0

r3481 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction
by sletellier＠users.chorem.org 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 13:46:23 +0200 (Wed, 27 Jun 2012) New Revision: 3481 Url: http://chorem.org/repositories/revision/lima/3481 Log: Push NumberCellEditor to JaxxWidget Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.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/FinancialTransactionTableModel.java Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 10:19:17 UTC (rev 3480) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 11:46:23 UTC (rev 3481) @@ -1,151 +0,0 @@ -/* - * #%L - * Lima :: Swing - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2011 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 - * License, or (at your option) any later version. - * - * 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. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package org.chorem.lima.ui.celleditor; - -import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.math.BigDecimal; -import javax.swing.AbstractCellEditor; -import javax.swing.JTable; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.event.AncestorEvent; -import javax.swing.event.AncestorListener; -import javax.swing.table.TableCellEditor; -import jaxx.runtime.swing.editor.NumberEditor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; - -public class BigDecimalTableCellEditor extends AbstractCellEditor - implements TableCellEditor, FocusListener, AncestorListener { - - private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); - - private static final long serialVersionUID = 1L; - - protected int row; - - protected final NumberEditor numberEditor; - - /** constructor */ - public BigDecimalTableCellEditor() { - numberEditor = new NumberEditor(); - numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); - numberEditor.getTextField().setBorder(null); - numberEditor.getTextField().addAncestorListener(this); - numberEditor.getTextField().addFocusListener(this); - - numberEditor.setModelType(BigDecimal.class); - numberEditor.setModel(new BigDecimal(0)); -// numberEditor.setUseFloat(true); - numberEditor.setUseSign(false); - numberEditor.init(); - } - - public int getRow() { - return row; - } - - @Override - public Component getTableCellEditorComponent(JTable table, Object value, - boolean isSelected, int row, int column) { - - this.row = row; - - // FIXME sletellier 20120105 : we dont need to set modelText - BigDecimal bd = (BigDecimal) value; - numberEditor.setModel(bd); - numberEditor.setModelText(bd.toPlainString()); - return numberEditor; - } - - // the editor should return a BigDecimal - public Object getCellEditorValue() { - BigDecimal bdValue = (BigDecimal)numberEditor.getModel(); - - //replace all comma by full stop -// textValue = textValue.replaceAll(",", "."); -// if (textValue.equals("")) { -// return BigDecimal.ZERO; -// } else { - //set 0 in case the user type in a non number format - if (bdValue == null) { - bdValue = BigDecimal.ZERO; - } -// try { -// BigDecimal bdValue = new BigDecimal(f); -// } catch (NumberFormatException eee) { -// if (log.isErrorEnabled()) { -// log.error("Can't set " + textValue + " to a BigDecimal", eee); -// } -// } - //round half up the number using the scale given by the configuration - bdValue = bdValue.setScale(LimaContext.getContext().getConfig().getScale(), - BigDecimal.ROUND_HALF_UP); - return bdValue; -// } - } - -// @Override -// public boolean isCellEditable(EventObject evt) { -// return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; -// } -// -// /** Listeners */ - @Override - public void focusGained(FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } - }); - } - - @Override - public void focusLost(FocusEvent e) { - } - - @Override - public void ancestorAdded(AncestorEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } - }); - } - - @Override - public void ancestorRemoved(AncestorEvent e) { - } - - @Override - public void ancestorMoved(AncestorEvent e) { - } - -} 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 2012-06-27 10:19:17 UTC (rev 3480) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-27 11:46:23 UTC (rev 3481) @@ -95,6 +95,8 @@ //Get new amount editor BigDecimalTableCellEditor editor = new BigDecimalTableCellEditor(); + + // FIXME sletellier 27/06/12 : hack to fix selection of first row on stopEditing cell in last row editor.addCellEditorListener(new CellEditorListener() { @Override 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 2012-06-27 10:19:17 UTC (rev 3480) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 11:46:23 UTC (rev 3481) @@ -29,6 +29,7 @@ import java.util.Date; import java.util.List; import javax.swing.table.AbstractTableModel; +import org.chorem.lima.LimaContext; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -386,11 +387,13 @@ currentEntry.setLettering((String) value); break; case 6: - currentEntry.setAmount((BigDecimal) value); + BigDecimal bigDecimalValue = getBigDecimalValue(value); + currentEntry.setAmount(bigDecimalValue); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount((BigDecimal) value); + bigDecimalValue = getBigDecimalValue(value); + currentEntry.setAmount(bigDecimalValue); currentEntry.setDebit(false); break; } @@ -417,6 +420,22 @@ fireTableRowsUpdated(trIndex, endIndex); } + protected BigDecimal getBigDecimalValue(Object value) { + + BigDecimal result = (BigDecimal)value; + + //set 0 in case the user type in a non number format + if (result == null) { + result = BigDecimal.ZERO; + } + + //round half up the number using the scale given by the configuration + result = result.setScale(LimaContext.getContext().getConfig().getScale(), + BigDecimal.ROUND_HALF_UP); + + return result; + } + public Object getElementAt(int row) { Object result = transactionAndEntries.get(row); return result;

1 0

r3480 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by sletellier＠users.chorem.org 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 12:19:17 +0200 (Wed, 27 Jun 2012) New Revision: 3480 Url: http://chorem.org/repositories/revision/lima/3480 Log: Realy use BigDecimal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 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 2012-06-27 10:16:23 UTC (rev 3479) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 10:19:17 UTC (rev 3480) @@ -94,10 +94,10 @@ result = String.class; break; case 6: - result = String.class; + result = BigDecimal.class; break; case 7: - result = String.class; + result = BigDecimal.class; break; case 8: result = BigDecimal.class;

1 0

r3479 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction fiscalperiod
by sletellier＠users.chorem.org 27 Jun '12

27 Jun '12

Author: sletellier Date: 2012-06-27 12:16:23 +0200 (Wed, 27 Jun 2012) New Revision: 3479 Url: http://chorem.org/repositories/revision/lima/3479 Log: - Fix number edition using NumberEditor - Partial fix selection of first row on stopEditing cell in last row on FinancialTransactionTable Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 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/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -24,105 +24,118 @@ */ package org.chorem.lima.ui.celleditor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; - +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.math.BigDecimal; import javax.swing.AbstractCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.math.BigDecimal; -import java.util.EventObject; +import jaxx.runtime.swing.editor.NumberEditor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; public class BigDecimalTableCellEditor extends AbstractCellEditor - implements TableCellEditor, FocusListener, AncestorListener, KeyListener { + implements TableCellEditor, FocusListener, AncestorListener { private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); private static final long serialVersionUID = 1L; - protected final JTextField textField; + protected int row; - private boolean keyPressed; + protected final NumberEditor numberEditor; /** constructor */ public BigDecimalTableCellEditor() { - textField = new JTextField(); - textField.setEditable(true); - textField.setHorizontalAlignment(SwingConstants.RIGHT); - textField.addFocusListener(this); - textField.addAncestorListener(this); - textField.addKeyListener(this); - keyPressed = false; + numberEditor = new NumberEditor(); + numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); + numberEditor.getTextField().setBorder(null); + numberEditor.getTextField().addAncestorListener(this); + numberEditor.getTextField().addFocusListener(this); + + numberEditor.setModelType(BigDecimal.class); + numberEditor.setModel(new BigDecimal(0)); +// numberEditor.setUseFloat(true); + numberEditor.setUseSign(false); + numberEditor.init(); } + public int getRow() { + return row; + } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - textField.setText(value.toString()); - return textField; + + this.row = row; + + // FIXME sletellier 20120105 : we dont need to set modelText + BigDecimal bd = (BigDecimal) value; + numberEditor.setModel(bd); + numberEditor.setModelText(bd.toPlainString()); + return numberEditor; } // the editor should return a BigDecimal public Object getCellEditorValue() { - String textValue = textField.getText().trim(); + BigDecimal bdValue = (BigDecimal)numberEditor.getModel(); + //replace all comma by full stop - textValue = textValue.replaceAll(",", "."); - if (textValue.equals("")) { - return BigDecimal.ZERO; - } else { +// textValue = textValue.replaceAll(",", "."); +// if (textValue.equals("")) { +// return BigDecimal.ZERO; +// } else { //set 0 in case the user type in a non number format - BigDecimal bdValue = BigDecimal.ZERO; - try { - bdValue = new BigDecimal(textValue); - } catch (NumberFormatException eee) { - if (log.isErrorEnabled()) { - log.error("Can't set " + textValue + " to a BigDecimal", eee); - } + if (bdValue == null) { + bdValue = BigDecimal.ZERO; } +// try { +// BigDecimal bdValue = new BigDecimal(f); +// } catch (NumberFormatException eee) { +// if (log.isErrorEnabled()) { +// log.error("Can't set " + textValue + " to a BigDecimal", eee); +// } +// } //round half up the number using the scale given by the configuration bdValue = bdValue.setScale(LimaContext.getContext().getConfig().getScale(), BigDecimal.ROUND_HALF_UP); return bdValue; - } +// } } +// @Override +// public boolean isCellEditable(EventObject evt) { +// return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; +// } +// +// /** Listeners */ @Override - public boolean isCellEditable(EventObject evt) { - return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; - } - - /** Listeners */ - @Override public void focusGained(FocusEvent e) { SwingUtilities.invokeLater(new Runnable() { public void run() { - textField.selectAll(); + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); } }); } @Override public void focusLost(FocusEvent e) { - keyPressed = false; } @Override public void ancestorAdded(AncestorEvent e) { SwingUtilities.invokeLater(new Runnable() { public void run() { - textField.requestFocus(); + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); } }); } @@ -135,31 +148,4 @@ public void ancestorMoved(AncestorEvent e) { } - @Override - public void keyTyped(KeyEvent e) { - - } - - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - // replace all the cell content only if all the text has been selected - if (!keyPressed - && textField.getSelectionStart() == 0 - && textField.getSelectionEnd() == textField.getText().length()) { - // delete the the cell content - if (e.getKeyChar() == KeyEvent.VK_BACK_SPACE) { - textField.setText(""); - keyPressed = true; - // replace the content by the char typed in - } else if (String.valueOf(e.getKeyChar()).matches("[a-zA-z0-9]")) { - textField.setText(String.valueOf(e.getKeyChar())); - keyPressed = true; - } - } - } - } 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 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -25,6 +25,18 @@ package org.chorem.lima.ui.financialtransaction; +import java.awt.Color; +import java.awt.Component; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.math.BigDecimal; +import java.util.Date; +import javax.swing.SwingUtilities; +import javax.swing.SwingWorker; +import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; import org.apache.commons.collections.CollectionUtils; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -42,16 +54,6 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; -import javax.swing.SwingWorker; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.math.BigDecimal; -import java.util.Date; - /** * Table des transaction qui ajoute des comportement (keys). * @@ -92,8 +94,29 @@ setDefaultEditor(Account.class, new AccountTableCellEditor()); //Get new amount editor - setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + BigDecimalTableCellEditor editor = new BigDecimalTableCellEditor(); + editor.addCellEditorListener(new CellEditorListener() { + @Override + public void editingStopped(ChangeEvent e) { + BigDecimalTableCellEditor editor = (BigDecimalTableCellEditor)e.getSource(); + final int row = editor.getRow(); + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + getSelectionModel().setSelectionInterval(row, row); + } + }); + } + + @Override + public void editingCanceled(ChangeEvent e) { + // do nothing + } + }); + setDefaultEditor(BigDecimal.class, editor); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); @@ -139,12 +162,19 @@ colorTransaction = new ColorHighlighter(predicate, new Color(255, 198, 209), null); addHighlighter(colorTransaction); + + setTerminateEditOnFocusLost(true); } public FinancialTransactionViewHandler getHandler() { return handler; } + @Override + public void changeSelection(int rowIndex, int columnIndex, boolean toggle, boolean extend) { + super.changeSelection(rowIndex, columnIndex, true, true); + } + private class MyKeyAdapter extends KeyAdapter { @Override 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 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -25,14 +25,10 @@ package org.chorem.lima.ui.financialtransaction; -import static org.nuiton.i18n.I18n._; - import java.math.BigDecimal; import java.util.Date; import java.util.List; - import javax.swing.table.AbstractTableModel; - import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -40,6 +36,8 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; +import static org.nuiton.i18n.I18n._; + /** * Basic transaction table model. * @@ -96,10 +94,10 @@ result = String.class; break; case 6: - result = BigDecimal.class; + result = String.class; break; case 7: - result = BigDecimal.class; + result = String.class; break; case 8: result = BigDecimal.class; 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-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -25,8 +25,6 @@ package org.chorem.lima.ui.financialtransaction; -import static org.nuiton.i18n.I18n._; - import java.awt.event.ItemEvent; import java.util.ArrayList; import java.util.Calendar; @@ -34,11 +32,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; - import javax.swing.JComboBox; import javax.swing.JOptionPane; import javax.swing.ListSelectionModel; - import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,6 +54,8 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import static org.nuiton.i18n.I18n._; + /** * Handler associated with financial transaction view. * Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-27 10:16:23 UTC (rev 3479) @@ -48,8 +48,7 @@ id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getFiscalPeriodTableModel()" columnControlVisible="true" - selectionModel='{model}' - /> + selectionModel='{model}'/> </JScrollPane> </cell> </row>

1 0

r3478 - in trunk: . lima-business
by echatellier＠users.chorem.org 26 Jun '12

26 Jun '12

Author: echatellier Date: 2012-06-26 18:10:22 +0200 (Tue, 26 Jun 2012) New Revision: 3478 Url: http://chorem.org/repositories/revision/lima/3478 Log: Add missing dependency Modified: trunk/lima-business/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) +++ trunk/lima-business/pom.xml 2012-06-26 16:10:22 UTC (rev 3478) @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox-example</artifactId> + <artifactId>pdfbox-examples</artifactId> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) +++ trunk/pom.xml 2012-06-26 16:10:22 UTC (rev 3478) @@ -226,7 +226,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox-example</artifactId> + <artifactId>pdfbox-examples</artifactId> <version>1.7.0</version> </dependency>

1 0

r3477 - in trunk: . lima-business
by echatellier＠users.chorem.org 26 Jun '12

26 Jun '12

Author: echatellier Date: 2012-06-26 18:05:11 +0200 (Tue, 26 Jun 2012) New Revision: 3477 Url: http://chorem.org/repositories/revision/lima/3477 Log: Add missing dependency Modified: trunk/lima-business/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-06-26 15:48:13 UTC (rev 3476) +++ trunk/lima-business/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) @@ -44,6 +44,10 @@ <artifactId>pdfbox</artifactId> </dependency> <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-example</artifactId> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-26 15:48:13 UTC (rev 3476) +++ trunk/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) @@ -224,6 +224,12 @@ <version>1.7.0</version> </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-example</artifactId> + <version>1.7.0</version> + </dependency> + </dependencies> </dependencyManagement>

1 0

r3476 - in trunk: . lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org 26 Jun '12

26 Jun '12

Author: echatellier Date: 2012-06-26 17:48:13 +0200 (Tue, 26 Jun 2012) New Revision: 3476 Url: http://chorem.org/repositories/revision/lima/3476 Log: Update topia and some other libs. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java trunk/pom.xml Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -88,7 +88,7 @@ protected List<Account> findIntervalAccountByNumber(String accountNumberLow, String accountNumberHigh) throws TopiaException { String query = "FROM " + Account.class.getName() + " WHERE :accountNumberLow <= accountNumber AND accountNumber <= :accountNumberHigh"; - return (List<Account>) context.find(query, "accountNumberLow", + return (List<Account>) context.findAll(query, "accountNumberLow", accountNumberLow, "accountNumberHigh", accountNumberHigh); } @@ -102,7 +102,7 @@ public List<Account> findAllSubAccounts(Account account) throws TopiaException { String query = "FROM " + Account.class.getName() + " a WHERE a.accountNumber LIKE concat(:accountNumber, '_%')"; - List<Account> accounts = context.find(query, "accountNumber", account.getAccountNumber()); + List<Account> accounts = context.findAll(query, "accountNumber", account.getAccountNumber()); return accounts; } @@ -165,7 +165,7 @@ String query = "FROM " + Account.class.getName() + " a WHERE NOT IN (" + "FROM " + Account.class.getName() + " b where b.accountNumber like a.accountNumber+'%')" + " AND a.accountNumber LIKE ?"; - List<Account> accountsResult = getContext().find(query, s); + List<Account> accountsResult = getContext().findAll(query, s); if (accountsResult != null) { //if first if (first) { Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -77,10 +77,10 @@ if (financialPeriod != null) { query += " AND financialPeriod = :financialPeriod"; //context.find(query, 0, 0, "entryBook", entryBook, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.findAll(query, "entryBook", entryBook, "financialPeriod", financialPeriod); } else { //context.find(query, 0, 0, "entryBook", entryBook); - closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook); + closedPeriodicEntryBooks = context.findAll(query, "entryBook", entryBook); } } else { if (financialPeriod != null) { @@ -88,7 +88,7 @@ } //context.find(query, 0, 0, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = context.find(query, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.findAll(query, "financialPeriod", financialPeriod); } // get only first one @@ -115,7 +115,7 @@ " WHERE :beginDate <= financialPeriod.beginDate " + " AND financialPeriod.beginDate <= :endDate" + " ORDER BY entryBook.code"; - return context.find(query, "beginDate", beginDate, "endDate", endDate); + return context.findAll(query, "beginDate", beginDate, "endDate", endDate); } /** @@ -135,7 +135,7 @@ " WHERE :beginDate <= financialPeriod.beginDate " + " AND financialPeriod.beginDate <= :endDate" + " AND entryBook = :entryBook"; - return context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + return context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } /** @@ -156,7 +156,7 @@ " AND financialPeriod.beginDate <= :endDate" + " AND entryBook = :entryBook" + " AND locked = true"; - return context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + return context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } /** @@ -172,7 +172,7 @@ " AND F.locked = false" + " ORDER BY C.financialPeriod.beginDate"; - List<ClosedPeriodicEntryBook> result = context.find(query); + List<ClosedPeriodicEntryBook> result = context.findAll(query); return result; } @@ -189,7 +189,7 @@ " AND F = :fiscalPeriod" + " ORDER BY C.financialPeriod.beginDate"; - List<ClosedPeriodicEntryBook> result = context.find(query, "fiscalPeriod", fiscalPeriod); + List<ClosedPeriodicEntryBook> result = context.findAll(query, "fiscalPeriod", fiscalPeriod); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -68,7 +68,7 @@ // concerne le compte " AND E.account = :account"; - List<Entry> entries = context.find(query, "beginDate", beginDate, + List<Entry> entries = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "account", account); return entries; } @@ -91,7 +91,7 @@ " AND E.account = :account" + " GROUP BY E.debit"; - List<Object[]> result = context.find(query, "beginDate", beginDate, + List<Object[]> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "account", account); return result; } @@ -113,7 +113,7 @@ // fix order " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction.topiaId"; - List<Entry> entries = context.find(query, "beginDate", beginDate, + List<Entry> entries = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return entries; } @@ -136,7 +136,7 @@ " AND E.financialTransaction.entryBook = :entryBook" + " GROUP BY E.debit"; - List<Object[]> result = context.find(query, "beginDate", beginDate, + List<Object[]> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } @@ -159,7 +159,7 @@ // concerne le journal " AND E.financialTransaction.entryBook = :entryBook"; - List<Entry> entries = context.find(query, "beginDate", beginDate, + List<Entry> entries = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return entries; } @@ -185,7 +185,7 @@ " AND E.financialTransaction.entryBook = :entryBook" + " GROUP BY E.debit"; - List<Object[]> result = context.find(query, "beginDate", beginDate, + List<Object[]> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -47,12 +47,8 @@ " AND :date <= endDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query, "date", date); - FinancialPeriod result = null; - if (!financialPeriod.isEmpty()) { - result = financialPeriod.get(0); - } - return result; + FinancialPeriod financialPeriod = (FinancialPeriod)context.findUnique(query, "date", date); + return financialPeriod; } /** @@ -71,7 +67,7 @@ " ORDER by beginDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query, "beginDate", beginDate, "endDate", endDate); + List<FinancialPeriod> financialPeriod = context.findAll(query, "beginDate", beginDate, "endDate", endDate); return financialPeriod; } @@ -86,7 +82,7 @@ " ORDER BY beginDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query); + List<FinancialPeriod> financialPeriod = context.findAll(query); return financialPeriod; } @@ -102,7 +98,7 @@ " ORDER BY beginDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query); + List<FinancialPeriod> financialPeriod = context.findAll(query); return financialPeriod; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -47,7 +47,7 @@ public List<FinancialStatement> findAllOrderedByCreateDate() throws TopiaException { String query = "FROM " + FinancialStatement.class.getName() + " ORDER BY " + FinancialStatement.TOPIA_CREATE_DATE; - List<FinancialStatement> result = context.find(query); + List<FinancialStatement> result = context.findAll(query); return result; } @@ -59,7 +59,7 @@ String query = "FROM " + FinancialStatement.class.getName() + " WHERE masterFinancialStatement = :masterFinancialStatement" + " ORDER BY " + FinancialStatement.TOPIA_CREATE_DATE; - List<FinancialStatement> result = context.find(query, "masterFinancialStatement", financialStatement); + List<FinancialStatement> result = context.findAll(query, "masterFinancialStatement", financialStatement); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -70,7 +70,7 @@ */ public long getCountByEntryBook(EntryBook entryBook) throws TopiaException { String query = "SELECT count(*) FROM " + FinancialTransaction.class.getName() + " t WHERE t.entryBook = :entryBook"; - Number count = (Number)context.find(query, "entryBook", entryBook).get(0); + Number count = (Number)context.findAll(query, "entryBook", entryBook).get(0); return count.longValue(); } @@ -87,7 +87,7 @@ " WHERE :beginDate <= T.transactionDate" + " AND T.transactionDate <= :endDate" + " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE; - List<FinancialTransaction> result = context.find(query, "beginDate", + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); return result; } @@ -107,7 +107,7 @@ " AND T.transactionDate <= :endDate" + " AND T.entryBook = :entryBook" + " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE; - List<FinancialTransaction> result = context.find(query, "beginDate", + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } @@ -133,9 +133,9 @@ List<FinancialTransaction> result = null; if (entryBook != null) { query += " AND T.entryBook = :entryBook"; - result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } else { - result = context.find(query, "beginDate", beginDate, "endDate", endDate); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); } return result; @@ -162,9 +162,9 @@ List<FinancialTransaction> result = null; if (entryBook != null) { query += " AND T.entryBook = :entryBook"; - result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } else { - result = context.find(query, "beginDate", beginDate, "endDate", endDate); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); } return result; @@ -201,9 +201,9 @@ List<FinancialTransaction> result = null; if (entryBook != null) { query += " AND T.entryBook = :entryBook"; - result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } else { - result = context.find(query, "beginDate", beginDate, "endDate", endDate); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); } return result; @@ -230,7 +230,7 @@ " AND T.entryBook = :entryBook" + " AND :beginDate <= T.transactionDate" + " AND T.transactionDate <= :endDate"; - List<FinancialTransaction> result = context.find(query, "beginDate", beginDate, + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } @@ -256,7 +256,7 @@ " AND entryBook = null" + " AND :beginDate <= T.transactionDate" + " AND T.transactionDate <= :endDate"; - List<FinancialTransaction> result = context.find(query, "beginDate", + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); return result; @@ -377,7 +377,7 @@ } // perform query - List<FinancialTransaction> result = context.find(query, args.toArray()); + List<FinancialTransaction> result = context.findAll(query, args.toArray()); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -67,7 +67,7 @@ String query = "FROM " + FiscalPeriod.class.getName() + " WHERE :financialPeriod in elements(financialPeriod)"; - List<FiscalPeriod> fiscalPeriods = context.find(query, "financialPeriod", financialPeriod); + List<FiscalPeriod> fiscalPeriods = context.findAll(query, "financialPeriod", financialPeriod); FiscalPeriod result = null; if (!fiscalPeriods.isEmpty()) { result = fiscalPeriods.get(0); @@ -85,7 +85,7 @@ String query = "FROM " + FiscalPeriod.class.getName() + " ORDER BY endDate desc"; - List<FiscalPeriod> fiscalPeriods = context.find(query); + List<FiscalPeriod> fiscalPeriods = context.findAll(query); FiscalPeriod result = null; if (!fiscalPeriods.isEmpty()) { result = fiscalPeriods.get(0); @@ -104,7 +104,7 @@ String query = "FROM " + FiscalPeriod.class.getName() + " ORDER BY endDate"; - List<FiscalPeriod> fiscalPeriods = context.find(query); + List<FiscalPeriod> fiscalPeriods = context.findAll(query); FiscalPeriod result = null; if (!fiscalPeriods.isEmpty()) { result = fiscalPeriods.get(0); @@ -123,12 +123,7 @@ " WHERE locked = false" + " ORDER BY endDate desc"; - List<FiscalPeriod> fiscalPeriods = context.find(query); - FiscalPeriod result = null; - if (!fiscalPeriods.isEmpty()) { - result = fiscalPeriods.get(0); - } - - return result; + FiscalPeriod fiscalPeriod = (FiscalPeriod)context.findUnique(query); + return fiscalPeriod; } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -48,7 +48,7 @@ public List<VatStatement> findAllOrderedByCreateDate() throws TopiaException { String query = "FROM " + VatStatement.class.getName() + " ORDER BY " + VatStatement.TOPIA_CREATE_DATE; - List<VatStatement> result = context.find(query); + List<VatStatement> result = context.findAll(query); return result; } @@ -63,7 +63,7 @@ String query = "FROM " + VatStatement.class.getName() + " WHERE masterVatStatement = :masterVatStatement" + " ORDER BY " + VatStatement.TOPIA_CREATE_DATE; - List<VatStatement> result = context.find(query, "masterVatStatement", masterVatStatement); + List<VatStatement> result = context.findAll(query, "masterVatStatement", masterVatStatement); return result; } @@ -79,7 +79,7 @@ public VatStatement findVatStatementByLabel(String label) throws TopiaException { String query = "FROM " + VatStatement.class.getName() + " WHERE label LIKE :label"; - List<VatStatement> statements = context.find(query, "label", "%" + label + "%"); + List<VatStatement> statements = context.findAll(query, "label", "%" + label + "%"); VatStatement result = null; if (!statements.isEmpty()) { result = statements.get(0); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/pom.xml 2012-06-26 15:48:13 UTC (rev 3476) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.2</version> + <version>3.3.3</version> </parent> <groupId>org.chorem</groupId> @@ -130,7 +130,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> - <version>6.0-3</version> + <version>6.0-4</version> <scope>runtime</scope> </dependency> @@ -172,7 +172,7 @@ <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> <scope>compile</scope> </dependency> @@ -221,7 +221,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>1.6.0</version> + <version>1.7.0</version> </dependency> </dependencies> @@ -324,13 +324,13 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.10</topiaVersion> + <topiaVersion>2.6.11</topiaVersion> <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> - <slf4jVersion>1.6.5</slf4jVersion> + <slf4jVersion>1.6.6</slf4jVersion>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r3475 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 25 Jun '12

25 Jun '12

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

1 0

r3474 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 25 Jun '12

25 Jun '12

Author: mallon Date: 2012-06-25 17:32:20 +0200 (Mon, 25 Jun 2012) New Revision: 3474 Url: http://chorem.org/repositories/revision/lima/3474 Log: Correction sur l'ajout d'une entr?\195?\169e via les deux boutons copier / coller. 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/FinancialTransactionViewHandler.java 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 2012-06-25 14:59:00 UTC (rev 3473) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-25 15:32:20 UTC (rev 3474) @@ -446,8 +446,7 @@ */ public void addRow(Object object, int newRow) { transactionAndEntries.add(newRow, object); - fireTableRowsInserted(newRow, newRow); - + fireTableRowsInserted(newRow, newRow); } /** 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 14:59:00 UTC (rev 3473) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 15:32:20 UTC (rev 3474) @@ -233,6 +233,7 @@ */ protected int addEntry(Entry entry, int row) { FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); + FinancialTransactionTable table = view.getFinancialTransactionTable(); FinancialTransaction currentTransaction = null; int financialTransactionRow = 0; Object currentRow = tableModel.getElementAt(row); @@ -257,8 +258,9 @@ //fireTableRowsUpdated(financialTransactionRow, financialTransactionRow + currentTransaction.getEntry().size() - 1); // on met a jour l'ui - int newRow = financialTransactionRow + currentTransaction.getEntry().size() + 1; + int newRow = financialTransactionRow + currentTransaction.getEntry().size() /*+ 1*/; tableModel.addRow(newEntry, newRow); + table.addRowSelectionInterval(newRow, newRow); return newRow; }

1 0

r3473 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 25 Jun '12

25 Jun '12

Author: mallon Date: 2012-06-25 16:59:00 +0200 (Mon, 25 Jun 2012) New Revision: 3473 Url: http://chorem.org/repositories/revision/lima/3473 Log: Correction portant sur la suppression d'une transaction vide (Sans entr?\195?\169es). D?\195?\169sormais, plus aucune erreur n'est g?\195?\169n?\195?\169r?\195?\169e, et la transaction est bien supprim?\195?\169e. Modified: 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/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 13:16:58 UTC (rev 3472) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 14:59:00 UTC (rev 3473) @@ -411,10 +411,12 @@ FinancialTransaction currentTransaction = (FinancialTransaction) selectedValue; //must delete the entries of the deleted transaction - Collection<Entry> entries = currentTransaction.getEntry(); - for (Entry entry : entries){ - tableModel.deleteRow(tableModel.indexOf(entry)); - } + Collection<Entry> entries = currentTransaction.getEntry(); + if (entries != null){ + for (Entry entry : entries){ + tableModel.deleteRow(tableModel.indexOf(entry)); + } + } financialTransactionService.removeFinancialTransaction(currentTransaction);

1 0