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

r3191 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: entrybooksreports financialstatementreport ledger
by vsalaun＠users.chorem.org 30 Jun '11

30 Jun '11

Author: vsalaun Date: 2011-06-30 11:47:13 +0200 (Thu, 30 Jun 2011) New Revision: 3191 Url: http://chorem.org/repositories/revision/lima/3191 Log: block document creation when the fiscal year isn't blocked Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-06-29 16:01:29 UTC (rev 3190) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2011-06-30 09:47:13 UTC (rev 3191) @@ -32,13 +32,19 @@ import java.net.URI; import java.net.URISyntaxException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; +import java.util.List; + +import javax.swing.JOptionPane; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.DocumentServiceMonitorable; import org.chorem.lima.business.FinancialTransactionServiceMonitorable; +import org.chorem.lima.business.FiscalPeriodServiceMonitorable; import org.chorem.lima.business.HttpServerServiceMonitorable; import org.chorem.lima.business.ImportServiceMonitorable; import org.chorem.lima.business.LimaException; @@ -47,6 +53,7 @@ import org.chorem.lima.business.utils.DocumentsEnum; import org.chorem.lima.business.utils.FormatsEnum; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; @@ -69,6 +76,7 @@ /** Services. */ protected ReportServiceMonitorable reportService; protected DocumentServiceMonitorable documentService; + protected FiscalPeriodServiceMonitorable fiscalPeriodService; /** Account. */ protected EntryBook selectedEntryBook; @@ -95,6 +103,9 @@ documentService = LimaServiceFactory.getInstance().getService( DocumentServiceMonitorable.class); + fiscalPeriodService = + LimaServiceFactory.getInstance().getService( + FiscalPeriodServiceMonitorable.class); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); LimaServiceFactory.getInstance().getService( @@ -178,28 +189,61 @@ public void createDocument() { if (selectedBeginDate != null && selectedEndDate != null){ - FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); - String address = LimaConfig.getInstance().getHostAdress(); + //looks for all blocked fiscal periods + List<FiscalPeriod> blockedFiscalPeriods = new ArrayList<FiscalPeriod>(); try { - String url = "http://"+address+":"+port+"/?beginDate=" - +dateFormat.format(selectedBeginDate) - +"&endDate="+dateFormat.format(selectedEndDate) - +"&format="+selectedEnum.getExtension()+"&model=" - + DocumentsEnum.ENTRYBOOKS.getFileName(); - Desktop.getDesktop().browse(new URI(url)); + blockedFiscalPeriods = fiscalPeriodService.getAllBlockedFiscalPeriods(); + } catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Enable to create document ", eee); + } + ErrorHelper.showErrorDialog("Enable to create document ", eee); + } + + //tells if the fiscaPeriod as been found and is blocked + boolean error = true; + + for (FiscalPeriod blockedFiscalPeriod : blockedFiscalPeriods) { + if (blockedFiscalPeriod.getBeginDate().equals(selectedBeginDate) + && blockedFiscalPeriod.getEndDate().equals(selectedEndDate) + && blockedFiscalPeriod.getLocked()) { + error = false; + } + } + + //shows error message to user if the fiscalPeriod is unblocked + if (error) { + JOptionPane.showMessageDialog( + view, + "Can't create document on an open fiscal year", + _("lima.common.error"), + JOptionPane.ERROR_MESSAGE); + } else { + + FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); + String address = LimaConfig.getInstance().getHostAdress(); - String url2 = "http://"+address+":"+port+"/?beginDate=" - +dateFormat.format(selectedBeginDate) - +"&endDate="+dateFormat.format(selectedEndDate) - +"&format="+selectedEnum.getExtension()+"&model=" - + DocumentsEnum.GENERAL_ENTRYBOOK.getFileName(); - Desktop.getDesktop().browse(new URI(url2)); + try { + String url = "http://"+address+":"+port+"/?beginDate=" + + dateFormat.format(selectedBeginDate) + + "&endDate="+dateFormat.format(selectedEndDate) + + "&format="+selectedEnum.getExtension()+"&model=" + + DocumentsEnum.ENTRYBOOKS.getFileName(); + Desktop.getDesktop().browse(new URI(url)); + + String url2 = "http://"+address+":"+port+"/?beginDate=" + + dateFormat.format(selectedBeginDate) + + "&endDate="+dateFormat.format(selectedEndDate) + + "&format="+selectedEnum.getExtension()+"&model=" + + DocumentsEnum.GENERAL_ENTRYBOOK.getFileName(); + Desktop.getDesktop().browse(new URI(url2)); - } catch (IOException e) { - log.error("Can't open browser", e); - } catch (URISyntaxException e) { - log.error("Can't create news URI", e); + } catch (IOException e) { + log.error("Can't open browser", e); + } catch (URISyntaxException e) { + log.error("Can't create news URI", e); + } } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-06-29 16:01:29 UTC (rev 3190) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportTableModel.java 2011-06-30 09:47:13 UTC (rev 3191) @@ -232,11 +232,19 @@ // Just read, no write return false; } + + public Date getBeginDate() { + return selectedBeginDate; + } public void setBeginDate(Date date){ selectedBeginDate = date; } + public Date getEndDate() { + return selectedEndDate; + } + public void setEndDate(Date date){ selectedEndDate = date; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2011-06-29 16:01:29 UTC (rev 3190) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2011-06-30 09:47:13 UTC (rev 3191) @@ -25,7 +25,22 @@ package org.chorem.lima.ui.financialstatementreport; +import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.swing.JOptionPane; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.FiscalPeriodServiceMonitorable; +import org.chorem.lima.business.LimaException; import org.chorem.lima.business.utils.FormatsEnum; +import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.ErrorHelper; /** * Handler associated with accounts reports view. @@ -37,13 +52,21 @@ * By : $Author$ */ public class FinancialStatementReportViewHandler { + + /** log. */ + private static final Log log = LogFactory.getLog(FinancialStatementReportViewHandler.class); protected FinancialStatementReportView view; protected FinancialStatementReportTableModel model; + + protected FiscalPeriodServiceMonitorable fiscalPeriodService; protected FinancialStatementReportViewHandler(FinancialStatementReportView view) { this.view = view; + fiscalPeriodService = + LimaServiceFactory.getInstance().getService( + FiscalPeriodServiceMonitorable.class); } public void refresh(){ @@ -58,8 +81,44 @@ public void createDocument() { model = view.getModelTable(); - FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); - model.createDocument(selectedEnum); - + Date selectedBeginDate = model.getBeginDate(); + Date selectedEndDate = model.getEndDate(); + + if ((selectedBeginDate != null) && (selectedEndDate != null)) { + //looks for all blocked fiscal periods + List<FiscalPeriod> blockedFiscalPeriods = new ArrayList<FiscalPeriod>(); + try { + blockedFiscalPeriods = fiscalPeriodService.getAllBlockedFiscalPeriods(); + } catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Enable to create document ", eee); + } + ErrorHelper.showErrorDialog("Enable to create document ", eee); + } + + //tells if the fiscaPeriod as been found and is blocked + boolean error = true; + + for (FiscalPeriod blockedFiscalPeriod : blockedFiscalPeriods) { + if (blockedFiscalPeriod.getBeginDate().equals(selectedBeginDate) + && blockedFiscalPeriod.getEndDate().equals(selectedEndDate) + && blockedFiscalPeriod.getLocked()) { + error = false; + } + } + + //shows error message to user if the fiscalPeriod is unblocked + if (error) { + JOptionPane.showMessageDialog( + view, + "Can't create document on an open fiscal year", + _("lima.common.error"), + JOptionPane.ERROR_MESSAGE); + } else { + FormatsEnum selectedEnum = + (FormatsEnum) view.getDocumentEditor().getSelectedItem(); + model.createDocument(selectedEnum); + } + } } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-06-29 16:01:29 UTC (rev 3190) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2011-06-30 09:47:13 UTC (rev 3191) @@ -36,6 +36,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; + +import javax.swing.JOptionPane; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; @@ -43,6 +46,7 @@ import org.chorem.lima.beans.ReportsDatas; import org.chorem.lima.business.DocumentServiceMonitorable; import org.chorem.lima.business.FinancialTransactionServiceMonitorable; +import org.chorem.lima.business.FiscalPeriodServiceMonitorable; import org.chorem.lima.business.HttpServerServiceMonitorable; import org.chorem.lima.business.ImportServiceMonitorable; import org.chorem.lima.business.LimaException; @@ -52,6 +56,7 @@ import org.chorem.lima.business.utils.EntryComparator; import org.chorem.lima.business.utils.FormatsEnum; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; @@ -72,6 +77,7 @@ /** Services. */ protected ReportServiceMonitorable reportService; protected DocumentServiceMonitorable documentService; + protected FiscalPeriodServiceMonitorable fiscalPeriodService; /** Begin Date. */ protected Date selectedBeginDate; @@ -103,6 +109,9 @@ documentService = LimaServiceFactory.getInstance().getService( DocumentServiceMonitorable.class); + fiscalPeriodService = + LimaServiceFactory.getInstance().getService( + FiscalPeriodServiceMonitorable.class); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); LimaServiceFactory.getInstance().getService( @@ -191,21 +200,54 @@ public void createDocument() { if (selectedBeginDate != null && selectedEndDate != null){ - FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); - String address = LimaConfig.getInstance().getHostAdress(); + //looks for all blocked fiscal periods + List<FiscalPeriod> blockedFiscalPeriods = new ArrayList<FiscalPeriod>(); try { - String url = "http://"+address+":"+port+"/?beginDate=" - +dateFormat.format(selectedBeginDate) - +"&endDate="+dateFormat.format(selectedEndDate) - +"&format="+selectedEnum.getExtension()+"&model=" - + DocumentsEnum.LEDGER.getFileName(); - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException e) { - log.error("Can't open browser", e); - } catch (URISyntaxException e) { - log.error("Can't create news URI", e); + blockedFiscalPeriods = fiscalPeriodService.getAllBlockedFiscalPeriods(); + } catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Enable to create document ", eee); + } + ErrorHelper.showErrorDialog("Enable to create document ", eee); } + + //tells if the fiscaPeriod as been found and is blocked + boolean error = true; + + for (FiscalPeriod blockedFiscalPeriod : blockedFiscalPeriods) { + if (blockedFiscalPeriod.getBeginDate().equals(selectedBeginDate) + && blockedFiscalPeriod.getEndDate().equals(selectedEndDate) + && blockedFiscalPeriod.getLocked()) { + error = false; + } + } + + //shows error message to user if the fiscalPeriod is unblocked + if (error) { + JOptionPane.showMessageDialog( + view, + "Can't create document on an open fiscal year", + _("lima.common.error"), + JOptionPane.ERROR_MESSAGE); + } else { + + FormatsEnum selectedEnum = (FormatsEnum) view.getDocumentEditor().getSelectedItem(); + String address = LimaConfig.getInstance().getHostAdress(); + + try { + String url = "http://"+address+":"+port+"/?beginDate=" + + dateFormat.format(selectedBeginDate) + + "&endDate="+dateFormat.format(selectedEndDate) + + "&format="+selectedEnum.getExtension()+"&model=" + + DocumentsEnum.LEDGER.getFileName(); + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException e) { + log.error("Can't open browser", e); + } catch (URISyntaxException e) { + log.error("Can't create news URI", e); + } + } } }

