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

r3138 - in trunk/lima-swing/src/main/java/org/chorem/lima: ui/importexport util
by vsalaun＠users.chorem.org May 20, 2011

May 20, 2011

Author: vsalaun Date: 2011-05-20 16:29:19 +0200 (Fri, 20 May 2011) New Revision: 3138 Url: http://chorem.org/repositories/revision/lima/3138 Log: #359 correction sur le type de message lors de l'import/export Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2011-05-20 14:26:33 UTC (rev 3137) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2011-05-20 14:29:19 UTC (rev 3138) @@ -46,6 +46,7 @@ import javax.swing.JComboBox; import javax.swing.JFileChooser; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SwingWorker; @@ -188,10 +189,18 @@ } else { if (importMode){ - DialogHelper.showMessageDialog(_("lima.importexport.import.terminated")); + JOptionPane.showMessageDialog( + waitView, + _("lima.importexport.import.terminated"), + _("lima.importexport.import"), + JOptionPane.INFORMATION_MESSAGE); } else { - DialogHelper.showMessageDialog(_("lima.importexport.export.terminated")); + JOptionPane.showMessageDialog( + waitView, + _("lima.importexport.export.terminated"), + _("lima.importexport.export"), + JOptionPane.INFORMATION_MESSAGE); } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2011-05-20 14:26:33 UTC (rev 3137) +++ trunk/lima-swing/src/main/java/org/chorem/lima/util/DialogHelper.java 2011-05-20 14:29:19 UTC (rev 3138) @@ -50,6 +50,7 @@ response[0]); //default button title } + /** @deprecated */ public static void showMessageDialog(String message) { JFrame f = new JFrame(); f.setIconImage(Resource.getIcon("icons/lima.png").getImage());

1 0

r3137 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: account combobox financialstatementchart fiscalperiod lettering
by vsalaun＠users.chorem.org May 20, 2011

May 20, 2011

