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

r3128 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org 16 May '11

16 May '11

Author: vsalaun Date: 2011-05-16 15:54:24 +0200 (Mon, 16 May 2011) New Revision: 3128 Url: http://chorem.org/repositories/revision/lima/3128 Log: #266 les caracteres non unicodes ne sont plus affiches Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-16 10:21:28 UTC (rev 3127) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-16 13:54:24 UTC (rev 3128) @@ -133,8 +133,15 @@ @Override public void keyReleased(KeyEvent e) { if (keyPressed == false) { - datePicker.getEditor().setText(String.valueOf(e.getKeyChar())); - keyPressed = true; + if (e.getKeyCode() >= KeyEvent.VK_0 + && e.getKeyCode() <= KeyEvent.VK_Z) { + datePicker.getEditor().setText(String.valueOf(e.getKeyChar())); + keyPressed = true; + } + else if (e.getKeyChar() == KeyEvent.VK_BACK_SPACE){ + datePicker.getEditor().setText(""); + keyPressed = true; + } } }

1 0

r3127 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org 16 May '11

16 May '11

Author: vsalaun Date: 2011-05-16 12:21:28 +0200 (Mon, 16 May 2011) New Revision: 3127 Url: http://chorem.org/repositories/revision/lima/3127 Log: amelioration de l'editeur de BigDecimal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-05-16 09:45:16 UTC (rev 3126) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-05-16 10:21:28 UTC (rev 3127) @@ -1,30 +1,34 @@ package org.chorem.lima.ui.celleditor; import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.math.BigDecimal; -import java.util.Date; import java.util.EventObject; import javax.swing.AbstractCellEditor; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import javax.swing.text.JTextComponent; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; -public class BigDecimalTableCellEditor extends AbstractCellEditor implements TableCellEditor { +public class BigDecimalTableCellEditor extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener, KeyListener { private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); private static final long serialVersionUID = 1L; protected final JTextField textField; + private boolean keyPressed; /** * constructor @@ -33,6 +37,10 @@ textField = new JTextField(); textField.setEditable(true); textField.setHorizontalAlignment(SwingConstants.RIGHT); + textField.addFocusListener(this); + textField.addAncestorListener(this); + textField.addKeyListener(this); + keyPressed = false; } @Override @@ -56,5 +64,61 @@ return bdValue; } } + + @Override + public boolean isCellEditable(EventObject evt) { + return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; + } + + /** + * Listeners + */ + @Override + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + textField.selectAll(); + } + }); + } + + @Override + public void focusLost(FocusEvent e) { + keyPressed = false; + } + + @Override + public void ancestorAdded(final AncestorEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + textField.requestFocus(); + } + }); + } + @Override + public void ancestorRemoved(AncestorEvent e) { + } + + @Override + public void ancestorMoved(AncestorEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + + } + + @Override + public void keyPressed(KeyEvent e) { + } + + @Override + public void keyReleased(KeyEvent e) { + if (keyPressed == false) { + textField.setText(String.valueOf(e.getKeyChar())); + keyPressed = true; + } + } + }

1 0

r3126 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org 16 May '11

16 May '11

Author: vsalaun Date: 2011-05-16 11:45:16 +0200 (Mon, 16 May 2011) New Revision: 3126 Url: http://chorem.org/repositories/revision/lima/3126 Log: #266 amelioration dans l'edition d'une date (selection automatique du texte) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-14 11:46:09 UTC (rev 3125) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-05-16 09:45:16 UTC (rev 3126) @@ -29,26 +29,40 @@ import org.jdesktop.swingx.JXDatePicker; import javax.swing.*; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import java.awt.*; + +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.awt.event.MouseEvent; + import java.util.Date; import java.util.EventObject; /** * @author ore */ -public class DateTableCellEditor extends AbstractCellEditor implements TableCellEditor { +public class DateTableCellEditor extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener, KeyListener { private final JXDatePicker datePicker; private static final long serialVersionUID = 1L; private static DateTableCellEditor editor; + private boolean keyPressed; /** * constructor */ public DateTableCellEditor() { datePicker = new JXDatePicker(LimaContext.getContext().getConfig().getLocale()); + datePicker.getEditor().addFocusListener(this); + datePicker.getEditor().addAncestorListener(this); + datePicker.getEditor().addKeyListener(this); + keyPressed = false; } @Override @@ -75,4 +89,53 @@ } return editor; } + + /** + * Listeners + */ + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + datePicker.getEditor().selectAll(); + } + }); + } + + public void focusLost(FocusEvent e) { + keyPressed = false; + } + + @Override + public void ancestorAdded(final AncestorEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + datePicker.requestFocus(); + } + }); + } + + @Override + public void ancestorRemoved(AncestorEvent e) { + } + + @Override + public void ancestorMoved(AncestorEvent e) { + } + + @Override + public void keyTyped(KeyEvent e) { + } + + @Override + public void keyPressed(KeyEvent e) { + } + + @Override + public void keyReleased(KeyEvent e) { + if (keyPressed == false) { + datePicker.getEditor().setText(String.valueOf(e.getKeyChar())); + keyPressed = true; + } + } + }

