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

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

May 25, 2011

Author: vsalaun Date: 2011-05-25 10:31:44 +0200 (Wed, 25 May 2011) New Revision: 3143 Url: http://chorem.org/repositories/revision/lima/3143 Log: #356 bloquer le lettrage si la periode est bloquee quand on utilise le bouton d'ajout d'une lettre Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-24 19:25:00 UTC (rev 3142) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-25 08:31:44 UTC (rev 3143) @@ -31,6 +31,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; + +import javax.swing.JFrame; +import javax.swing.JOptionPane; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,6 +50,7 @@ import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.DialogHelper; import org.chorem.lima.util.ErrorHelper; +import org.nuiton.util.Resource; /** * Basic transaction table model. @@ -139,14 +143,25 @@ } public void setLetter(int row, Letter letter){ - try { - Object currentRow = cacheDataList.get(row); - if (currentRow instanceof Entry){ - Entry entry = (Entry) currentRow; - financialTransactionService.setEntryLetter(entry, letter); + Object currentRow = cacheDataList.get(row); + if (currentRow instanceof Entry){ + Entry entry = (Entry) currentRow; + entry.setLetter(letter); + try { + financialTransactionService.updateEntry(entry); + } catch (LimaException eee) { + if (log.isDebugEnabled()){ + log.debug("Can't set letter", eee); + } + JFrame f = new JFrame(); + f.setIconImage(Resource.getIcon("icons/lima.png").getImage()); + JOptionPane.showMessageDialog( + f, + eee.getMessage(), + _("lima.common.error"), + JOptionPane.ERROR_MESSAGE); + f.dispose(); } - } catch (LimaException eee) { - log.error("Can't set letter", eee); } }

1 0

r3142 - in trunk/lima-business/src/main/java/org/chorem/lima/business: ejb ejbinterface
by vsalaun＠users.chorem.org May 24, 2011

May 24, 2011

Author: vsalaun Date: 2011-05-24 21:25:00 +0200 (Tue, 24 May 2011) New Revision: 3142 Url: http://chorem.org/repositories/revision/lima/3142 Log: #268 missing files (oupsy) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-23 14:15:17 UTC (rev 3141) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-24 19:25:00 UTC (rev 3142) @@ -46,6 +46,7 @@ import org.chorem.lima.entity.EntryDAO; import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialPeriodDAO; +import org.chorem.lima.entity.FinancialPeriodImpl; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.entity.Letter; import org.chorem.lima.entity.LetterDAO; @@ -143,6 +144,46 @@ } /** + * Return the list of all financial transaction from two dates + */ + @Override + public List<FinancialTransaction> getAllFinancialTransactionsFromDateToDate( + Date beginDate, Date endDate) throws LimaException { + List<FinancialTransaction> financialTransactions = null; + TopiaContext topiaTransaction = null; + try { + topiaTransaction = beginTransaction(); + FinancialTransactionDAO transactionDAO = + LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaTransaction); + + String financialPeriodProperty = TopiaQuery.getProperty(FinancialTransaction.FINANCIAL_PERIOD); + String entryBookLabelProperty = TopiaQuery.getProperty(FinancialTransaction.ENTRY_BOOK); + + // filter with topia query + TopiaQuery query = transactionDAO.createQuery("T") + + .addBetween(FinancialTransaction.TRANSACTION_DATE, beginDate, endDate) + + .addDistinct() + .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) + //load for lazy + .addLoad(financialPeriodProperty) + .addLoad(entryBookLabelProperty) + .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true) + .addFetch("E."+Entry.ACCOUNT) + .addFetch("E."+Entry.LETTER); + financialTransactions = transactionDAO.findAllByQuery(query); + } + catch (TopiaException ex) { + doCatch(topiaTransaction, ex, log); + } + finally { + doFinally(topiaTransaction, log); + } + return financialTransactions; + } + + /** * Return the list of all financial transaction of a financial period and an entrybook */ @Override @@ -184,7 +225,6 @@ finally { doFinally(topiaTransaction, log); } - return financialTransactions; } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2011-05-23 14:15:17 UTC (rev 3141) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2011-05-24 19:25:00 UTC (rev 3142) @@ -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.beans.FinancialTransactionSearch; @@ -68,6 +69,9 @@ List<FinancialTransaction> getAllFinancialTransactionsForFinancialPeriod( FinancialPeriod period) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactionsFromDateToDate( + Date beginDate, Date endDate) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactionsForEntryBookAndFinancialPeriod( EntryBook entryBook, FinancialPeriod period) throws LimaException;