Author: vsalaun Date: 2011-05-20 16:26:33 +0200 (Fri, 20 May 2011) New Revision: 3137 Url: http://chorem.org/repositories/revision/lima/3137 Log: #395 correction du bug dans les JDialog lors de la fermeture Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2011-05-20 14:24:39 UTC (rev 3136) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2011-05-20 14:26:33 UTC (rev 3137) @@ -26,6 +26,8 @@ package org.chorem.lima.ui.account; import static org.nuiton.i18n.I18n._; + +import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; @@ -87,6 +89,7 @@ // jaxx constructor don't call super() ? accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); + accountForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action newAccount = accountForm.getAccount(); @@ -133,6 +136,7 @@ // jaxx constructor don't call super() ? subledgerForm.setLocationRelativeTo(view); subledgerForm.setVisible(true); + subledgerForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); newAccount=subledgerForm.getAccount(); // null == cancel action @@ -189,6 +193,7 @@ // jaxx constructor don't call super() ? accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); + accountForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedObject = accountForm.getAccount(); } @@ -199,6 +204,7 @@ // jaxx constructor don't call super() ? subLedgerForm.setLocationRelativeTo(view); subLedgerForm.setVisible(true); + subLedgerForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedObject = subLedgerForm.getAccount(); } @@ -276,6 +282,7 @@ // form.setLocationRelativeTo(view); form.setVisible(true); + form.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); ImportExport importExport = ImportExport.getInstance(view); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-20 14:24:39 UTC (rev 3136) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-20 14:26:33 UTC (rev 3137) @@ -171,7 +171,6 @@ public void refresh(){ datasCache = getDataList(); - System.out.println(datasCache); fireContentsChanged(this, 0, datasCache.size()); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-05-20 14:24:39 UTC (rev 3136) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-05-20 14:26:33 UTC (rev 3137) @@ -26,6 +26,8 @@ package org.chorem.lima.ui.financialstatementchart; import static org.nuiton.i18n.I18n._; + +import javax.swing.JDialog; import javax.swing.JOptionPane; import javax.swing.tree.TreePath; import org.apache.commons.logging.Log; @@ -92,6 +94,7 @@ // jaxx constructor don't call super() ? financialStatementHeaderForm.setLocationRelativeTo(view); financialStatementHeaderForm.setVisible(true); + financialStatementHeaderForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action newFinancialStatementHeader = financialStatementHeaderForm.getFinancialStatement(); @@ -140,6 +143,7 @@ // jaxx constructor don't call super() ? financialStatementMovementForm.setLocationRelativeTo(view); financialStatementMovementForm.setVisible(true); + financialStatementMovementForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); newFinancialStatementMovement=financialStatementMovementForm.getFinancialStatement(); // null == cancel action @@ -200,6 +204,7 @@ // jaxx constructor don't call super() ? financialStatementHeaderForm.setLocationRelativeTo(view); financialStatementHeaderForm.setVisible(true); + financialStatementHeaderForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action financialStatement = financialStatementHeaderForm.getFinancialStatement(); } @@ -211,6 +216,7 @@ // jaxx constructor don't call super() ? financialStatementMovementForm.setLocationRelativeTo(view); financialStatementMovementForm.setVisible(true); + financialStatementMovementForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action financialStatement = financialStatementMovementForm.getFinancialStatement(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2011-05-20 14:24:39 UTC (rev 3136) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2011-05-20 14:26:33 UTC (rev 3137) @@ -26,6 +26,8 @@ package org.chorem.lima.ui.fiscalperiod; import static org.nuiton.i18n.I18n._; + +import javax.swing.JDialog; import javax.swing.JOptionPane; import org.jdesktop.swingx.JXTable; import org.nuiton.util.DateUtil; @@ -65,6 +67,7 @@ // jaxx don't call super() ? addPeriodDialog.setLocationRelativeTo(getView()); addPeriodDialog.setVisible(true); + addPeriodDialog.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); // null = cancel Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2011-05-20 14:24:39 UTC (rev 3136) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2011-05-20 14:26:33 UTC (rev 3137) @@ -27,6 +27,7 @@ import static org.nuiton.i18n.I18n._; import javax.swing.JComboBox; +import javax.swing.JDialog; import javax.swing.JTextField; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -99,6 +100,7 @@ addLetterForm.setLocationRelativeTo(view); addLetterForm.setVisible(true); + addLetterForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); //false = cancel Action if (addLetterForm.validOk){

1 0

r3136 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by vsalaun＠users.chorem.org May 20, 2011

May 20, 2011

Author: vsalaun Date: 2011-05-20 16:24:39 +0200 (Fri, 20 May 2011) New Revision: 3136 Url: http://chorem.org/repositories/revision/lima/3136 Log: trim() pour les vouchers et descriptions 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 2011-05-20 13:51:46 UTC (rev 3135) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-20 14:24:39 UTC (rev 3136) @@ -503,13 +503,13 @@ Entry currentEntry = (Entry)currentRow; switch (column) { case 2 : - currentEntry.setVoucher((String)value); + currentEntry.setVoucher(((String)value).trim()); break; case 3: currentEntry.setAccount((Account)value); break; case 4: - currentEntry.setDescription((String)value); + currentEntry.setDescription(((String)value).trim()); break; case 5 : currentEntry.setLetter((Letter)value);

1 0

r3135 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by vsalaun＠users.chorem.org May 20, 2011

May 20, 2011

