Lima-commits

Download

lima-commits@list.chorem.org

January 2014

3 participants
22 discussions

r3728 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/common java/org/chorem/lima/ui/financialperiod java/org/chorem/lima/ui/fiscalperiod resources/i18n resources/icons
by sbavencoff＠users.chorem.org 02 Jan '14

02 Jan '14

Author: sbavencoff Date: 2014-01-02 11:35:55 +0100 (Thu, 02 Jan 2014) New Revision: 3728 Url: http://chorem.org/projects/lima/repository/revisions/3728 Log: refactor financial period Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java trunk/lima-swing/src/main/resources/icons/action-financialPeriod-close.png Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-01-02 10:35:55 UTC (rev 3728) @@ -50,6 +50,11 @@ sort(); fireTableDataChanged(); } + + public void setValue(int row, E value) { + values.set(row, value); + fireTableRowsUpdated(row, row); + } public void addValue(E value) { int row = values.size(); Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java 2014-01-02 10:35:55 UTC (rev 3728) @@ -0,0 +1,29 @@ +package org.chorem.lima.ui.financialperiod; + +import org.chorem.lima.entity.ClosedPeriodicEntryBook; +import org.chorem.lima.ui.common.LineRenderer; + +import javax.swing.*; +import java.awt.*; + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public class FinancialPeriodRenderer extends LineRenderer { + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + + Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + + if (table.getModel() instanceof FinancialPeriodTableModel) { + FinancialPeriodTableModel model = (FinancialPeriodTableModel) table.getModel(); + ClosedPeriodicEntryBook closedPeriodicEntryBook = model.get(row); + if (!isSelected && closedPeriodicEntryBook.getLocked()) { + component.setForeground(new Color(222, 0, 0)); + } + } + return component; + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2014-01-02 10:35:55 UTC (rev 3728) @@ -25,21 +25,8 @@ package org.chorem.lima.ui.financialperiod; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; +import org.chorem.lima.ui.common.AbstractLimaTable; -import org.chorem.lima.entity.ClosedPeriodicEntryBook; -import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ColorHighlighter; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; -import org.jdesktop.swingx.decorator.HighlighterFactory; - /** * Financial period table adding color hidhlighter and key management. * @@ -49,101 +36,21 @@ * Last update : $Date$ * By : $Author$ */ -public class FinancialPeriodTable extends JXTable implements KeyListener, MouseListener { +public class FinancialPeriodTable extends AbstractLimaTable<FinancialPeriodViewHandler> { /** serialVersionUID. */ private static final long serialVersionUID = -1960326844433064178L; - protected FinancialPeriodViewHandler handler; - - protected FinancialPeriodTableModel model; - /** * Constructor, install highlighter. * * @param handler */ public FinancialPeriodTable(FinancialPeriodViewHandler handler) { - this.handler = handler; - model = handler.view.getFinancialPeriodTableModel(); + super(handler); - addKeyListener(this); - addMouseListener(this); + lineRenderer = new FinancialPeriodRenderer(); - //highlight financial financial transactions - addStripingColor(); - addBlockColor(); } - /** - * Color the background row in grey if the month number is even (pair in french) - */ - protected void addStripingColor() { - Highlighter colorTransaction = HighlighterFactory.createSimpleStriping(new Color(233,233,233)); - addHighlighter(colorTransaction); - } - - /** - * Color the font in red if period are closed - */ - protected void addBlockColor() { - HighlightPredicate predicate = new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, - ComponentAdapter adapter) { - ClosedPeriodicEntryBook closedPeriodicEntryBook = - (ClosedPeriodicEntryBook) model.getElementAt(adapter.row); - return closedPeriodicEntryBook.getLocked(); - } - }; - Highlighter colorTransaction = - new ColorHighlighter(predicate, null, new Color(222, 0, 0)); - addHighlighter(colorTransaction); - } - - @Override - public void mouseClicked(MouseEvent e) { - } - - @Override - public void mousePressed(MouseEvent e) { - if (rowAtPoint(e.getPoint()) == -1) { - clearSelection(); - } - } - - @Override - public void mouseReleased(MouseEvent e) { - } - - @Override - public void mouseEntered(MouseEvent e) { - } - - @Override - public void mouseExited(MouseEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - - /** - * for each action combination key are think - * for extend keyboard and laptop keyboard - */ - @Override - public void keyPressed(KeyEvent e) { - // clear row selection with the key: escape - if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { - if (!isEditing()) { - clearSelection(); - } - } - } - - @Override - public void keyReleased(KeyEvent e) { - } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2014-01-02 10:35:55 UTC (rev 3728) @@ -25,18 +25,16 @@ package org.chorem.lima.ui.financialperiod; -import static org.nuiton.i18n.I18n._; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.List; - -import javax.swing.table.AbstractTableModel; - import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.ui.common.AbstractColumn; +import org.chorem.lima.ui.common.AbstractLimaTableModel; +import java.util.Date; + +import static org.nuiton.i18n.I18n._; + /** * Financial period table model. * @@ -46,110 +44,53 @@ * Last update : $Date$ * By : $Author$ */ -public class FinancialPeriodTableModel extends AbstractTableModel { +public class FinancialPeriodTableModel extends AbstractLimaTableModel<ClosedPeriodicEntryBook> { /** serialVersionUID. */ private static final long serialVersionUID = 77027335135838258L; - /** Datas cache */ - protected List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks; - - public FinancialPeriodTableModel() { - - } - - /** - * Update model data list. - * - * @param closedPeriodicEntryBooks new data - */ - public void setClosedPeriodicEntryBooks(List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks) { - this.closedPeriodicEntryBooks = closedPeriodicEntryBooks; - fireTableDataChanged(); - } - @Override - public int getRowCount() { - int result = 0; - if (closedPeriodicEntryBooks != null) { - result = closedPeriodicEntryBooks.size(); - } - return result; - } + protected void initColumn() { - @Override - public int getColumnCount() { - return 3; - } + addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, _("lima.ui.financialperiod.begin"), false) { + @Override + public Object getValueAt(int row) { + ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); + FinancialPeriod financialPeriod = closedPeriodicEntryBook.getFinancialPeriod(); + return financialPeriod.getBeginDate(); + } + }); - @Override - public String getColumnName(int columnIndex) { + addColumn(new AbstractColumn<FinancialPeriodTableModel>(Date.class, _("lima.ui.financialperiod.end"), false) { + @Override + public Object getValueAt(int row) { + ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); + FinancialPeriod financialPeriod = closedPeriodicEntryBook.getFinancialPeriod(); + return financialPeriod.getEndDate(); + } + }); - String result = "n/a"; + addColumn(new AbstractColumn<FinancialPeriodTableModel>(EntryBook.class, _("lima.ui.financialperiod.entrybook"), false) { + @Override + public Object getValueAt(int row) { + ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); + return closedPeriodicEntryBook.getEntryBook(); + } + }); - switch (columnIndex) { - case 0: - result = _("lima.ui.financialperiod.period"); - break; - case 1: - result = _("lima.ui.financialperiod.entrybook"); - break; - case 2: - result = _("lima.ui.financialperiod.closure"); - break; - } - - return result; - } - - @Override - public Class<?> getColumnClass(int columnIndex) { - // both String - return String.class; - } - - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) { - return false; - } - - public ClosedPeriodicEntryBook getElementAt(int row) { - ClosedPeriodicEntryBook currentRow = closedPeriodicEntryBooks.get(row); - return currentRow; - } - - public void setElementAt(int row, ClosedPeriodicEntryBook closedPeriodicEntryBook) { - closedPeriodicEntryBooks.set(row, closedPeriodicEntryBook); - fireTableRowsUpdated(row, row); - } - - @Override - public Object getValueAt(int rowIndex, int columnIndex) { - Object result = null; - - ClosedPeriodicEntryBook closedPeriodicEntryBook = getElementAt(rowIndex); - - switch (columnIndex) { - case 0: - // FIXME echatellier 20120413 remove hardcoded french date format - DateFormat df = new SimpleDateFormat("dd MMM yyyy"); - FinancialPeriod financialPeriod = closedPeriodicEntryBook.getFinancialPeriod(); - result = df.format(financialPeriod.getBeginDate()) - + " - " + df.format(financialPeriod.getEndDate()); - break; - case 1: - EntryBook entryBook = closedPeriodicEntryBook.getEntryBook(); - result = entryBook.getCode() + " - " + entryBook.getLabel(); - break; - case 2: + addColumn(new AbstractColumn<FinancialPeriodTableModel>(String.class, _("lima.ui.financialperiod.status"), false) { + @Override + public Object getValueAt(int row) { + ClosedPeriodicEntryBook closedPeriodicEntryBook = tableModel.get(row); + String status = _("lima.common.open"); if (closedPeriodicEntryBook.getLocked()) { - result = _("lima.common.closed"); - } else { - result = _("lima.common.open"); + status = _("lima.common.closed"); } - break; - } + return status; + } + }); - return result; + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-01-02 10:35:55 UTC (rev 3728) @@ -30,6 +30,7 @@ org.chorem.lima.entity.FinancialPeriod org.chorem.lima.ui.financialperiod.FinancialPeriodTable org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel + static org.nuiton.i18n.I18n._ </import> <FinancialPeriodViewHandler id="handler" constructorParams="this"/> @@ -42,11 +43,27 @@ ]]></script> <row> + <cell fill="horizontal"> + <JToolBar floatable="false"> + + <JButton id="blockButton" + toolTipText="{ _("lima.ui.financialperiod.block") + " (Ctrl+C)"}" + actionIcon='financialPeriod-close' + onActionPerformed="handler.blockFinancialPeriod()" + enabled="{isSelectedPeriod()}"/> + + </JToolBar> + </cell> + </row> + + <row> <cell fill="both" weightx="1" weighty="1"> <JScrollPane> <FinancialPeriodTableModel id="financialPeriodTableModel"/> <FinancialPeriodTable - id="financialPeriodTable" sortable="false" rowHeight="24" + id="financialPeriodTable" + sortable="false" + rowHeight="24" constructorParams="getHandler()" model="{financialPeriodTableModel}" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" @@ -56,16 +73,5 @@ onValueChanged="setSelectedPeriod(financialPeriodTable.getSelectedRow() != -1)"/> </JScrollPane> </cell> - <cell fill="horizontal" weighty="1" anchor="north"> - <Table> - <row> - <cell> - <JButton text="lima.ui.financialperiod.block" - enabled="{isSelectedPeriod()}" - onActionPerformed="getHandler().blockFinancialPeriod();"/> - </cell> - </row> - </Table> - </cell> </row> </Table> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java 2014-01-02 10:35:55 UTC (rev 3728) @@ -25,13 +25,6 @@ package org.chorem.lima.ui.financialperiod; -import static org.nuiton.i18n.I18n._; - -import java.util.Collections; -import java.util.List; - -import javax.swing.JOptionPane; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.ServiceListener; @@ -43,6 +36,14 @@ import org.chorem.lima.service.LimaServiceFactory; import org.jdesktop.swingx.JXTable; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.util.Collections; +import java.util.List; + +import static org.nuiton.i18n.I18n._; + /** * Handler for FinancialPeriodView. * @@ -73,6 +74,20 @@ */ public void init() { + InputMap inputMap = view.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = view.getActionMap(); + + // add action on Ctrl + B + String binding = "close-FinancialPeriod"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + blockFinancialPeriod(); + } + }); + + // get data from service List<ClosedPeriodicEntryBook> closedPeriodicEntryBooks = financialPeriodService. getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod(); @@ -82,7 +97,7 @@ } // notify ui - view.getFinancialPeriodTableModel().setClosedPeriodicEntryBooks(closedPeriodicEntryBooks); + view.getFinancialPeriodTableModel().setValues(closedPeriodicEntryBooks); } /** @@ -94,14 +109,14 @@ FinancialPeriodTableModel model = (FinancialPeriodTableModel) view.getFinancialPeriodTable().getModel(); // blocked it - ClosedPeriodicEntryBook closedPeriodicEntryBook = model.getElementAt(selectedRow); + ClosedPeriodicEntryBook closedPeriodicEntryBook = model.get(selectedRow); int response = JOptionPane.showConfirmDialog(view, _("lima.ui.financialperiod.blockmessage"), _("lima.ui.financialperiod.blocktitle"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (response == JOptionPane.YES_OPTION) { closedPeriodicEntryBook = financialPeriodService.blockClosedPeriodicEntryBook(closedPeriodicEntryBook); - model.setElementAt(selectedRow, closedPeriodicEntryBook); + model.setValue(selectedRow, closedPeriodicEntryBook); } } 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 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2014-01-02 10:35:55 UTC (rev 3728) @@ -52,7 +52,7 @@ onActionPerformed="handler.addFiscalPeriod()"/> <JButton id="blockButton" - toolTipText="{ _("lima.charts.fiscalperiod.block") + " (Ctrl+C)"}" + toolTipText="{ _("lima.charts.fiscalperiod.block") + " (Ctrl+B)"}" actionIcon='fiscalPeriod-close' onActionPerformed="handler.blockFiscalPeriod()" enabled="{isBlockEnabled()}"/> Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-01-02 10:35:55 UTC (rev 3728) @@ -289,12 +289,15 @@ lima.ui.entrybook.label= lima.ui.entrybook.remove= lima.ui.entrybook.update= +lima.ui.financialperiod.begin= lima.ui.financialperiod.block= lima.ui.financialperiod.blockmessage= lima.ui.financialperiod.blocktitle= lima.ui.financialperiod.closure= +lima.ui.financialperiod.end= lima.ui.financialperiod.entrybook= lima.ui.financialperiod.period= +lima.ui.financialperiod.status= lima.ui.financialtransaction.account= lima.ui.financialtransaction.balance= lima.ui.financialtransaction.buttonback= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-01-02 09:41:08 UTC (rev 3727) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-01-02 10:35:55 UTC (rev 3728) @@ -279,12 +279,15 @@ lima.ui.entrybook.label=Libellé lima.ui.entrybook.remove=Supprimer lima.ui.entrybook.update=Modifier +lima.ui.financialperiod.begin=Début lima.ui.financialperiod.block=Cloturer une période lima.ui.financialperiod.blockmessage=Êtes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \! lima.ui.financialperiod.blocktitle=Clôture lima.ui.financialperiod.closure=Clôture +lima.ui.financialperiod.end=Fin lima.ui.financialperiod.entrybook=Journal lima.ui.financialperiod.period=Période +lima.ui.financialperiod.status=Statut lima.ui.financialtransaction.account=Compte lima.ui.financialtransaction.balance=Balance lima.ui.financialtransaction.buttonback=← Copied: trunk/lima-swing/src/main/resources/icons/action-financialPeriod-close.png (from rev 3727, trunk/lima-swing/src/main/resources/icons/action-fiscalPeriod-close.png) =================================================================== (Binary files differ)