1 0

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

May 23, 2011

Author: vsalaun Date: 2011-05-23 16:15:17 +0200 (Mon, 23 May 2011) New Revision: 3141 Url: http://chorem.org/repositories/revision/lima/3141 Log: #268 possibilite de lettrer sur un excercice / une periode / ou entre deux dates choisies par l'utilisateur Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Deleted: 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-23 08:39:31 UTC (rev 3140) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringFinancialPeriodComboBox.java 2011-05-23 14:15:17 UTC (rev 3141) @@ -1,69 +0,0 @@ -/* - * #%L - * Lima Swing - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -package org.chorem.lima.ui.lettering; - -import javax.swing.JComboBox; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.entity.FinancialPeriod; - - -public class LetteringFinancialPeriodComboBox extends JComboBox { - - private static final long serialVersionUID = 1L; - - private static final Log log = - LogFactory.getLog(LetteringFinancialPeriodComboBox.class); - - protected LetteringViewHandler handler; - - public LetteringFinancialPeriodComboBox(LetteringViewHandler handler) { - this.handler = handler; - } - - public void back(){ - int row = this.getSelectedIndex(); - log.debug(row); - if (row > 0){ - this.setSelectedItem(this.getItemAt(row-1)); - repaint(); - handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem()); - } - } - - public void next(){ - int size = this.getModel().getSize(); - int row = this.getSelectedIndex(); - log.debug(row); - - if (row < size-1){ - this.setSelectedItem(this.getItemAt(row+1)); - repaint(); - handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem()); - } - } - -} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringPeriodSearchPanel.java 2011-05-23 14:15:17 UTC (rev 3141) @@ -0,0 +1,135 @@ +package org.chorem.lima.ui.lettering; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Calendar; +import java.util.Date; +import static org.nuiton.i18n.I18n._; +import javax.swing.JComboBox; +import javax.swing.JLabel; +import javax.swing.JPanel; + +import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.enums.ComboBoxDatesEnum; +import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel; +import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; +import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel; +import org.chorem.lima.ui.combobox.FiscalPeriodComboBoxRenderer; +import org.jdesktop.swingx.JXDatePicker; + +public class LetteringPeriodSearchPanel extends JPanel { + + private static final Log log = + LogFactory.getLog(LetteringPeriodSearchPanel.class); + + protected LetteringViewHandler handler; + + public LetteringPeriodSearchPanel(LetteringViewHandler handler) { + this.handler = handler; + + //init date + refresh(ComboBoxDatesEnum.FISCAL_PERIOD); + } + + static final long serialVersionUID = 1L; + + public void refresh(ComboBoxDatesEnum comboBoxPeriodEnum){ + + switch (comboBoxPeriodEnum) { + case PERIOD: + // get begin date + Calendar calendarBegin = Calendar.getInstance(); + // set begindate to JAN 1 - 0:00.000 of this years + Date beginDate = calendarBegin.getTime(); + beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); + //handler().setBeginDate(beginDate); + + // get end date + Calendar calendarEnd = Calendar.getInstance(); + Date endDate = calendarEnd.getTime(); + //handler().setEndDate(endDate); + JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); + final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); + ActionListener beginDateActionListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + handler.setBeginDate(beginDatePicker.getDate()); + handler.refresh(); + } + }; + handler.setBeginDate(beginDatePicker.getDate()); + beginDatePicker.addActionListener(beginDateActionListener); + + JLabel endDateLabel = new JLabel(_("lima.common.enddate")); + final JXDatePicker endDatePicker = new JXDatePicker(endDate); + ActionListener endDateActionListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + handler.setEndDate(endDatePicker.getDate()); + handler.refresh(); + } + }; + handler.setEndDate(endDatePicker.getDate()); + endDatePicker.addActionListener(endDateActionListener); + handler.refresh(); + + this.removeAll(); + this.add(beginDateLabel); + this.add(beginDatePicker); + this.add(endDateLabel); + this.add(endDatePicker); + break; + + case FISCAL_PERIOD: + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); + FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); + final JComboBox fiscalPeriod = new JComboBox(fiscalModel); + fiscalPeriod.setRenderer(fiscalRenderer); + fiscalPeriod.setEditable(false); + ActionListener fiscalPeriodActionListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + FiscalPeriod fPeriod = (FiscalPeriod) fiscalPeriod.getSelectedItem(); + if (fPeriod != null){ + handler.setBeginDate(fPeriod.getBeginDate()); + handler.setEndDate(fPeriod.getEndDate()); + handler.refresh(); + } + } + }; + fiscalPeriod.addActionListener(fiscalPeriodActionListener); + + this.removeAll(); + this.add(fiscalPeriod); + break; + + case FINANCIAL_PERIOD: + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); + FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); + final JComboBox financialPeriod = new JComboBox(financialModel); + financialPeriod.setRenderer(financialRenderer); + financialPeriod.setEditable(false); + ActionListener financialPeriodActionListener = new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + FinancialPeriod fPeriod = (FinancialPeriod) financialPeriod.getSelectedItem(); + if (fPeriod != null){ + handler.setBeginDate(fPeriod.getBeginDate()); + handler.setEndDate(fPeriod.getEndDate()); + handler.refresh(); + } + } + }; + financialPeriod.addActionListener(financialPeriodActionListener); + this.removeAll(); + this.add(financialPeriod); + break; + } + + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-23 08:39:31 UTC (rev 3140) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-23 14:15:17 UTC (rev 3141) @@ -42,7 +42,6 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.Letter; import org.chorem.lima.service.LimaServiceFactory; @@ -74,9 +73,12 @@ /** Transaction service. */ protected final FinancialTransactionServiceMonitorable financialTransactionService; - /** selected financial period */ - protected FinancialPeriod selectedFinancialPeriod; + /** Begin Date. */ + protected Date selectedBeginDate; + /** EndDate. */ + protected Date selectedEndDate; + /** data cache */ protected List<Object> cacheDataList; @@ -97,6 +99,14 @@ LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); } + + public void setSelectedBeginDate(Date date) { + selectedBeginDate = date; + } + + public void setSelectedEndDate(Date date) { + selectedEndDate = date; + } /** * Le model est une combinaison de Transaction/Entries. @@ -106,11 +116,11 @@ */ protected List<Object> getDataList() { List<Object> results = new ArrayList<Object>(); - if (selectedFinancialPeriod != null){ + if (selectedBeginDate != null && selectedEndDate != null){ try { List<FinancialTransaction> financialtransactions = - financialTransactionService.getAllFinancialTransactionsForFinancialPeriod( - selectedFinancialPeriod); + financialTransactionService.getAllFinancialTransactionsFromDateToDate( + selectedBeginDate, selectedEndDate); for (FinancialTransaction financialtransaction : financialtransactions) { results.add(financialtransaction); List<Entry> entries = (List<Entry>) financialtransaction.getEntry(); @@ -124,7 +134,7 @@ } ErrorHelper.showErrorDialog("Can't get transaction list", eee); } - } + } return results; } @@ -345,12 +355,6 @@ return result; } - - public void setFinancialPeriod(FinancialPeriod financialPeriod){ - selectedFinancialPeriod = financialPeriod; - refresh(); - } - /** * To set cells editable or not * different condition for entry or financial transaction 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-23 08:39:31 UTC (rev 3140) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2011-05-23 14:15:17 UTC (rev 3141) @@ -31,48 +31,25 @@ <![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; + import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; + import org.chorem.lima.enums.ComboBoxDatesEnum; + LetteringPeriodSearchPanel periodSearchPanel = new LetteringPeriodSearchPanel(handler); + void $afterCompleteSetup() { - getHandler().refresh(); } ]]> </script> <row weightx="1" weighty="0" anchor="center"> - <cell anchor="east"> - <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())" - editable="false"/> - </cell> - <cell anchor="east"> - <JLabel id="financialPeriodLabel" text="lima.common.period" - /> - </cell> - <cell anchor="west"> - <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 fill='both'><Table><row> + <cell anchor="west"><JComboBox id="periodComboBox" javaBean="new JComboBox(ComboBoxDatesEnum.descriptions())" + onActionPerformed="periodSearchPanel.refresh(ComboBoxDatesEnum.valueOfDescription((String) periodComboBox.getSelectedItem())); + validate(); repaint()"/></cell> + <cell><LetteringPeriodSearchPanel javaBean="periodSearchPanel"/></cell> + </row></Table></cell> <cell> - <JButton id="back" text="lima.common.buttonback" - onActionPerformed="financialPeriodComboBox.back()"/> - </cell> - <cell> - <JButton id="next" text="lima.common.buttonnext" - onActionPerformed="financialPeriodComboBox.next()"/> - </cell> - <cell> <JButton text="lima.entries.lettering.add" onActionPerformed="handler.addLetter()" toolTipText="lima.tooltip.lettering" enabled="{isSelectedRow()}"/> </cell> 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-23 08:39:31 UTC (rev 3140) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2011-05-23 14:15:17 UTC (rev 3141) @@ -26,6 +26,9 @@ package org.chorem.lima.ui.lettering; import static org.nuiton.i18n.I18n._; + +import java.util.Date; + import javax.swing.JComboBox; import javax.swing.JTextField; import org.apache.commons.logging.Log; @@ -76,10 +79,18 @@ financialTransactionService = LimaServiceFactory.getInstance().getService( FinancialTransactionServiceMonitorable.class); - } + } - + public void setBeginDate(Date date){ + tableModel = view.getTableModel(); + tableModel.setSelectedBeginDate(date); + } + public void setEndDate(Date date){ + tableModel = view.getTableModel(); + tableModel.setSelectedEndDate(date); + } + public void addLetter(){ Letter letter = null; Boolean valid = true;