Author: vsalaun Date: 2011-05-20 15:51:46 +0200 (Fri, 20 May 2011) New Revision: 3135 Url: http://chorem.org/repositories/revision/lima/3135 Log: #369 mise en relation des combobox fiscalPeriods/financialPeriods (2/2) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java 2011-05-18 15:28:28 UTC (rev 3134) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java 2011-05-20 13:51:46 UTC (rev 3135) @@ -25,17 +25,13 @@ package org.chorem.lima.ui.lettering; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import javax.swing.JComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel; -import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; -public class LetteringFinancialPeriodComboBox extends JComboBox implements ActionListener { +public class LetteringFinancialPeriodComboBox extends JComboBox { private static final long serialVersionUID = 1L; @@ -46,14 +42,6 @@ public LetteringFinancialPeriodComboBox(LetteringViewHandler handler) { this.handler = handler; - - FinancialPeriodComboBoxModel comboBoxModel = new FinancialPeriodComboBoxModel(); - FinancialPeriodComboBoxRenderer comboBoxRenderer = new FinancialPeriodComboBoxRenderer(); - - setModel(comboBoxModel); - setRenderer(comboBoxRenderer); - addActionListener(this); - } public void back(){ @@ -78,12 +66,4 @@ } } - @Override - public void actionPerformed(ActionEvent e) { - Object object = this.getSelectedItem(); - if (object instanceof FinancialPeriod){ - handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem()); - } - } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2011-05-18 15:28:28 UTC (rev 3134) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2011-05-20 13:51:46 UTC (rev 3135) @@ -26,17 +26,14 @@ <Table> <LetteringViewHandler id="handler" javaBean="new LetteringViewHandler(this)" /> <Boolean id="selectedRow" javaBean="false" /> - <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/> - <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> + <script> <![CDATA[ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.ui.lettering.LetteringFinancialPeriodComboBox; + import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; - LetteringFinancialPeriodComboBox financialPeriodComboBox = new LetteringFinancialPeriodComboBox(handler); - - void $afterCompleteSetup() { getHandler().refresh(); } @@ -49,11 +46,11 @@ <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/> </cell> <cell anchor="west"> + <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> <JComboBox id="fiscalPeriodComboBox" model="{getModelFiscalPeriod()}" renderer="{new org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer()}" - onActionPerformed="getModelFinancialPeriod().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); - getHandler().refresh()" + onActionPerformed="getModelFinancialPeriod().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())" editable="false"/> </cell> <cell anchor="east"> @@ -61,7 +58,11 @@ /> </cell> <cell anchor="west"> - <JComboBox javaBean="financialPeriodComboBox"/> + <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/> + <LetteringFinancialPeriodComboBox id="financialPeriodComboBox" + constructorParams="getHandler()" + model="{getModelFinancialPeriod()}" renderer="{new FinancialPeriodComboBoxRenderer()}" + onActionPerformed="tableModel.setFinancialPeriod((FinancialPeriod)financialPeriodComboBox.getSelectedItem())"/> </cell> <cell> <JButton id="back" text="lima.common.buttonback"

1 0

r3134 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejbinterface lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by vsalaun＠users.chorem.org May 18, 2011

May 18, 2011