1 0

r3190 - in trunk/lima-business/src/main/java/org/chorem/lima/business: ejb ejbinterface
by vsalaun＠users.chorem.org 29 Jun '11

29 Jun '11

Author: vsalaun Date: 2011-06-29 18:01:29 +0200 (Wed, 29 Jun 2011) New Revision: 3190 Url: http://chorem.org/repositories/revision/lima/3190 Log: add method to search for all blocked fiscal periods Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2011-06-29 09:54:02 UTC (rev 3189) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2011-06-29 16:01:29 UTC (rev 3190) @@ -161,7 +161,34 @@ return result; } + + + /** + * return all blocked fiscal periods + */ + public List<FiscalPeriod> getAllBlockedFiscalPeriods() throws LimaException { + + List<FiscalPeriod> result = null; + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + FiscalPeriodDAO fiscalPeriodDAO = + LimaCallaoDAOHelper.getFiscalPeriodDAO(transaction); + result = fiscalPeriodDAO.findAllByLocked(true); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + + return result; + } + + /** * return all unblocked fiscal periods */ Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java 2011-06-29 09:54:02 UTC (rev 3189) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FiscalPeriodService.java 2011-06-29 16:01:29 UTC (rev 3190) @@ -44,6 +44,8 @@ List<FiscalPeriod> getAllFiscalPeriods() throws LimaException; + List<FiscalPeriod> getAllBlockedFiscalPeriods() throws LimaException; + List<FiscalPeriod> getAllUnblockedFiscalPeriods() throws LimaException; FiscalPeriod getLastFiscalPeriod() throws LimaException;