1 0

r3140 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: account entrybook financialstatementchart fiscalperiod identity lettering
by vsalaun＠users.chorem.org May 23, 2011

May 23, 2011

Author: vsalaun Date: 2011-05-23 10:39:31 +0200 (Mon, 23 May 2011) New Revision: 3140 Url: http://chorem.org/repositories/revision/lima/3140 Log: #395 correction du bug dans les JDialog lors de la fermeture (final) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx 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/AccountForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.Account id="account" javaBean='null'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> 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:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ 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; @@ -89,8 +88,8 @@ // jaxx constructor don't call super() ? accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); - accountForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); + // null == cancel action newAccount = accountForm.getAccount(); if (newAccount != null) { @@ -136,7 +135,6 @@ // jaxx constructor don't call super() ? subledgerForm.setLocationRelativeTo(view); subledgerForm.setVisible(true); - subledgerForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); newAccount=subledgerForm.getAccount(); // null == cancel action @@ -193,7 +191,6 @@ // jaxx constructor don't call super() ? accountForm.setLocationRelativeTo(view); accountForm.setVisible(true); - accountForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedObject = accountForm.getAccount(); } @@ -204,7 +201,6 @@ // jaxx constructor don't call super() ? subLedgerForm.setLocationRelativeTo(view); subLedgerForm.setVisible(true); - subLedgerForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedObject = subLedgerForm.getAccount(); } @@ -282,7 +278,6 @@ // 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/account/SubLedgerForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/SubLedgerForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.Account id="account" javaBean='null'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -22,7 +22,9 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.EntryBook id="entryBook" javaBean="null" /> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ import static org.nuiton.i18n.I18n._; -import javax.swing.JDialog; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -79,7 +78,6 @@ // jaxx constructor don't call super() ? entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); - entryBookForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action newEntryBook = entryBookForm.getEntryBook(); @@ -113,7 +111,6 @@ // jaxx constructor don't call super() ? entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); - entryBookForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedEntryBook = entryBookForm.getEntryBook(); @@ -164,7 +161,6 @@ new EntryBookImportForm(); form.setLocationRelativeTo(view); form.setVisible(true); - form.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); Object value = form.getRadioButtons().getSelectedValue(); // if action confirmed 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:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ 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; @@ -94,7 +93,6 @@ // jaxx constructor don't call super() ? financialStatementHeaderForm.setLocationRelativeTo(view); financialStatementHeaderForm.setVisible(true); - financialStatementHeaderForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action newFinancialStatementHeader = financialStatementHeaderForm.getFinancialStatement(); @@ -143,7 +141,6 @@ // jaxx constructor don't call super() ? financialStatementMovementForm.setLocationRelativeTo(view); financialStatementMovementForm.setVisible(true); - financialStatementMovementForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); newFinancialStatementMovement=financialStatementMovementForm.getFinancialStatement(); // null == cancel action @@ -204,7 +201,6 @@ // jaxx constructor don't call super() ? financialStatementHeaderForm.setLocationRelativeTo(view); financialStatementHeaderForm.setVisible(true); - financialStatementHeaderForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action financialStatement = financialStatementHeaderForm.getFinancialStatement(); } @@ -216,7 +212,6 @@ // 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/financialstatementchart/FinancialStatementHeaderForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.FinancialStatement id="financialStatement" javaBean='null'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.entity.FinancialStatement id="financialStatement" javaBean='null'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -22,7 +22,9 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <org.chorem.lima.ui.fiscalperiod.FiscalPeriodTableModel id="modelFiscalPeriodTable"/> <script> <![CDATA[ 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:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ import static org.nuiton.i18n.I18n._; -import javax.swing.JDialog; import javax.swing.JOptionPane; import org.jdesktop.swingx.JXTable; import org.nuiton.util.DateUtil; @@ -67,7 +66,6 @@ // 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/identity/IdentityForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <IdentityHandler id="handler" javaBean="new IdentityHandler()" /> <org.chorem.lima.entity.Identity id="identity" javaBean='handler.getIdentity()'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx 2011-05-20 14:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx 2011-05-23 08:39:31 UTC (rev 3140) @@ -23,7 +23,9 @@ #L% --> -<JDialog modal="true"> +<JDialog modal="true" + defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + onWindowClosing="performCancel();"> <jaxx.runtime.swing.JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="validOk" javaBean='true'/> 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:30:16 UTC (rev 3139) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2011-05-23 08:39:31 UTC (rev 3140) @@ -27,7 +27,6 @@ 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; @@ -100,7 +99,6 @@ addLetterForm.setLocationRelativeTo(view); addLetterForm.setVisible(true); - addLetterForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); //false = cancel Action if (addLetterForm.validOk){