Author: vsalaun Date: 2011-05-18 17:28:28 +0200 (Wed, 18 May 2011) New Revision: 3134 Url: http://chorem.org/repositories/revision/lima/3134 Log: #369 mise en relation des combobox fiscalPeriods/financialPeriods (1/2) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-18 14:26:46 UTC (rev 3133) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-18 15:28:28 UTC (rev 3134) @@ -25,6 +25,7 @@ package org.chorem.lima.business.ejb; +import java.util.Date; import java.util.List; import javax.ejb.Stateless; import org.apache.commons.logging.Log; @@ -201,7 +202,38 @@ return result; } + + /** + * Return all financial period from a fiscal period + */ + @Override + public List<FinancialPeriod> getFinancialPeriods(Date beginDate, Date endDate) throws LimaException { + + List<FinancialPeriod> result = null; + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + FinancialPeriodDAO financialPeriodDAO = LimaCallaoDAOHelper. + getFinancialPeriodDAO(transaction); + + TopiaQuery query = financialPeriodDAO.createQuery() + .addBetween(FinancialPeriod.BEGIN_DATE, beginDate, endDate) + .addOrder(FinancialPeriod.BEGIN_DATE); + + result = financialPeriodDAO.findAllByQuery(query); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + + return result; + } + @Override public void blockClosedPeriodicEntryBookWithTransaction( Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java 2011-05-18 14:26:46 UTC (rev 3133) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java 2011-05-18 15:28:28 UTC (rev 3134) @@ -25,6 +25,7 @@ package org.chorem.lima.business.ejbinterface; +import java.util.Date; import java.util.List; import javax.ejb.Remote; import org.chorem.lima.business.LimaException; @@ -58,6 +59,7 @@ void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; - List<FinancialPeriod> getAllFinancialPeriods() throws LimaException; + + List<FinancialPeriod> getFinancialPeriods(Date beginDate, Date endDate) throws LimaException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java 2011-05-18 14:26:46 UTC (rev 3133) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java 2011-05-18 15:28:28 UTC (rev 3134) @@ -25,18 +25,13 @@ package org.chorem.lima.ui.financialtransaction; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import javax.swing.JComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel; -import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; +public class FinancialPeriodComboBox extends JComboBox { -public class FinancialPeriodComboBox extends JComboBox implements ActionListener { - private static final long serialVersionUID = 1L; private static final Log log = @@ -46,14 +41,6 @@ public FinancialPeriodComboBox(FinancialTransactionViewHandler handler) { this.handler = handler; - - FinancialPeriodComboBoxModel comboBoxModel = new FinancialPeriodComboBoxModel(); - FinancialPeriodComboBoxRenderer comboBoxRenderer = new FinancialPeriodComboBoxRenderer(); - - setModel(comboBoxModel); - setRenderer(comboBoxRenderer); - addActionListener(this); - } public void back(){ @@ -74,16 +61,8 @@ if (row < size-1){ this.setSelectedItem(this.getItemAt(row+1)); repaint(); + //FIXME handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem()); } } - - @Override - public void actionPerformed(ActionEvent e) { - Object object = this.getSelectedItem(); - if (object instanceof FinancialPeriod){ - handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem()); - } - } - } 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 2011-05-18 14:26:46 UTC (rev 3133) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2011-05-18 15:28:28 UTC (rev 3134) @@ -26,17 +26,14 @@ <Table> <FinancialTransactionViewHandler id="handler" javaBean="new FinancialTransactionViewHandler(this)" /> <Boolean id="selectedRow" javaBean="false" /> - <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/> - <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> + <script> <![CDATA[ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.ui.financialtransaction.FinancialPeriodComboBox; + import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; - FinancialPeriodComboBox financialPeriodComboBox = new FinancialPeriodComboBox(handler); - - void $afterCompleteSetup() { getHandler().refresh(); } @@ -49,11 +46,11 @@ <JLabel id="fiscalPeriodLabel" text="lima.charts.fiscalyear"/> </cell> <cell anchor="west"> + <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> <JComboBox id="fiscalPeriodComboBox" model="{getModelFiscalPeriod()}" renderer="{new org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer()}" - onActionPerformed="getModelFinancialPeriod().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); - getHandler().refresh()" + onActionPerformed="getModelFinancialPeriod().setFiscalPeriod((FiscalPeriod)fiscalPeriodComboBox.getSelectedItem())" editable="false"/> </cell> <cell anchor="east"> @@ -61,7 +58,11 @@ /> </cell> <cell anchor="west"> - <JComboBox javaBean="financialPeriodComboBox"/> + <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/> + <FinancialPeriodComboBox id="financialPeriodComboBox" + constructorParams="getHandler()" + model="{getModelFinancialPeriod()}" renderer="{new FinancialPeriodComboBoxRenderer()}" + onActionPerformed="financialTransactionTableModel.setFinancialPeriod((FinancialPeriod)financialPeriodComboBox.getSelectedItem())"/> </cell> <cell> <JButton id="back" text="lima.common.buttonback"

1 0

r3133 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by vsalaun＠users.chorem.org May 18, 2011

May 18, 2011