1 0

r3189 - trunk/lima-business/src/test/java/org/chorem/lima/business
by vsalaun＠users.chorem.org 29 Jun '11

29 Jun '11

Author: vsalaun Date: 2011-06-29 11:54:02 +0200 (Wed, 29 Jun 2011) New Revision: 3189 Url: http://chorem.org/repositories/revision/lima/3189 Log: bug fix: run a new database for each test instead of using the same one, to be improved Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java Modified: trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java =================================================================== --- trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2011-06-28 14:54:14 UTC (rev 3188) +++ trunk/lima-business/src/test/java/org/chorem/lima/business/LimaTestConfig.java 2011-06-29 09:54:02 UTC (rev 3189) @@ -63,6 +63,8 @@ // override somes String testDir = System.getProperty("java.io.tmpdir") + File.separator + "limatestdb"; + //TODO clear database instead of creating a new one for each test + testDir += System.currentTimeMillis(); testProperties.put("lima.dir", testDir); testProperties.put("hibernate.connection.url", "jdbc:h2:file:" + testDir + File.separator + "data"); testProperties.put("hibernate.hbm2ddl.auto", "update");

1 0

r3188 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/opening resources/import
by vsalaun＠users.chorem.org 28 Jun '11

28 Jun '11

Author: vsalaun Date: 2011-06-28 16:54:14 +0200 (Tue, 28 Jun 2011) New Revision: 3188 Url: http://chorem.org/repositories/revision/lima/3188 Log: add a new default french EntryBook Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx trunk/lima-swing/src/main/resources/import/eb_default.csv Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2011-06-28 13:48:18 UTC (rev 3187) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/opening/CreateEntryBookPanel.jaxx 2011-06-28 14:54:14 UTC (rev 3188) @@ -34,7 +34,7 @@ </row> <row> <cell> - <JCheckBox id='importEntryBook' text='lima.importexport.defaultentrybooks' selected='false'/> + <JCheckBox id='importEntryBook' text='lima.importexport.defaultentrybooks' selected='true'/> </cell> </row> </Table> Modified: trunk/lima-swing/src/main/resources/import/eb_default.csv =================================================================== --- trunk/lima-swing/src/main/resources/import/eb_default.csv 2011-06-28 13:48:18 UTC (rev 3187) +++ trunk/lima-swing/src/main/resources/import/eb_default.csv 2011-06-28 14:54:14 UTC (rev 3188) @@ -2,3 +2,4 @@ "ENBK";"VTE";"Journal des ventes" "ENBK";"ODT";"Journal des opérations diverses" "ENBK";"BQE";"Journal de trésorerie" +"ENBK";"CSE";"Journal de caisse"

1 0

r3187 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org 28 Jun '11

28 Jun '11

Author: vsalaun Date: 2011-06-28 15:48:18 +0200 (Tue, 28 Jun 2011) New Revision: 3187 Url: http://chorem.org/repositories/revision/lima/3187 Log: #410 empeche l'effacement involontaire des montants 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-06-28 10:19:17 UTC (rev 3186) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-06-28 13:48:18 UTC (rev 3187) @@ -120,7 +120,10 @@ && e.getKeyCode() <= KeyEvent.VK_9) || e.getKeyCode() == KeyEvent.VK_COMMA || e.getKeyCode() == KeyEvent.VK_PERIOD) { - textField.setText(String.valueOf(e.getKeyChar())); + //check if the TextField is selectAll + if (textField.getSelectedText().equals(textField.getText())) { + textField.setText(String.valueOf(e.getKeyChar())); + } keyPressed = true; } else if (e.getKeyChar() == KeyEvent.VK_BACK_SPACE){ textField.setText("");

1 0

r3186 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org 28 Jun '11

28 Jun '11

Author: vsalaun Date: 2011-06-28 12:19:17 +0200 (Tue, 28 Jun 2011) New Revision: 3186 Url: http://chorem.org/repositories/revision/lima/3186 Log: #411 empeche l'effacement involontaire dans les dates 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-06-27 16:31:06 UTC (rev 3185) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DateTableCellEditor.java 2011-06-28 10:19:17 UTC (rev 3186) @@ -48,12 +48,13 @@ * @author ore */ public class DateTableCellEditor extends AbstractCellEditor - implements TableCellEditor, FocusListener, AncestorListener, KeyListener { + implements TableCellEditor, FocusListener, AncestorListener { private final JXDatePicker datePicker; private static final long serialVersionUID = 1L; private static DateTableCellEditor editor; - private boolean keyPressed; + + //used to tell if the user has pressed a key private Date date; /** @@ -63,8 +64,6 @@ datePicker = new JXDatePicker(LimaContext.getContext().getConfig().getLocale()); datePicker.getEditor().addFocusListener(this); datePicker.getEditor().addAncestorListener(this); - datePicker.getEditor().addKeyListener(this); - keyPressed = false; } @Override @@ -116,7 +115,7 @@ /** * Listeners - */ + */ public void focusGained(FocusEvent e) { SwingUtilities.invokeLater(new Runnable() { public void run() { @@ -126,7 +125,6 @@ } public void focusLost(FocusEvent e) { - keyPressed = false; } @Override @@ -146,26 +144,4 @@ 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) { - 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){ - keyPressed = true; - } - } - } - }