1 0

r3125 - trunk
by tchemit＠users.chorem.org 14 May '11

14 May '11

Author: tchemit Date: 2011-05-14 13:46:09 +0200 (Sat, 14 May 2011) New Revision: 3125 Url: http://chorem.org/repositories/revision/lima/3125 Log: Update mavenpom4redmine to 2.5.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-13 14:59:57 UTC (rev 3124) +++ trunk/pom.xml 2011-05-14 11:46:09 UTC (rev 3125) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3124 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction financialtransactionsearch financialtransactionunbalanced
by vsalaun＠users.chorem.org 13 May '11

13 May '11

Author: vsalaun Date: 2011-05-13 16:59:57 +0200 (Fri, 13 May 2011) New Revision: 3124 Url: http://chorem.org/repositories/revision/lima/3124 Log: #286 mise a jour dans la prise en charge des champs invalides Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.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 Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-05-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -9,6 +9,8 @@ import javax.swing.border.EmptyBorder; import javax.swing.table.DefaultTableCellRenderer; +import org.chorem.lima.entity.EntryBook; + import sun.swing.DefaultLookup; @SuppressWarnings("restriction") @@ -19,8 +21,8 @@ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - //Create a new JLabel to avoid colouring only when row is selected - JLabel mycell = new JLabel(); + //Create a new JLabel to avoid colouring only when row is selected + JLabel mycell = new JLabel(); mycell.setOpaque(true); setBorder(new EmptyBorder(1, 1, 1, 1)); setName("Table.cellRenderer"); @@ -30,10 +32,10 @@ if (isSelected) { mycell.setForeground(table.getSelectionForeground()); mycell.setBackground(table.getSelectionBackground()); - } + } //Setting default foreGround and backGround colours when hasFocus if (hasFocus) { - Border border = null; + Border border = null; if (isSelected) { border = DefaultLookup.getBorder(this, ui, "Table.focusSelectedCellHighlightBorder"); } @@ -42,19 +44,21 @@ } mycell.setBorder(border); } - // true for voucher and description - // false for Account Class - // if empty or null, colour background in red - // else setText - if (value instanceof String) { - if (String.valueOf(value).isEmpty() || (String.valueOf(value) == null)) { - mycell.setBackground(new Color(255, 198, 209)); - } else { - mycell.setText(value.toString()); - } - } else { - mycell.setBackground(new Color(255, 198, 209)); - } + if (table.isCellEditable(row, column)) { + // true for voucher and description + // false for Account Class + // if empty or null, colour background in red + // else setText + if (value instanceof String) { + if (String.valueOf(value).isEmpty() || (String.valueOf(value) == null)) { + mycell.setBackground(new Color(255, 198, 209)); + } else { + mycell.setText(value.toString()); + } + } else { + mycell.setBackground(new Color(255, 198, 209)); + } + } return mycell; } 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-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -94,6 +94,8 @@ setDefaultRenderer(String.class, new EmptyCellRenderer()); //get new Account renderer for empty cells setDefaultRenderer(Account.class, new EmptyCellRenderer()); + //get new EntryBook renderer for empty cells + setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); 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-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -81,6 +81,8 @@ setDefaultRenderer(String.class, new EmptyCellRenderer()); //get new Account renderer for empty cells setDefaultRenderer(Account.class, new EmptyCellRenderer()); + //get new EntryBook renderer for empty cells + setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); 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-13 12:17:45 UTC (rev 3123) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-13 14:59:57 UTC (rev 3124) @@ -86,6 +86,8 @@ setDefaultRenderer(String.class, new EmptyCellRenderer()); //get new Account renderer for empty cells setDefaultRenderer(Account.class, new EmptyCellRenderer()); + //get new EntryBook renderer for empty cells + setDefaultRenderer(EntryBook.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction();