Author: vsalaun Date: 2011-05-18 16:26:46 +0200 (Wed, 18 May 2011) New Revision: 3133 Url: http://chorem.org/repositories/revision/lima/3133 Log: amelioration de la syntaxe du code Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-17 15:57:08 UTC (rev 3132) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-18 14:26:46 UTC (rev 3133) @@ -63,6 +63,8 @@ protected FinancialPeriodServiceMonitorable financialPeriodService; protected FiscalPeriod selectedFiscalPeriod; + + private boolean displayAllPeriods; /** * Constructor for locked period list. @@ -77,7 +79,10 @@ * @param all if {@code true}, display all available period, otherwize * display only locked ones */ - public FinancialPeriodComboBoxModel(boolean all) { + public FinancialPeriodComboBoxModel(boolean displayAllPeriods) { + + this.displayAllPeriods = displayAllPeriods; + financialPeriodService = LimaServiceFactory.getInstance().getService( FinancialPeriodServiceMonitorable.class); @@ -86,7 +91,7 @@ FiscalPeriodServiceMonitorable.class).addListener(this); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); - if (all) { + if (displayAllPeriods) { datasCache=getAllDataList(); } else { @@ -96,7 +101,13 @@ public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ selectedFiscalPeriod=fiscalPeriod; - datasCache=getDataList(); + if (displayAllPeriods) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } + fireContentsChanged(this, 0, datasCache.size()); } @Override @@ -124,8 +135,7 @@ List<FinancialPeriod> result = null; try { if (selectedFiscalPeriod != null){ - result = (List<FinancialPeriod>) - selectedFiscalPeriod.getFinancialPeriod(); + result = financialPeriodService.getFinancialPeriods(selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); } else { result = financialPeriodService.getUnblockedFinancialPeriods(); @@ -144,8 +154,7 @@ List<FinancialPeriod> result = null; try { if (selectedFiscalPeriod != null){ - result = (List<FinancialPeriod>) - selectedFiscalPeriod.getFinancialPeriod(); + result = financialPeriodService.getFinancialPeriods(selectedFiscalPeriod.getBeginDate(), selectedFiscalPeriod.getEndDate()); } else { result = financialPeriodService.getAllFinancialPeriods(); @@ -162,6 +171,7 @@ public void refresh(){ datasCache = getDataList(); + System.out.println(datasCache); fireContentsChanged(this, 0, datasCache.size()); } @@ -173,7 +183,12 @@ @Override public void notifyMethod(String serviceName, String methodeName) { if (serviceName.contains("Period") || methodeName.contains("importAll")){ - refresh(); + if (displayAllPeriods) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } } } }

1 0

r3132 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: account entrybook financialstatementchart
by vsalaun＠users.chorem.org May 17, 2011

May 17, 2011