1 0

r3185 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/java/org/chorem/lima/business/ejbinterface lima-business/src/main/resources/i18n lima-swing/src/main/java/org/chorem/lima
by vsalaun＠users.chorem.org 27 Jun '11

27 Jun '11

Author: vsalaun Date: 2011-06-27 18:31:06 +0200 (Mon, 27 Jun 2011) New Revision: 3185 Url: http://chorem.org/repositories/revision/lima/3185 Log: add OptionsService in order to use some swing config on business config Added: trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2011-06-17 15:32:15 UTC (rev 3184) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2011-06-27 16:31:06 UTC (rev 3185) @@ -119,6 +119,16 @@ Integer port = Integer.valueOf(httpPort); return port; } + + public String getScale() { + String scale = getOption(Option.SCALE.getKey()); + return scale; + } + + public void setScale(String locale) { + setOption(Option.SCALE.key, locale); + saveForUser(); + } /** * Load configuration with custom file name. @@ -150,7 +160,8 @@ RULES_NATIONALTY("lima.rules", _("lima.config.rulesnationality"), "default", String.class, false, false), REPORTS_DIR("lima.report.dir", _("lima.config.reportsdir"), "", String.class, false, false), HTTP_PORT("lima.httpport", _("lima.config.httpport"), "5462", String.class, false, false), - SERVER_ADRESS("lima.serveraddress", _("lima.config.serveraddress"), "", String.class, false, false); + SERVER_ADRESS("lima.serveraddress", _("lima.config.serveraddress"), "", String.class, false, false), + SCALE("lima.scale", _("lima.config.scale"), "2", String.class, false, false); private final String key; private final String description; Added: trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/OptionsServiceMonitorable.java 2011-06-27 16:31:06 UTC (rev 3185) @@ -0,0 +1,7 @@ +package org.chorem.lima.business; + +import org.chorem.lima.business.ejbinterface.OptionsService; + +public interface OptionsServiceMonitorable extends OptionsService, ServiceMonitorable { + +} 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-06-17 15:32:15 UTC (rev 3184) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-06-27 16:31:06 UTC (rev 3185) @@ -52,6 +52,7 @@ import org.chorem.lima.business.ejbinterface.FinancialTransactionService; import org.chorem.lima.business.ejbinterface.FinancialTransactionServiceLocal; import org.chorem.lima.business.ejbinterface.ReportService; +import org.chorem.lima.business.ejbinterface.OptionsService; import org.chorem.lima.business.utils.FinancialPeriodComparator; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.AccountDAO; @@ -104,6 +105,9 @@ @EJB protected EntryBookService entryBookService; + + @EJB + protected OptionsService optionsService; public FinancialTransactionServiceImpl() { LimaConfig config = LimaConfig.getInstance(); @@ -268,6 +272,7 @@ public List<FinancialTransaction> getAllInexactFinancialTransactions(FiscalPeriod fiscalPeriod) throws LimaException { TopiaContext topiaContext = null; List<FinancialTransaction> result = null; + List<FinancialTransaction> checkedResult = new ArrayList<FinancialTransaction>(); try { topiaContext = beginTransaction(); @@ -294,8 +299,18 @@ .addLoad(entryBookLabelProperty); result = financialTransactionDAO.findAllByQuery(query); + for (FinancialTransaction fTransaction : result) { + BigDecimal credit = fTransaction.getAmountCredit(); + BigDecimal debit = fTransaction.getAmountDebit(); + credit = credit.setScale(optionsService.getScale(), + BigDecimal.ROUND_HALF_UP); + debit = debit.setScale(optionsService.getScale(), + BigDecimal.ROUND_HALF_UP); + if (credit.equals(debit)) { + checkedResult.add(fTransaction); + } + } - } catch (TopiaException ex) { doCatch(topiaContext, ex, log); Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/OptionsServiceImpl.java 2011-06-27 16:31:06 UTC (rev 3185) @@ -0,0 +1,30 @@ +package org.chorem.lima.business.ejb; + +import javax.ejb.Stateless; + +import org.chorem.lima.business.LimaConfig; +import org.chorem.lima.business.ejbinterface.OptionsService; +import org.chorem.lima.business.ejbinterface.OptionsServiceLocal; + +@Stateless +public class OptionsServiceImpl extends AbstractLimaService implements OptionsService, OptionsServiceLocal { + + protected String scale; + + public OptionsServiceImpl() { + scale = LimaConfig.getInstance().getScale(); + } + + public int getScale() { + if (scale.isEmpty()) { + return 2; + } else { + return Integer.valueOf(scale); + } + } + + public void setScale(String scale) { + LimaConfig.getInstance().setScale(scale); + } + +} Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsService.java 2011-06-27 16:31:06 UTC (rev 3185) @@ -0,0 +1,32 @@ +package org.chorem.lima.business.ejbinterface; + +import javax.ejb.Remote; + +/** + * Service de report des certaines configurations du swing dans business + * + * Actuellement : + * <ul> + * <li>scale</li> + * </ul> + * + * @author salaun + * + */ + +@Remote +public interface OptionsService { + + /** + * Sets the swing scale to the business scale + * @param String: scale + */ + void setScale(String scale); + + /** + * Gets the business scale + * @return String: scale + */ + int getScale(); + +} Added: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java (rev 0) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/OptionsServiceLocal.java 2011-06-27 16:31:06 UTC (rev 3185) @@ -0,0 +1,8 @@ +package org.chorem.lima.business.ejbinterface; + +import javax.ejb.Local; + +@Local +public interface OptionsServiceLocal extends OptionsService { + +} Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2011-06-17 15:32:15 UTC (rev 3184) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2011-06-27 16:31:06 UTC (rev 3185) @@ -65,4 +65,5 @@ lima.config.httpport=HTTP Port lima.config.reportsdir=Reports directories lima.config.rulesnationality=Rules Nationality +lima.config.scale=Scale lima.config.serveraddress=Server Address Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2011-06-17 15:32:15 UTC (rev 3184) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2011-06-27 16:31:06 UTC (rev 3185) @@ -65,4 +65,5 @@ lima.config.httpport=Port HTTP lima.config.reportsdir=Dossier des rapports lima.config.rulesnationality=R\u00E8gles nationales +lima.config.scale=Pr\u00E9cision lima.config.serveraddress=Addresse serveur Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-06-17 15:32:15 UTC (rev 3184) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2011-06-27 16:31:06 UTC (rev 3185) @@ -27,13 +27,23 @@ import static org.nuiton.i18n.I18n._; import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; import java.util.Locale; +import java.util.Properties; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.actions.MiscAction; +import org.chorem.lima.business.OptionsServiceMonitorable; import org.chorem.lima.entity.LimaCallaoDAOHelper; +import org.chorem.lima.service.LimaServiceFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.FileUtil; +import org.nuiton.util.SortedProperties; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; import org.nuiton.util.converter.ConverterUtil; @@ -58,6 +68,11 @@ private static final String configFile = "lima-config.properties"; + //used for services + protected static final String SERVICECONFIGFILE = "lima.properties"; + + protected OptionsServiceMonitorable optionsService; + /** * La version du logiciel. */ @@ -109,6 +124,7 @@ // TODO what is it for ? //FileUtil.setCurrentDirectory(getLimaUserDirectory()); //getLimaUserDirectory().mkdirs(); + } public static LimaConfig getInstance() { @@ -220,6 +236,8 @@ setOption(Option.SCALE.key, scale); saveForUser(); firePropertyChange("scale", null, scale); + System.out.println("new scale" + scale); + optionsService.setScale(scale); } /** @@ -455,4 +473,98 @@ this.aliases = aliases; } } + + /** + * Save configuration, in user home directory using the + * {@link #getConfigFileName}. Default, env and commande line note saved + * + * @param excludeKeys optional list of keys to exclude from + */ + public void saveForUser(String... excludeKeys) { + + File file = getUserConfigFile(); + if (log.isDebugEnabled()) { + log.debug("will save user configuration in " + file); + } + try { + save(file, false, excludeKeys); + } catch (IOException eee) { + if (log.isWarnEnabled()) { + log.warn(_("nuitonutil.error.applicationconfig.save", file), + eee); + } + } + } + + /** + * Save configuration, in specified file. + * + * @param file file where config will be writen + * @param forceAll if true save all config option + * (with defaults, classpath, env, command line) + * @param excludeKeys optional list of keys to exclude from + * @throws IOException if IO pb + */ + public void save(File file, + boolean forceAll, + String... excludeKeys) throws IOException { + + // + String[] serverProperties = {"scale"}; + + // store sorted in file + Properties prop = new SortedProperties(); + + // store server properties in file + Properties serverProp = new SortedProperties(); + + if (forceAll) { + prop.putAll(defaults); + prop.putAll(classpath); + } + prop.putAll(etcfile); + prop.putAll(homefile); + prop.putAll(curfile); + if (forceAll) { + prop.putAll(jvm); + prop.putAll(env); + prop.putAll(line); + } + prop.putAll(options); + + for (String excludeKey : excludeKeys) { + prop.remove(excludeKey); + } + + for (String serverPropertie : serverProperties) { + if (prop.containsKey(serverPropertie)) { + serverProp.put(serverPropertie, prop.get(serverPropertie)); + } + } + + // Ano #687 : create parentFile before using it in FileWriter + boolean dirCreated = FileUtil.createDirectoryIfNecessary(file.getParentFile()); + if (dirCreated && log.isDebugEnabled()) { + log.debug("Creation of config directory " + file.getParent()); + } + + OutputStream stream = new FileOutputStream(file); + try { + prop.store(stream, "Last saved " + new java.util.Date()); + } finally { + stream.close(); + } + + optionsService = + LimaServiceFactory.getInstance().getService( + OptionsServiceMonitorable.class); + + if (!serverProp.isEmpty()) { + if (serverProp.containsKey("scale")) { + if (!serverProp.getProperty("scale").isEmpty()) { + optionsService.setScale(serverProp.getProperty("scale")); + } + } + } + } }