1 0

r3123 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by vsalaun＠users.chorem.org 13 May '11

13 May '11

Author: vsalaun Date: 2011-05-13 14:17:45 +0200 (Fri, 13 May 2011) New Revision: 3123 Url: http://chorem.org/repositories/revision/lima/3123 Log: correction de la requete de selection Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 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-13 12:11:59 UTC (rev 3122) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-13 12:17:45 UTC (rev 3123) @@ -157,7 +157,6 @@ getFinancialPeriodDAO(transaction); TopiaQuery query = financialPeriodDAO.createQuery() - .addEquals(FinancialPeriod.LOCKED, Boolean.TRUE) .addOrder(FinancialPeriod.BEGIN_DATE); result = financialPeriodDAO.findAllByQuery(query);

1 0

r3122 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by echatellier＠users.chorem.org 13 May '11

13 May '11

Author: echatellier Date: 2011-05-13 14:11:59 +0200 (Fri, 13 May 2011) New Revision: 3122 Url: http://chorem.org/repositories/revision/lima/3122 Log: Improve code, remove duplicated. Add javadoc "VERY IMPORTANT" ;) 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-13 12:04:23 UTC (rev 3121) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-13 12:11:59 UTC (rev 3122) @@ -64,20 +64,19 @@ protected FiscalPeriod selectedFiscalPeriod; - //constructor for blocked financial period only + /** + * Constructor for locked period list. + */ public FinancialPeriodComboBoxModel() { - financialPeriodService = - LimaServiceFactory.getInstance().getService( - FinancialPeriodServiceMonitorable.class); - financialPeriodService.addListener(this); - LimaServiceFactory.getInstance().getService( - FiscalPeriodServiceMonitorable.class).addListener(this); - LimaServiceFactory.getInstance().getService( - ImportServiceMonitorable.class).addListener(this); - datasCache=getDataList(); + this(false); } - //constructor for all financial period + /** + * Constructor for period list. + * + * @param all if {@code true}, display all available period, otherwize + * display only locked ones + */ public FinancialPeriodComboBoxModel(boolean all) { financialPeriodService = LimaServiceFactory.getInstance().getService( @@ -87,7 +86,12 @@ FiscalPeriodServiceMonitorable.class).addListener(this); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); - datasCache=getAllDataList(); + if (all) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } } public void setFiscalPeriod(FiscalPeriod fiscalPeriod){

1 0

r3121 - in trunk: . lima-business lima-callao lima-neogia lima-swing
by echatellier＠users.chorem.org 13 May '11

13 May '11

Author: echatellier Date: 2011-05-13 14:04:23 +0200 (Fri, 13 May 2011) New Revision: 3121 Url: http://chorem.org/repositories/revision/lima/3121 Log: Update next version Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-neogia/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-business/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-callao/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-neogia/pom.xml =================================================================== --- trunk/lima-neogia/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-neogia/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.3.2-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-swing/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> <modules> <module>lima-callao</module>

1 0

r3120 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: accountsreports balance entrybooksreports financialstatementreport ledger
by vsalaun＠users.chorem.org 13 May '11

13 May '11

Author: vsalaun Date: 2011-05-13 13:50:53 +0200 (Fri, 13 May 2011) New Revision: 3120 Url: http://chorem.org/repositories/revision/lima/3120 Log: #352 Prise en charge de la nouvelle selection des periodes pour : Edition compte, Edition journal, Balance, Grand livre, Bilan et Compte de resultat Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -110,7 +110,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -133,7 +133,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer);

1 0