Author: vsalaun Date: 2011-05-17 17:57:08 +0200 (Tue, 17 May 2011) New Revision: 3132 Url: http://chorem.org/repositories/revision/lima/3132 Log: #359 possibilite de deselectionner une ligne dans certains tableaux (2/2) Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountTreeTable.java 2011-05-17 15:57:08 UTC (rev 3132) @@ -0,0 +1,78 @@ +package org.chorem.lima.ui.account; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTreeTable; + +public class AccountTreeTable extends JXTreeTable + implements KeyListener, MouseListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 1092873442245932784L; + + /** log. */ + private static final Log log = LogFactory + .getLog(AccountTreeTable.class); + + protected AccountViewHandler handler; + + public AccountTreeTable(AccountViewHandler handler) { + + this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2011-05-17 13:02:49 UTC (rev 3131) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2011-05-17 15:57:08 UTC (rev 3132) @@ -37,7 +37,8 @@ <row> <cell fill="both" weightx="1" weighty="1" rows='5'> <JScrollPane> - <org.jdesktop.swingx.JXTreeTable id="accountsTreeTable" + <AccountTreeTable id="accountsTreeTable" + constructorParams="getHandler()" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" treeTableModel="{new org.chorem.lima.ui.account.AccountTreeTableModel()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" /> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookTable.java 2011-05-17 15:57:08 UTC (rev 3132) @@ -0,0 +1,78 @@ +package org.chorem.lima.ui.entrybook; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; + +public class EntryBookTable extends JXTable + implements KeyListener, MouseListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 6228396251512013262L; + + /** log. */ + private static final Log log = LogFactory + .getLog(EntryBookTable.class); + + protected EntryBookViewHandler handler; + + public EntryBookTable(EntryBookViewHandler handler) { + + this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2011-05-17 13:02:49 UTC (rev 3131) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2011-05-17 15:57:08 UTC (rev 3132) @@ -38,7 +38,8 @@ <row> <cell fill="both" weightx="1" weighty="1" rows='5'> <JScrollPane> - <org.jdesktop.swingx.JXTable id="entryBooksTable" rowHeight="24" + <EntryBookTable id="entryBooksTable" rowHeight="24" + constructorParams="getHandler()" model="{new org.chorem.lima.ui.entrybook.EntryBookTableModel()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartTreeTable.java 2011-05-17 15:57:08 UTC (rev 3132) @@ -0,0 +1,77 @@ +package org.chorem.lima.ui.financialstatementchart; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTreeTable; + +public class FinancialStatementChartTreeTable extends JXTreeTable + implements KeyListener, MouseListener { + + /** serialVersionUID. */ + private static final long serialVersionUID = 3221024449873737253L; + + /** log. */ + private static final Log log = LogFactory + .getLog(FinancialStatementChartTreeTable.class); + + protected FinancialStatementChartViewHandler handler; + + public FinancialStatementChartTreeTable(FinancialStatementChartViewHandler handler) { + this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2011-05-17 13:02:49 UTC (rev 3131) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2011-05-17 15:57:08 UTC (rev 3132) @@ -37,7 +37,8 @@ <row> <cell fill="both" weightx="1" weighty="1" rows='6'> <JScrollPane> - <org.jdesktop.swingx.JXTreeTable id="treeTable" + <FinancialStatementChartTreeTable id="treeTable" + constructorParams="getHandler()" selectionMode="{ListSelectionModel.SINGLE_SELECTION}" treeTableModel="{new org.chorem.lima.ui.financialstatementchart.FinancialStatementChartTreeTableModel()}" highlighters="{org.jdesktop.swingx.decorator.HighlighterFactory.createSimpleStriping(new java.awt.Color(222,222,222))}" />

1 0

r3131 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: accountsreports balance entrybooksreports financialperiod financialstatementreport financialtransaction financialtransactionsearch financialtransactionunbalanced fiscalperiod ledger lettering
by vsalaun＠users.chorem.org May 17, 2011

May 17, 2011