1 0

r3184 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: financialtransaction financialtransactionsearch financialtransactionunbalanced
by vsalaun＠users.chorem.org 17 Jun '11

17 Jun '11

Author: vsalaun Date: 2011-06-17 17:32:15 +0200 (Fri, 17 Jun 2011) New Revision: 3184 Url: http://chorem.org/repositories/revision/lima/3184 Log: correct the selection on the right row while updating datas (FinancialTransactionUnbalanced) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -242,11 +242,6 @@ y_tab++; } - System.out.println("x_tab : " + x_tab); - System.out.println("max_x : " + max_x); - System.out.println("y_tab : " + y_tab); - System.out.println("max_y : " + max_y); - //skip all cell while not editable or if end of table add entry or transaction or end of table while (!isCellEditable(y_tab, x_tab) && end ){ //if end of row 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-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -407,14 +407,12 @@ } } - - /** * * @param value * @param description * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEmptyEntry(Object value, String description, int row) throws LimaException { @@ -450,7 +448,7 @@ * @param value * @param entry * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEntry(Object value, Entry entry, int row) throws LimaException { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -427,7 +427,7 @@ * * @param value * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEmptyEntry(Object value, int row) throws LimaException { @@ -564,7 +564,7 @@ * @param value * @param description * @param row - * @return int: indexOf new FianancialTransaction + * @return int: indexOf new Entry * @throws LimaException */ public int addEmptyEntry(Object value, String description, int row) throws LimaException { @@ -595,6 +595,14 @@ return newrow; } + /** + * + * @param value + * @param entry + * @param row + * @return int: indexOf new Entry + * @throws LimaException + */ public int addEntry(Object value, Entry entry, int row) throws LimaException { FinancialTransaction currentTransaction = null; int financialTransactionRow = 0; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -360,10 +360,16 @@ } + /** - * @throws LimaException + * + * @param value + * @param description + * @param row + * @return int: indexOf new Entry + * @throws LimaException */ - public void addEmptyEntry(Object value, String description, int row) throws LimaException { + public int addEmptyEntry(Object value, String description, int row) throws LimaException { FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); @@ -382,9 +388,11 @@ } //create it entry.setFinancialTransaction(currentTransaction); - financialTransactionService.createEntry(entry); + Entry newEntry = financialTransactionService.createEntry(entry); //on recharge la liste - refresh(); + int newrow = cacheDataList.indexOf(newEntry); + fireTableRowsInserted(row, row); + return newrow; } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2011-06-17 15:23:41 UTC (rev 3183) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java 2011-06-17 15:32:15 UTC (rev 3184) @@ -78,13 +78,13 @@ try { //copy + paste the description String description = (String) tableModel.getValueAt(indexSelectedRow, 4); - tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); + int index = tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval(indexSelectedRow+1, indexSelectedRow+1); //focus on second column - table.changeSelection(indexSelectedRow+1, 1, false, false); + table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); } catch (LimaException eee){ if (log.isErrorEnabled()) {