1 0

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

May 20, 2011

Author: vsalaun Date: 2011-05-20 16:30:16 +0200 (Fri, 20 May 2011) New Revision: 3139 Url: http://chorem.org/repositories/revision/lima/3139 Log: #395 correction du bug dans les JDialog lors de la fermeture (2/2) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2011-05-20 14:29:19 UTC (rev 3138) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookViewHandler.java 2011-05-20 14:30:16 UTC (rev 3139) @@ -26,6 +26,8 @@ package org.chorem.lima.ui.entrybook; import static org.nuiton.i18n.I18n._; + +import javax.swing.JDialog; import javax.swing.JOptionPane; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -77,6 +79,7 @@ // jaxx constructor don't call super() ? entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); + entryBookForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action newEntryBook = entryBookForm.getEntryBook(); @@ -110,6 +113,7 @@ // jaxx constructor don't call super() ? entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); + entryBookForm.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); // null == cancel action selectedEntryBook = entryBookForm.getEntryBook(); @@ -160,6 +164,7 @@ new EntryBookImportForm(); form.setLocationRelativeTo(view); form.setVisible(true); + form.setDefaultCloseOperation(JDialog.EXIT_ON_CLOSE); Object value = form.getRadioButtons().getSelectedValue(); // if action confirmed

1 0

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