Author: vsalaun Date: 2011-05-17 15:02:49 +0200 (Tue, 17 May 2011) New Revision: 3131 Url: http://chorem.org/repositories/revision/lima/3131 Log: #359 possibilite de deselectionner une ligne dans certains tableaux Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -1,5 +1,9 @@ package org.chorem.lima.ui.accountsreports; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import org.apache.commons.logging.Log; @@ -9,7 +13,8 @@ import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.jdesktop.swingx.JXTable; -public class AccountsReportsTable extends JXTable { +public class AccountsReportsTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 6093850347322834480L; @@ -24,9 +29,57 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -1,5 +1,9 @@ package org.chorem.lima.ui.balance; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.math.BigDecimal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -7,7 +11,7 @@ import org.chorem.lima.ui.balance.BalanceViewHandler; import org.jdesktop.swingx.JXTable; -public class BalanceTable extends JXTable { +public class BalanceTable extends JXTable implements KeyListener, MouseListener{ /** serialVersionUID. */ private static final long serialVersionUID = 6093850347322834480L; @@ -22,9 +26,57 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ 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 java.math.BigDecimal; import org.chorem.lima.entity.Entry; @@ -39,7 +43,8 @@ import org.jdesktop.swingx.decorator.Highlighter; -public class EntryBooksReportsTable extends JXTable { +public class EntryBooksReportsTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 1L; @@ -60,6 +65,10 @@ this.handler = handler; this.model = model; + + addKeyListener(this); + addMouseListener(this); + highlighterReportsDatasBoolean=true; //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); @@ -97,4 +106,49 @@ new ColorHighlighter(predicate, new Color(222,222,222), null); addHighlighter(colorReportsDatas); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } 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 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ 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 java.text.SimpleDateFormat; import org.apache.commons.logging.Log; @@ -43,7 +47,8 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; -public class FinancialPeriodTable extends JXTable { +public class FinancialPeriodTable extends JXTable + implements KeyListener, MouseListener { private static final long serialVersionUID = -1960326844433064178L; @@ -64,6 +69,10 @@ public FinancialPeriodTable(FinancialPeriodViewHandler handler) { this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + model = this.handler.getView().modelFinancialPeriodTable; financialPeriodService = LimaServiceFactory.getInstance().getService( @@ -125,5 +134,50 @@ new ColorHighlighter(predicate, null, new Color(222,0,0)); addHighlighter(colorTransaction); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,11 @@ 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.beans.FinancialStatementAmounts; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -35,7 +40,8 @@ import org.jdesktop.swingx.decorator.Highlighter; -public class FinancialStatementReportTable extends JXTable { +public class FinancialStatementReportTable extends JXTable + implements KeyListener, MouseListener { private static final long serialVersionUID = 154211277688304679L; @@ -51,6 +57,10 @@ public FinancialStatementReportTable(FinancialStatementReportViewHandler handler) { super(handler.getView().modelTable); this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + model = this.handler.getView().modelTable; //highlight financial financial transactions @@ -112,4 +122,49 @@ addHighlighter(colorTransaction); } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent 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 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -29,6 +29,8 @@ 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 java.math.BigDecimal; import java.util.Date; import javax.swing.SwingWorker; @@ -56,7 +58,8 @@ * * @author jpepin */ -public class FinancialTransactionTable extends JXTable implements KeyListener { +public class FinancialTransactionTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -79,6 +82,7 @@ this.handler = handler; addKeyListener(this); + addMouseListener(this); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -204,6 +208,13 @@ handler.addFinancialTransaction(); } + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + /** * Touche tab * Incrémente le curseur de case tant que la case n'est pas editable @@ -307,7 +318,29 @@ @Override public void keyReleased(KeyEvent e) { - } - + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ 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 java.math.BigDecimal; import java.util.Date; import org.chorem.lima.entity.Account; @@ -50,7 +54,8 @@ * @author ore * @author Rémi Chapelet */ -public class FinancialTransactionSearchTable extends JXTable { +public class FinancialTransactionSearchTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -67,6 +72,9 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); //Get new entry book editor @@ -144,4 +152,51 @@ new ColorHighlighter(predicate, new Color(255, 198, 209), null); addHighlighter(colorTransaction); } + + @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 (!this.isEditing()) { + this.clearSelection(); + } + } + + } + + @Override + public void keyReleased(KeyEvent e) { + } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -29,6 +29,8 @@ 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 java.math.BigDecimal; import java.util.Date; import org.chorem.lima.entity.Account; @@ -53,7 +55,8 @@ * @author ore * @author Rémi Chapelet */ -public class FinancialTransactionUnbalancedTable extends JXTable implements KeyListener { +public class FinancialTransactionUnbalancedTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -71,6 +74,7 @@ this.handler = handler; addKeyListener(this); + addMouseListener(this); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -173,6 +177,13 @@ && e.getModifiers() == KeyEvent.CTRL_MASK)) { handler.addEmptyEntry(); } + + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } /** * Touche tab @@ -207,11 +218,30 @@ } - /* - * @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent) - */ @Override public void keyReleased(KeyEvent e) { - } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,11 @@ 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.entity.FiscalPeriod; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -34,7 +39,8 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; -public class FiscalPeriodTable extends JXTable { +public class FiscalPeriodTable extends JXTable + implements KeyListener, MouseListener { private static final long serialVersionUID = -8462838870024505659L; @@ -47,6 +53,10 @@ public FiscalPeriodTable(FiscalPeriodViewHandler handler) { this.handler = handler; + + addKeyListener(this); + addMouseListener(this); + model = this.handler.getView().getModelFiscalPeriodTable(); //highlight financial financial transactions @@ -67,5 +77,50 @@ new ColorHighlighter(predicate, null, new Color(222,0,0)); addHighlighter(colorTransaction); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -27,6 +27,10 @@ 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 java.math.BigDecimal; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; @@ -43,7 +47,7 @@ * @author ore * @author Rémi Chapelet */ -public class LedgerTable extends JXTable { +public class LedgerTable extends JXTable implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -58,6 +62,9 @@ this.handler = handler; + addKeyListener(this); + addMouseListener(this); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); @@ -86,4 +93,49 @@ new ColorHighlighter(predicate, new Color(222,222,222), null); addHighlighter(colorReportsDatas); } + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.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 (!this.isEditing()) { + this.clearSelection(); + } + } + } + + @Override + public void keyReleased(KeyEvent e) { + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-17 08:24:05 UTC (rev 3130) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-17 13:02:49 UTC (rev 3131) @@ -29,6 +29,8 @@ 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 java.math.BigDecimal; import java.util.Date; @@ -55,7 +57,8 @@ * * @author jpepin */ -public class LetteringTable extends JXTable implements KeyListener { +public class LetteringTable extends JXTable + implements KeyListener, MouseListener { /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; @@ -75,6 +78,7 @@ this.handler = handler; addKeyListener(this); + addMouseListener(this); //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -166,19 +170,47 @@ handler.addLetter(); } + // clear row selection with the key: escape + if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { + if (!this.isEditing()) { + this.clearSelection(); + } + } + } @Override public void keyTyped(KeyEvent e) { - } @Override public void keyReleased(KeyEvent e) { - } + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + if (this.rowAtPoint(e.getPoint()) == -1) { + this.clearSelection(); + } + } + + @Override + public void mouseReleased(MouseEvent e) { + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } + }

1 0

r3130 - trunk/lima-swing/src/main/java/org/chorem/lima/ui
by vsalaun＠users.chorem.org May 17, 2011

May 17, 2011

Author: vsalaun Date: 2011-05-17 10:24:05 +0200 (Tue, 17 May 2011) New Revision: 3130 Url: http://chorem.org/repositories/revision/lima/3130 Log: #359 pop up tab when it already exists Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-05-16 14:24:24 UTC (rev 3129) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2011-05-17 08:24:05 UTC (rev 3130) @@ -92,6 +92,9 @@ contentTabbedPane.remove(contentTabbedPane.indexOfTab(name)); } }); + // if contentTabbedPane contains tab + } else { + contentTabbedPane.setSelectedIndex(contentTabbedPane.indexOfTab(name)); } }

1 0

r3129 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod
by vsalaun＠users.chorem.org May 16, 2011

May 16, 2011

Author: vsalaun Date: 2011-05-16 16:24:24 +0200 (Mon, 16 May 2011) New Revision: 3129 Url: http://chorem.org/repositories/revision/lima/3129 Log: #353 maj automatique de la liste lorsqu'on bloque une periode comptable Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 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 2011-05-16 13:54:24 UTC (rev 3128) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTableModel.java 2011-05-16 14:24:24 UTC (rev 3129) @@ -186,6 +186,7 @@ public void blockFinancialPeriod(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException { financialPeriodService. blockClosedPeriodicEntryBook(closedPeriodicEntryBook); + getDataList(); fireTableDataChanged(); }

1 0