1 0

r3183 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by vsalaun＠users.chorem.org 17 Jun '11

17 Jun '11

Author: vsalaun Date: 2011-06-17 17:23:41 +0200 (Fri, 17 Jun 2011) New Revision: 3183 Url: http://chorem.org/repositories/revision/lima/3183 Log: correct the selection on the right row while updating datas (FinancialTransactionSearch) 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/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 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-06-17 14:59:28 UTC (rev 3182) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-06-17 15:23:41 UTC (rev 3183) @@ -195,22 +195,22 @@ && e.getModifiers() == KeyEvent.CTRL_MASK)) { handler.addEmptyEntry(); } + + // paste : ctrl + c - // add financial transaction with the key combination : ctrl + tab + // add financial transaction with the key combination : ctrl + c if (e.getKeyCode() == KeyEvent.VK_C && e.getModifiers() == KeyEvent.CTRL_MASK) { handler.copyRow(); } - // copy : ctrl + c + // copy : ctrl + v - // add financial transaction with the key combination : ctrl + tab + // add financial transaction with the key combination : ctrl + v if (e.getKeyCode() == KeyEvent.VK_V && e.getModifiers() == KeyEvent.CTRL_MASK) { handler.pasteRow(); } - - // paste : ctrl + v // add financial transaction with the key combination : ctrl + tab if (e.getKeyCode() == KeyEvent.VK_TAB Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-06-17 14:59:28 UTC (rev 3182) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-06-17 15:23:41 UTC (rev 3183) @@ -358,10 +358,13 @@ } + /** - * @throws LimaException + * + * @return int: indexOf new FianancialTransaction + * @throws LimaException */ - public void addFinancialTransaction() throws LimaException{ + public int addFinancialTransaction() throws LimaException{ /* Calling transaction service */ FinancialTransaction financialTransaction = new FinancialTransactionImpl(); financialTransaction.setAmountDebit(BigDecimal.ZERO); @@ -405,12 +408,14 @@ // set date to the financial transaction financialTransaction.setTransactionDate(transactionDate); // create it - financialTransactionService.createFinancialTransaction(financialTransaction); + FinancialTransaction fTransaction = + financialTransactionService.createFinancialTransaction(financialTransaction); //on recharge la liste cacheDataList = getDataList(financialTransactionSearch); - int row = getDataList(financialTransactionSearch).indexOf(financialTransaction); + int row = cacheDataList.indexOf(fTransaction); fireTableRowsInserted(row, row); + return row; //fireTableDataChanged(); } else { @@ -418,11 +423,14 @@ } } - /** - * @throws LimaException + * + * @param value + * @param row + * @return int: indexOf new FianancialTransaction + * @throws LimaException */ - public void addEmptyEntry(Object value, int row) throws LimaException { + public int addEmptyEntry(Object value, int row) throws LimaException { FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); @@ -438,10 +446,12 @@ } //create it entry.setFinancialTransaction(currentTransaction); - financialTransactionService.createEntry(entry); + Entry newEntry = financialTransactionService.createEntry(entry); //on recharge la liste cacheDataList = getDataList(financialTransactionSearch); - fireTableDataChanged(); + int newrow = cacheDataList.indexOf(newEntry); + fireTableRowsInserted(newrow, newrow); + return newrow; } /** @@ -549,11 +559,15 @@ fireTableDataChanged(); } - /** - * @throws LimaException + * + * @param value + * @param description + * @param row + * @return int: indexOf new FianancialTransaction + * @throws LimaException */ - public void addEmptyEntry(Object value, String description, int row) throws LimaException { + public int addEmptyEntry(Object value, String description, int row) throws LimaException { FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); @@ -572,14 +586,16 @@ } //create it entry.setFinancialTransaction(currentTransaction); - financialTransactionService.createEntry(entry); + Entry newEntry = financialTransactionService.createEntry(entry); //on recharge la liste cacheDataList = getDataList(financialTransactionSearch); - fireTableDataChanged(); + int newrow = cacheDataList.indexOf(newEntry); + fireTableRowsInserted(newrow, newrow); + return newrow; } - public void addEntry(Object value, Entry entry, int row) throws LimaException { + public int addEntry(Object value, Entry entry, int row) throws LimaException { FinancialTransaction currentTransaction = null; int financialTransactionRow = 0; Object currentRow = cacheDataList.get(row); @@ -601,12 +617,14 @@ } //create it entry.setFinancialTransaction(currentTransaction); - financialTransactionService.createEntry(entry); + Entry newEntry = financialTransactionService.createEntry(entry); fireTableRowsUpdated(financialTransactionRow, getRowCount()-1); //on recharge la liste cacheDataList = getDataList(financialTransactionSearch); - fireTableDataChanged(); + int newrow = cacheDataList.indexOf(newEntry); + fireTableRowsInserted(newrow, newrow); + return newrow; } @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2011-06-17 14:59:28 UTC (rev 3182) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2011-06-17 15:23:41 UTC (rev 3183) @@ -246,14 +246,14 @@ try { //copy + paste the description String description = (String) tableModel.getValueAt(indexSelectedRow, 4); - tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); + int index = tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval( indexSelectedRow+1, indexSelectedRow+1); //focus on second column - table.changeSelection(indexSelectedRow+1, 1, false, false); + table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); } catch (LimaException eee){ if (log.isErrorEnabled()) { @@ -289,14 +289,14 @@ Object selectedValue = tableModel.getElementAt(indexSelectedRow); if (clipBoard instanceof Entry) { try { - tableModel.addEntry(selectedValue, (Entry) clipBoard, indexSelectedRow); + int index = tableModel.addEntry(selectedValue, (Entry) clipBoard, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval( indexSelectedRow+1, indexSelectedRow+1); //focus on second column - table.changeSelection(indexSelectedRow+1, 1, false, false); + table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); } catch (LimaException eee){ if (log.isErrorEnabled()) { @@ -317,14 +317,14 @@ tableModel = view.getFinancialTransactionSearchTableModel(); try { - tableModel.addFinancialTransaction(); + int index = tableModel.addFinancialTransaction(); //select the new line int numberRow = table.getRowCount(); ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval(numberRow-1, numberRow-1); //focus on first column - table.changeSelection(numberRow-1, 0, false, false); + table.changeSelection(index, 0, false, false); table.requestFocusInWindow(); } catch (LimaException eee) { if (log.isErrorEnabled()) {