1 0

r3727 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: common entrybook financialtransaction financialtransactionsearch financialtransactionunbalanced fiscalperiod lettering
by sbavencoff＠users.chorem.org 02 Jan '14

02 Jan '14

Author: sbavencoff Date: 2014-01-02 10:41:08 +0100 (Thu, 02 Jan 2014) New Revision: 3727 Url: http://chorem.org/projects/lima/repository/revisions/3727 Log: change columns management (renderer, edito, class, name, editable, ...) Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/DefaultColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/CodeColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/LabelColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/BeginColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EndColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/StatusColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AccountColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/CreditColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DateColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DebitColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DescriptionColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/VoucherColumn.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/Column.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/LetterColumn.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.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/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java Copied: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java (from rev 3726, trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/DefaultColumn.java) =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -0,0 +1,84 @@ +package org.chorem.lima.ui.common; + +/* + * #%L + * Lima :: Swing + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 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% + */ + +/** + * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> + */ +public abstract class AbstractColumn<T extends AbstractLimaTableModel> implements Column<T> { + + protected T tableModel; + + protected Class<?> columnClass; + + protected String columnName; + + protected boolean editable; + + public AbstractColumn(Class<?> columnClass, String columnName, boolean editable) { + this.columnClass = columnClass; + this.columnName = columnName; + this.editable = editable; + } + + public Class<?> getColumnClass() { + return columnClass; + } + + @Override + public void setTableModel(T tableModel) { + this.tableModel = tableModel; + } + + @Override + public boolean isCellEditable(int row) { + return editable; + } + + @Override + public boolean setValueAt(Object value, int row) { + return false; + } + + public void setColumnClass(Class<?> columnClass) { + this.columnClass = columnClass; + } + + public String getColumnName() { + return columnName; + } + + public void setColumnName(String columnName) { + this.columnName = columnName; + } + + public boolean isEditable() { + return editable; + } + + public void setEditable(boolean editable) { + this.editable = editable; + } +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -2,7 +2,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.Account; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.AccountTableCellRenderer; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer; +import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.DefaultLimaTableCellRenderer; +import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; +import org.chorem.lima.ui.celleditor.EntryBookTableCellRender; +import org.chorem.lima.ui.celleditor.StringTableCellEditor; import org.jdesktop.swingx.JXTable; import javax.swing.*; @@ -13,6 +24,8 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.math.BigDecimal; +import java.util.Date; /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> @@ -38,8 +51,19 @@ addMouseListener(new MyMouseAdapter()); + // renderer setDefaultRenderer(Object.class, new DefaultLimaTableCellRenderer()); + setDefaultRenderer(Date.class, new DateLimaTableCellRenderer()); + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + setDefaultRenderer(Account.class, new AccountTableCellRenderer()); + setDefaultRenderer(EntryBook.class, new EntryBookTableCellRender()); + // editor + setDefaultEditor(Date.class, new DateTableCellEditor()); + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + setDefaultEditor(Account.class, new AccountTableCellEditor()); + setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); + setDefaultEditor(String.class, new StringTableCellEditor()); } protected void initNavigation() { @@ -65,29 +89,15 @@ @Override public TableCellRenderer getCellRenderer(int row, int column) { - TableCellRenderer renderer; + TableCellRenderer renderer = super.getCellRenderer(row, column); if (lineRenderer != null) { + lineRenderer.setCellRenderer(renderer); renderer = lineRenderer; - } else { - renderer = super.getCellRenderer(row, column); } - return renderer; } - @Override - public TableCellEditor getCellEditor(int row, int column) { - TableCellEditor editor; - AbstractLimaTableModel tableModel = (AbstractLimaTableModel) getModel(); - Column columnTable = tableModel.getColumn(column); - editor = columnTable.getCellEditor(row); - if (editor == null) { - editor = super.getCellEditor(row, column); - } - return editor; - } - public void exit() { if (isEditing()) { TableCellEditor editor = getCellEditor(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/Column.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/Column.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/Column.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -24,9 +24,6 @@ * #L% */ -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ @@ -42,9 +39,5 @@ public boolean setValueAt(Object value, int row); - public TableCellRenderer getCellRenderer(int row); - - public TableCellEditor getCellEditor(int row); - public void setTableModel(T tableModel); } Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/DefaultColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/DefaultColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/DefaultColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,65 +0,0 @@ -package org.chorem.lima.ui.common; - -/* - * #%L - * Lima :: Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2013 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% - */ - -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public abstract class DefaultColumn<T extends AbstractLimaTableModel> implements Column<T> { - - protected T tableModel; - - protected TableCellRenderer renderer; - - protected TableCellEditor editor; - - @Override - public void setTableModel(T tableModel) { - this.tableModel = tableModel; - } - - @Override - public TableCellRenderer getCellRenderer(int row) { - return renderer; - } - - @Override - public TableCellEditor getCellEditor(int row) { - return editor; - } - - @Override - public boolean isCellEditable(int row) { - return false; - } - - @Override - public boolean setValueAt(Object value, int row) { - return false; - } -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -35,7 +35,6 @@ public FinancialTransactionTableModel() { - setComparator(new EntryComparator()); financialTransactionService = Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -11,18 +11,17 @@ */ public class LineRenderer extends DefaultLimaTableCellRenderer { + protected TableCellRenderer cellRenderer; + + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - AbstractLimaTableModel tableModel = (AbstractLimaTableModel) table.getModel(); - Column columnTable = tableModel.getColumn(column); - TableCellRenderer renderer = columnTable.getCellRenderer(row); - Component component; - if (renderer != null) { + if (cellRenderer != null) { - component = renderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + component = cellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); } else { @@ -35,4 +34,11 @@ } + public TableCellRenderer getCellRenderer() { + return cellRenderer; + } + + public void setCellRenderer(TableCellRenderer cellRenderer) { + this.cellRenderer = cellRenderer; + } } Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/CodeColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/CodeColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/CodeColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,26 +0,0 @@ -package org.chorem.lima.ui.entrybook; - -import org.chorem.lima.ui.common.DefaultColumn; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class CodeColumn extends DefaultColumn<EntryBookTableModel> { - - @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.entrybook.code"); - } - - @Override - public Object getValueAt(int row) { - return tableModel.get(row).getCode(); - } -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -26,8 +26,11 @@ package org.chorem.lima.ui.entrybook; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.AbstractLimaTableModel; +import static org.nuiton.i18n.I18n._; + /** * Entry book table model only rendering entry book list. * @@ -45,8 +48,18 @@ @Override protected void initColumn() { - addColumn(new CodeColumn()); - addColumn(new LabelColumn()); + addColumn(new AbstractColumn<EntryBookTableModel>(String.class, _("lima.ui.entrybook.code"), false) { + @Override + public Object getValueAt(int row) { + return tableModel.get(row).getCode(); + } + }); + addColumn(new AbstractColumn<EntryBookTableModel>(String.class, _("lima.ui.entrybook.label"), false) { + @Override + public Object getValueAt(int row) { + return tableModel.get(row).getLabel(); + } + }); } public void updateEntryBook(EntryBook entryBook) { Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/LabelColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/LabelColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/LabelColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,28 +0,0 @@ -package org.chorem.lima.ui.entrybook; - -import org.chorem.lima.ui.common.DefaultColumn; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class LabelColumn extends DefaultColumn<EntryBookTableModel> { - - @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.entrybook.label"); - } - - @Override - public Object getValueAt(int row) { - return tableModel.get(row).getLabel(); - } - - -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -26,9 +26,7 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.AccountTableCellEditor; -import org.chorem.lima.ui.celleditor.AccountTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import static org.nuiton.i18n.I18n._; @@ -36,35 +34,19 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class AccountColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class AccountColumn extends AbstractColumn<FinancialTransactionTableModel> { public AccountColumn() { - renderer = new AccountTableCellRenderer(); - editor = new AccountTableCellEditor(); + super(Account.class, _("lima.ui.financialtransaction.account"), true); } @Override - public Class<?> getColumnClass() { - return Account.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.financialtransaction.account"); - } - - @Override public Object getValueAt(int row) { Entry entry = tableModel.get(row); return entry.getAccount(); } @Override - public boolean isCellEditable(int row) { - return true; - } - - @Override public boolean setValueAt(Object value, int row) { Entry entry = tableModel.get(row); Account account = (Account) value; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -25,8 +25,7 @@ */ import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import java.math.BigDecimal; @@ -36,24 +35,13 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class BalanceColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class BalanceColumn extends AbstractColumn<FinancialTransactionTableModel> { - public BalanceColumn() { - renderer = new BigDecimalTableCellRenderer(); + super(BigDecimal.class, _("lima.table.balance"), false); } @Override - public Class<?> getColumnClass() { - return BigDecimal.class; - } - - @Override - public String getColumnName() { - return _("lima.table.balance"); - } - - @Override public Object getValueAt(int row) { BigDecimal result; FinancialTransaction transaction = tableModel.getTransactionAt(row); @@ -64,14 +52,4 @@ } return result; } - - @Override - public boolean isCellEditable(int row) { - return false; - } - - @Override - public boolean setValueAt(Object value, int row) { - return false; - } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/CreditColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -25,9 +25,7 @@ */ import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import java.math.BigDecimal; @@ -37,35 +35,19 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class CreditColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class CreditColumn extends AbstractColumn<FinancialTransactionTableModel> { public CreditColumn() { - renderer = new BigDecimalTableCellRenderer(); - editor = new BigDecimalTableCellEditor(); + super(BigDecimal.class, _("lima.ui.financialtransaction.credit"), true); } @Override - public Class<?> getColumnClass() { - return BigDecimal.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.financialtransaction.credit"); - } - - @Override public Object getValueAt(int row) { Entry entry = tableModel.get(row); return entry.getDebit() ? BigDecimal.ZERO : entry.getAmount(); } @Override - public boolean isCellEditable(int row) { - return true; - } - - @Override public boolean setValueAt(Object value, int row) { Entry entry = tableModel.get(row); BigDecimal credit= (BigDecimal) value; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DateColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -26,9 +26,7 @@ import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.ui.celleditor.DateTableCellEditor; -import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import java.util.Date; @@ -38,25 +36,13 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class DateColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class DateColumn extends AbstractColumn<FinancialTransactionTableModel> { - - public DateColumn() { - renderer = new DateLimaTableCellRenderer(); - editor = new DateTableCellEditor(); + public DateColumn(){ + super(Date.class, _("lima.ui.financialtransaction.date"), true); } @Override - public Class<?> getColumnClass() { - return Date.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.financialtransaction.date"); - } - - @Override public Object getValueAt(int row) { Date result; Entry entry = tableModel.get(row); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DebitColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -25,9 +25,7 @@ */ import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import java.math.BigDecimal; @@ -37,35 +35,19 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class DebitColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class DebitColumn extends AbstractColumn<FinancialTransactionTableModel> { public DebitColumn() { - renderer = new BigDecimalTableCellRenderer(); - editor = new BigDecimalTableCellEditor(); + super(BigDecimal.class, _("lima.ui.financialtransaction.debit"), true); } @Override - public Class<?> getColumnClass() { - return BigDecimal.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.financialtransaction.debit"); - } - - @Override public Object getValueAt(int row) { Entry entry = tableModel.get(row); return entry.getDebit() ? entry.getAmount() : BigDecimal.ZERO; } @Override - public boolean isCellEditable(int row) { - return true; - } - - @Override public boolean setValueAt(Object value, int row) { Entry entry = tableModel.get(row); BigDecimal debit = (BigDecimal) value; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/DescriptionColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -25,8 +25,7 @@ */ import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.StringTableCellEditor; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import static org.nuiton.i18n.I18n._; @@ -34,34 +33,18 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class DescriptionColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class DescriptionColumn<T extends FinancialTransactionTableModel> extends AbstractColumn<T> { public DescriptionColumn() { - editor = new StringTableCellEditor(); + super(String.class, _("lima.ui.financialtransaction.description"), true); } - @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.financialtransaction.description"); - } - - @Override public Object getValueAt(int row) { Entry entry = tableModel.get(row); return entry.getDescription(); } @Override - public boolean isCellEditable(int row) { - return true; - } - - @Override public boolean setValueAt(Object value, int row) { Entry entry = tableModel.get(row); String description = ((String) value).trim(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/EntryBookColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -27,9 +27,7 @@ import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; -import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; -import org.chorem.lima.ui.celleditor.EntryBookTableCellRender; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import static org.nuiton.i18n.I18n._; @@ -37,25 +35,13 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class EntryBookColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class EntryBookColumn extends AbstractColumn<FinancialTransactionTableModel> { - public EntryBookColumn() { - renderer = new EntryBookTableCellRender(); - editor = new EntryBookTableCellEditor(); + super(EntryBook.class, _("lima.table.entrybook"), true); } @Override - public Class<?> getColumnClass() { - return EntryBook.class; - } - - @Override - public String getColumnName() { - return _("lima.table.entrybook"); - } - - @Override public Object getValueAt(int row) { EntryBook result; Entry entry = tableModel.get(row); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/LetterColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/LetterColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/LetterColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -25,8 +25,7 @@ */ import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.StringTableCellEditor; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import static org.nuiton.i18n.I18n._; @@ -34,34 +33,19 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class LetterColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class LetterColumn extends AbstractColumn<FinancialTransactionTableModel> { public LetterColumn() { - editor = new StringTableCellEditor(); + super(String.class, _("lima.table.letter"), true); } @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.table.letter"); - } - - @Override public Object getValueAt(int row) { Entry entry = tableModel.get(row); return entry.getLettering(); } @Override - public boolean isCellEditable(int row) { - return true; - } - - @Override public boolean setValueAt(Object value, int row) { Entry entry = tableModel.get(row); String letter = ((String) value).trim(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/VoucherColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -25,8 +25,7 @@ */ import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.StringTableCellEditor; -import org.chorem.lima.ui.common.DefaultColumn; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; import static org.nuiton.i18n.I18n._; @@ -34,34 +33,19 @@ /** * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> */ -public class VoucherColumn extends DefaultColumn<FinancialTransactionTableModel> { +public class VoucherColumn extends AbstractColumn<FinancialTransactionTableModel> { public VoucherColumn() { - editor = new StringTableCellEditor(); + super(String.class, _("lima.ui.financialtransaction.voucher"), true); } @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.financialtransaction.voucher"); - } - - @Override public Object getValueAt(int row) { Entry entry = tableModel.get(row); return entry.getVoucher(); } @Override - public boolean isCellEditable(int row) { - return true; - } - - @Override public boolean setValueAt(Object value, int row) { Entry entry = tableModel.get(row); String voucher = ((String) value).trim(); 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 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -87,7 +87,8 @@ setTransactions(transactions); } - protected void initColumns() { + @Override + protected void initColumn() { addColumn(new DateColumn()); addColumn(new EntryBookColumn()); addColumn(new VoucherColumn()); 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 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -57,7 +57,8 @@ /** selected financial period */ protected FiscalPeriod selectedFiscalPeriod; - protected void initColumns() { + @Override + protected void initColumn() { addColumn(new DateColumn()); addColumn(new EntryBookColumn()); addColumn(new VoucherColumn()); Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/BeginColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/BeginColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/BeginColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,35 +0,0 @@ -package org.chorem.lima.ui.fiscalperiod; - -import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; - -import java.util.Date; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class BeginColumn extends DefaultColumn<FiscalPeriodTableModel> { - - public BeginColumn() { - renderer = new DateLimaTableCellRenderer(); - } - - @Override - public Class<?> getColumnClass() { - return Date.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.fiscalperiod.begin"); - } - - @Override - public Object getValueAt(int row) { - FiscalPeriod fiscalPeriod = tableModel.get(row); - return fiscalPeriod.getBeginDate(); - } -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EndColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EndColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/EndColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,34 +0,0 @@ -package org.chorem.lima.ui.fiscalperiod; - -import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; - -import java.util.Date; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class EndColumn extends DefaultColumn<FiscalPeriodTableModel> { - - public EndColumn() { - renderer = new DateLimaTableCellRenderer(); - } - @Override - public Class<?> getColumnClass() { - return Date.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.fiscalperiod.end"); - } - - @Override - public Object getValueAt(int row) { - FiscalPeriod fiscalPeriod = tableModel.get(row); - return fiscalPeriod.getEndDate(); - } -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -28,8 +28,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.AbstractLimaTableModel; +import java.util.Date; + +import static org.nuiton.i18n.I18n._; + /** * Modele de Fiscal period (rendu de list) * @@ -48,8 +53,33 @@ @Override protected void initColumn() { - addColumn(new BeginColumn()); - addColumn(new EndColumn()); - addColumn(new StatusColumn()); + addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, _("lima.ui.fiscalperiod.begin"), false) { + @Override + public Object getValueAt(int row) { + FiscalPeriod fiscalPeriod = tableModel.get(row); + return fiscalPeriod.getBeginDate(); + } + }); + + addColumn(new AbstractColumn<FiscalPeriodTableModel>(Date.class, _("lima.ui.fiscalperiod.end"), false) { + @Override + public Object getValueAt(int row) { + FiscalPeriod fiscalPeriod = tableModel.get(row); + return fiscalPeriod.getEndDate(); + } + }); + + addColumn(new AbstractColumn<FiscalPeriodTableModel>(String.class, _("lima.ui.fiscalperiod.status"), false) { + @Override + public Object getValueAt(int row) { + FiscalPeriod fiscalPeriod = tableModel.get(row); + String status = _("lima.ui.fiscalperiod.open"); + if (fiscalPeriod.getLocked()) { + status = _("lima.ui.fiscalperiod.closed"); + } + return status; + } + + }); } } Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/StatusColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/StatusColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/StatusColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,33 +0,0 @@ -package org.chorem.lima.ui.fiscalperiod; - -import org.chorem.lima.entity.FiscalPeriod; -import org.chorem.lima.ui.common.DefaultColumn; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class StatusColumn extends DefaultColumn<FiscalPeriodTableModel> { - - @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.fiscalperiod.status"); - } - - @Override - public Object getValueAt(int row) { - FiscalPeriod fiscalPeriod = tableModel.get(row); - String status = _("lima.ui.fiscalperiod.open"); - if (fiscalPeriod.getLocked()) { - status = _("lima.ui.fiscalperiod.closed"); - } - return status; - } - -} \ No newline at end of file Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AccountColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AccountColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AccountColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,58 +0,0 @@ -package org.chorem.lima.ui.lettering; - -/* - * #%L - * Lima :: Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2013 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% - */ - -import org.chorem.lima.entity.Account; -import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.AccountTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class AccountColumn extends DefaultColumn<LetteringTableModel> { - - public AccountColumn() { - renderer = new AccountTableCellRenderer(); - } - - @Override - public Class<?> getColumnClass() { - return Account.class; - } - - @Override - public String getColumnName() { - return _("lima.table.account"); - } - - @Override - public Object getValueAt(int row) { - Entry entry = tableModel.get(row); - return entry.getAccount(); - } -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/CreditColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/CreditColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/CreditColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,59 +0,0 @@ -package org.chorem.lima.ui.lettering; - -/* - * #%L - * Lima :: Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2013 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% - */ - -import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; - -import java.math.BigDecimal; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class CreditColumn extends DefaultColumn<LetteringTableModel> { - - public CreditColumn() { - renderer = new BigDecimalTableCellRenderer(); - } - - @Override - public Class<?> getColumnClass() { - return BigDecimal.class; - } - - @Override - public String getColumnName() { - return _("lima.table.credit"); - } - - @Override - public Object getValueAt(int row) { - Entry entry = tableModel.get(row); - return entry.getDebit() ? BigDecimal.ZERO : entry.getAmount(); - } -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DateColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DateColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DateColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,35 +0,0 @@ -package org.chorem.lima.ui.lettering; - -import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; - -import java.util.Date; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class DateColumn extends DefaultColumn<LetteringTableModel> { - - public DateColumn() { - renderer = new DateLimaTableCellRenderer(); - } - - @Override - public Class<?> getColumnClass() { - return Date.class; - } - - @Override - public String getColumnName() { - return _("lima.table.date"); - } - - @Override - public Object getValueAt(int row) { - Entry entry = tableModel.get(row); - return entry.getFinancialTransaction().getTransactionDate(); - } -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DebitColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DebitColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DebitColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,59 +0,0 @@ -package org.chorem.lima.ui.lettering; - -/* - * #%L - * Lima :: Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2013 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% - */ - -import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; -import org.chorem.lima.ui.common.DefaultColumn; - -import java.math.BigDecimal; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class DebitColumn extends DefaultColumn<LetteringTableModel> { - - public DebitColumn() { - renderer = new BigDecimalTableCellRenderer(); - } - - @Override - public Class<?> getColumnClass() { - return BigDecimal.class; - } - - @Override - public String getColumnName() { - return _("lima.table.debit"); - } - - @Override - public Object getValueAt(int row) { - Entry entry = tableModel.get(row); - return entry.getDebit() ? entry.getAmount() : BigDecimal.ZERO; - } -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DescriptionColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DescriptionColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/DescriptionColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,53 +0,0 @@ -package org.chorem.lima.ui.lettering; - -/* - * #%L - * Lima :: Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2013 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% - */ - -import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.common.DefaultColumn; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class DescriptionColumn extends DefaultColumn<LetteringTableModel> { - - @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.ui.financialtransaction.description"); - } - - @Override - public Object getValueAt(int row) { - Entry entry = tableModel.get(row); - return entry.getDescription(); - } - -} Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetterColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,52 +0,0 @@ -package org.chorem.lima.ui.lettering; - -/* - * #%L - * Lima :: Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2013 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% - */ - -import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.common.DefaultColumn; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class LetterColumn extends DefaultColumn<LetteringTableModel> { - - @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.table.letter"); - } - - @Override - public Object getValueAt(int row) { - Entry entry = tableModel.get(row); - return entry.getLettering(); - } -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -25,9 +25,16 @@ package org.chorem.lima.ui.lettering; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.AbstractLimaTableModel; +import java.math.BigDecimal; +import java.util.Date; + +import static org.nuiton.i18n.I18n._; + /** * Basic transaction table model. * <p/> @@ -42,13 +49,62 @@ @Override protected void initColumn() { - addColumn(new DateColumn()); - addColumn(new AccountColumn()); - addColumn(new VoucherColumn()); - addColumn(new DescriptionColumn()); - addColumn(new LetterColumn()); - addColumn(new DebitColumn()); - addColumn(new CreditColumn()); + addColumn(new AbstractColumn<LetteringTableModel>(Date.class, _("lima.table.date"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getFinancialTransaction().getTransactionDate(); + } + }); + + addColumn(new AbstractColumn<LetteringTableModel>(Account.class, _("lima.table.account"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getAccount(); + } + }); + + addColumn(new AbstractColumn<LetteringTableModel>(String.class, _("lima.table.voucher"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getVoucher(); + } + }); + + addColumn(new AbstractColumn<LetteringTableModel>(String.class, _("lima.table.description"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getDescription(); + } + }); + + addColumn(new AbstractColumn<LetteringTableModel>(String.class, _("lima.table.letter"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getLettering(); + } + }); + + addColumn(new AbstractColumn<LetteringTableModel>(BigDecimal.class, _("lima.table.debit"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getDebit() ? entry.getAmount() : BigDecimal.ZERO; + } + }); + + addColumn(new AbstractColumn<LetteringTableModel>(BigDecimal.class, _("lima.table.credit"), false) { + @Override + public Object getValueAt(int row) { + Entry entry = tableModel.get(row); + return entry.getDebit() ? BigDecimal.ZERO : entry.getAmount(); + } + }); + } } Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/VoucherColumn.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/VoucherColumn.java 2013-12-31 16:45:49 UTC (rev 3726) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/VoucherColumn.java 2014-01-02 09:41:08 UTC (rev 3727) @@ -1,52 +0,0 @@ -package org.chorem.lima.ui.lettering; - -/* - * #%L - * Lima :: Swing - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2013 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% - */ - -import org.chorem.lima.entity.Entry; -import org.chorem.lima.ui.common.DefaultColumn; - -import static org.nuiton.i18n.I18n._; - -/** - * @author Sylvain Bavencoff <bavencoff(a)codelutin.com> - */ -public class VoucherColumn extends DefaultColumn<LetteringTableModel> { - - @Override - public Class<?> getColumnClass() { - return String.class; - } - - @Override - public String getColumnName() { - return _("lima.table.voucher"); - } - - @Override - public Object getValueAt(int row) { - Entry entry = tableModel.get(row); - return entry.getVoucher(); - } -}

1 0