r3119 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by vsalaun＠users.chorem.org 13 May '11

13 May '11

Author: vsalaun Date: 2011-05-13 13:49:07 +0200 (Fri, 13 May 2011) New Revision: 3119 Url: http://chorem.org/repositories/revision/lima/3119 Log: #352 ajout d'une selection sur la totalite des periodes fiscales et financieres (au lieu de seulement celles qui etaient non bloquees) 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/FiscalPeriodComboBoxModel.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-13 11:44:11 UTC (rev 3118) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-13 11:49:07 UTC (rev 3119) @@ -64,6 +64,7 @@ protected FiscalPeriod selectedFiscalPeriod; + //constructor for blocked financial period only public FinancialPeriodComboBoxModel() { financialPeriodService = LimaServiceFactory.getInstance().getService( @@ -76,7 +77,20 @@ datasCache=getDataList(); } - public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ + //constructor for all financial period + public FinancialPeriodComboBoxModel(boolean all) { + financialPeriodService = + LimaServiceFactory.getInstance().getService( + FinancialPeriodServiceMonitorable.class); + financialPeriodService.addListener(this); + LimaServiceFactory.getInstance().getService( + FiscalPeriodServiceMonitorable.class).addListener(this); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + datasCache=getAllDataList(); + } + + public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ selectedFiscalPeriod=fiscalPeriod; datasCache=getDataList(); } @@ -101,6 +115,7 @@ return selectedFinancialPeriod; } + //get unblocked financial periods data list public List<FinancialPeriod> getDataList(){ List<FinancialPeriod> result = null; try { @@ -120,10 +135,36 @@ return result; } + //get all financial periods data list + public List<FinancialPeriod> getAllDataList() { + List<FinancialPeriod> result = null; + try { + if (selectedFiscalPeriod != null){ + result = (List<FinancialPeriod>) + selectedFiscalPeriod.getFinancialPeriod(); + } + else { + result = financialPeriodService.getAllFinancialPeriods(); + } + } + catch (LimaException ex) { + if (log.isDebugEnabled()){ + log.debug("Can't get Financial Period list",ex); + } + } + return result; + } + + public void refresh(){ datasCache = getDataList(); fireContentsChanged(this, 0, datasCache.size()); } + + public void refreshAll() { + datasCache = getAllDataList(); + fireContentsChanged(this, 0, datasCache.size()); + } @Override public void notifyMethod(String serviceName, String methodeName) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2011-05-13 11:44:11 UTC (rev 3118) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2011-05-13 11:49:07 UTC (rev 3119) @@ -50,7 +50,7 @@ protected List<FiscalPeriod> datasCache; - + //constructor for blocked fiscal period only public FiscalPeriodComboBoxModel(){ fiscalPeriodService = LimaServiceFactory.getInstance().getService( @@ -61,6 +61,17 @@ datasCache = getDataList(); } + //constructor for all fiscal period + public FiscalPeriodComboBoxModel(boolean all) { + fiscalPeriodService = + LimaServiceFactory.getInstance().getService( + FiscalPeriodServiceMonitorable.class); + fiscalPeriodService.addListener(this); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + datasCache = getAllDataList(); + } + @Override public int getSize() { return datasCache.size(); @@ -82,6 +93,7 @@ return selectedFiscalPeriod; } + //get unblocked fiscal periods data list public List<FiscalPeriod> getDataList(){ List<FiscalPeriod> result = null; try { @@ -96,11 +108,30 @@ } + //get all fiscal periods data list + public List<FiscalPeriod> getAllDataList() { + List<FiscalPeriod> result = null; + try { + result = fiscalPeriodService.getAllFiscalPeriods(); + } + catch (LimaException eee) { + if (log.isDebugEnabled()) { + log.debug("Can't get list accounts", eee); + } + } + return result; + } + public void refresh(){ datasCache = getDataList(); fireContentsChanged(this, 0, datasCache.size()); } + public void refreshAll() { + datasCache = getAllDataList(); + fireContentsChanged(this, 0, datasCache.size()); + } + @Override public void notifyMethod(String serviceName, String methodeName) { if (serviceName.contains("FiscalPeriod") || methodeName.contains("importAll")){

1 0