1 0

r3182 - 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 17 Jun '11

17 Jun '11

Author: vsalaun Date: 2011-06-17 16:59:28 +0200 (Fri, 17 Jun 2011) New Revision: 3182 Url: http://chorem.org/repositories/revision/lima/3182 Log: correct the selection on the right row while updating datas (FinancialTransaction) 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 trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionServiceLocal.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 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-06-17 12:41:53 UTC (rev 3181) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-06-17 14:59:28 UTC (rev 3182) @@ -118,9 +118,10 @@ } @Override - public void createFinancialTransactionWithTransaction( + public FinancialTransaction createFinancialTransactionWithTransaction( FinancialTransaction financialtransaction, TopiaContext topiaContext) throws LimaException { + FinancialTransaction fTransaction = null; try { //check if the financial period is blocked accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction( @@ -129,13 +130,16 @@ FinancialTransactionDAO financialtransactionDAO = LimaCallaoDAOHelper.getFinancialTransactionDAO(topiaContext); - financialtransactionDAO.create(financialtransaction); + fTransaction = (FinancialTransaction) + financialtransactionDAO.create(financialtransaction); commitTransaction(topiaContext); + } catch (TopiaException ex) { doCatch(topiaContext, ex, log); - } + } + return fTransaction; } /** @@ -143,13 +147,13 @@ * */ @Override - public void createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { + public FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { TopiaContext topiaContext = null; try { topiaContext = beginTransaction(); - createFinancialTransactionWithTransaction(financialtransaction, topiaContext); + return createFinancialTransactionWithTransaction(financialtransaction, topiaContext); } catch (TopiaException ex) { doCatch(topiaContext, ex, log); @@ -157,6 +161,7 @@ finally { doFinally(topiaContext, log); } + return null; } /** @@ -451,9 +456,9 @@ @Override - public void createEntryWithTransaction(Entry entry, + public Entry createEntryWithTransaction(Entry entry, TopiaContext topiaContext) throws LimaException { - + Entry newEntry = null; try { //check if the financial period is blocked @@ -462,7 +467,7 @@ EntryDAO entryDAO = LimaCallaoDAOHelper.getEntryDAO(topiaContext); - entryDAO.create(entry); + newEntry = entryDAO.create(entry); //get new entry amounts BigDecimal entryAmount = entry.getAmount(); @@ -502,7 +507,8 @@ } catch (TopiaException ex) { doCatch(topiaContext, ex, log); - } + } + return newEntry; } /** @@ -513,20 +519,21 @@ */ @Override - public void createEntry(Entry entry) throws LimaException { + public Entry createEntry(Entry entry) throws LimaException { TopiaContext topiaContext = null; try { topiaContext = beginTransaction(); - createEntryWithTransaction(entry, topiaContext); + return createEntryWithTransaction(entry, topiaContext); } catch (TopiaException ex) { doCatch(topiaContext, ex, log); } finally { doFinally(topiaContext, log); - } + } + return null; } 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-06-17 12:41:53 UTC (rev 3181) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionService.java 2011-06-17 14:59:28 UTC (rev 3182) @@ -60,7 +60,7 @@ * @throws LimaException */ - void createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException; + FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException; void updateFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException; @@ -87,7 +87,7 @@ * @throws LimaException */ - void createEntry(Entry entry) throws LimaException; + Entry createEntry(Entry entry) throws LimaException; void updateEntry(Entry entry) throws LimaException; Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionServiceLocal.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionServiceLocal.java 2011-06-17 12:41:53 UTC (rev 3181) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialTransactionServiceLocal.java 2011-06-17 14:59:28 UTC (rev 3182) @@ -44,10 +44,10 @@ @Local public interface FinancialTransactionServiceLocal extends FinancialTransactionService { - void createFinancialTransactionWithTransaction(FinancialTransaction financialtransaction, TopiaContext topiaContext) throws LimaException; + FinancialTransaction createFinancialTransactionWithTransaction(FinancialTransaction financialtransaction, TopiaContext topiaContext) throws LimaException; void updateFinancialTransactionWithTransaction(FinancialTransaction financialtransaction, TopiaContext topiaContext) throws LimaException; - void createEntryWithTransaction(Entry entry, TopiaContext topiaContext) throws LimaException; + Entry createEntryWithTransaction(Entry entry, TopiaContext topiaContext) throws LimaException; } 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-06-17 12:41:53 UTC (rev 3181) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-06-17 14:59:28 UTC (rev 3182) @@ -185,22 +185,22 @@ && e.getModifiers() == KeyEvent.CTRL_MASK)) { handler.addEmptyEntry(); } + + // copy : ctrl + c - // add financial transaction with the key combination : ctrl + tab + // add financial transaction with the key combination : ctrl + c if (e.getKeyCode() == KeyEvent.VK_C && e.getModifiers() == KeyEvent.CTRL_MASK) { handler.copyRow(); } - // copy : ctrl + c + // paste : ctrl + v - // add financial transaction with the key combination : ctrl + tab + // add financial transaction with the key combination : ctrl + v if (e.getKeyCode() == KeyEvent.VK_V && e.getModifiers() == KeyEvent.CTRL_MASK) { handler.pasteRow(); } - - // paste : ctrl + v // add financial transaction with the key combination : ctrl + tab if (e.getKeyCode() == KeyEvent.VK_TAB @@ -230,6 +230,9 @@ y_tab = this.getSelectedRow(); Boolean end = true; + System.out.println("x_tab : " + x_tab); + System.out.println("y_tab : " + y_tab); + if (x_tab < max_x - 1){ x_tab++; } @@ -238,8 +241,14 @@ x_tab=0; y_tab++; } + + System.out.println("x_tab : " + x_tab); + System.out.println("max_x : " + max_x); + System.out.println("y_tab : " + y_tab); + System.out.println("max_y : " + max_y); + //skip all cell while not editable or if end of table add entry or transaction or end of table - while (!isCellEditable(y_tab, x_tab) && end ){ + while (!isCellEditable(y_tab, x_tab) && end ){ //if end of row if (x_tab == max_x-1) { Object object = this.handler.tableModel.getElementAt(y_tab); 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-06-17 12:41:53 UTC (rev 3181) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-06-17 14:59:28 UTC (rev 3182) @@ -355,9 +355,10 @@ /** - * @throws LimaException + * @return int: indexOf new FianancialTransaction + * @throws LimaException */ - public void addFinancialTransaction() throws LimaException{ + public int addFinancialTransaction() throws LimaException{ /* Calling transaction service */ FinancialTransaction financialTransaction = new FinancialTransactionImpl(); financialTransaction.setAmountDebit(BigDecimal.ZERO); @@ -391,12 +392,14 @@ // set date to the financial transaction financialTransaction.setTransactionDate(transactionDate); // create it - financialTransactionService.createFinancialTransaction(financialTransaction); + FinancialTransaction fTransaction = + financialTransactionService.createFinancialTransaction(financialTransaction); //on recharge la liste cacheDataList = getDataList(); - int row = getDataList().indexOf(financialTransaction); + int row = cacheDataList.indexOf(fTransaction); fireTableRowsInserted(row, row); + return row; //fireTableDataChanged(); } else { @@ -407,9 +410,14 @@ /** - * @throws LimaException + * + * @param value + * @param description + * @param row + * @return int: indexOf new FianancialTransaction + * @throws LimaException */ - public void addEmptyEntry(Object value, String description, int row) throws LimaException { + public int addEmptyEntry(Object value, String description, int row) throws LimaException { FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); @@ -428,14 +436,24 @@ } //create it entry.setFinancialTransaction(currentTransaction); - financialTransactionService.createEntry(entry); + Entry newEntry = financialTransactionService.createEntry(entry); //on recharge la liste cacheDataList = getDataList(); - fireTableDataChanged(); + int newrow = cacheDataList.indexOf(newEntry); + fireTableRowsInserted(newrow, newrow); + return newrow; } - public void addEntry(Object value, Entry entry, int row) throws LimaException { + /** + * + * @param value + * @param entry + * @param row + * @return int: indexOf new FianancialTransaction + * @throws LimaException + */ + public int addEntry(Object value, Entry entry, int row) throws LimaException { FinancialTransaction currentTransaction = null; int financialTransactionRow = 0; Object currentRow = cacheDataList.get(row); @@ -457,12 +475,14 @@ } //create it entry.setFinancialTransaction(currentTransaction); - financialTransactionService.createEntry(entry); + Entry newEntry = financialTransactionService.createEntry(entry); fireTableRowsUpdated(financialTransactionRow, getRowCount()-1); //on recharge la liste cacheDataList = getDataList(); - fireTableDataChanged(); + int newrow = cacheDataList.indexOf(newEntry); + fireTableRowsInserted(newrow, newrow); + return newrow; } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2011-06-17 12:41:53 UTC (rev 3181) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2011-06-17 14:59:28 UTC (rev 3182) @@ -91,14 +91,14 @@ Object selectedValue = tableModel.getElementAt(indexSelectedRow); if (clipBoard instanceof Entry) { try { - tableModel.addEntry(selectedValue, (Entry) clipBoard, indexSelectedRow); + int index = tableModel.addEntry(selectedValue, (Entry) clipBoard, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval( indexSelectedRow+1, indexSelectedRow+1); //focus on second column - table.changeSelection(indexSelectedRow+1, 1, false, false); + table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); } catch (LimaException eee){ if (log.isErrorEnabled()) { @@ -118,14 +118,14 @@ tableModel = view.getFinancialTransactionTableModel(); try { - tableModel.addFinancialTransaction(); + int index = tableModel.addFinancialTransaction(); //select the new line int numberRow = table.getRowCount(); ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval(numberRow-1, numberRow-1); //focus on first column - table.changeSelection(numberRow-1, 0, false, false); + table.changeSelection(index, 0, false, false); table.requestFocusInWindow(); } catch (LimaException eee) { if (log.isErrorEnabled()) { @@ -148,14 +148,14 @@ try { //copy + paste the description String description = (String) tableModel.getValueAt(indexSelectedRow, 4); - tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); + int index = tableModel.addEmptyEntry(selectedValue, description, indexSelectedRow); //select the new line ListSelectionModel selectionModel = table.getSelectionModel(); selectionModel.setSelectionInterval( indexSelectedRow+1, indexSelectedRow+1); //focus on second column - table.changeSelection(indexSelectedRow+1, 1, false, false); + table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); } catch (LimaException eee){ if (log.isErrorEnabled()) {

1 0