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

r3528 - in trunk/lima-swing/src/main: java/org/chorem/lima java/org/chorem/lima/ui resources/i18n
by mallon＠users.chorem.org 16 Jul '12

16 Jul '12

Author: mallon Date: 2012-07-16 11:51:27 +0200 (Mon, 16 Jul 2012) New Revision: 3528 Url: http://chorem.org/repositories/revision/lima/3528 Log: Correction du syst?\195?\168me de cr?\195?\169ation de fichier xml utilis?\195?\169e par la librairie swing.widgets (Etat de l'application), via la classe LimaConfig (Ajout d'une entr?\195?\169e "LIMA_STATE_DIR") Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2012-07-16 09:51:27 UTC (rev 3528) @@ -25,16 +25,7 @@ package org.chorem.lima; -import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; - -import java.beans.PropertyChangeListener; -import java.io.File; -import java.io.IOException; -import java.util.Locale; - import jaxx.runtime.JAXXUtil; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,6 +40,14 @@ import org.nuiton.util.VersionUtil; import org.nuiton.util.converter.ConverterUtil; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.IOException; +import java.util.Locale; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + /** * La configuration de l'application. * @@ -337,6 +336,11 @@ return result; } + public File getLimaStateDirectory() { + File result = getOptionAsFile(Option.LIMA_STATE_DIRECTORY.key); + return result; + } + public File getResourcesDirectory() { File result = getOptionAsFile(Option.RESOURCES_DIRECTORY.key); return result; @@ -395,7 +399,8 @@ LAUNCH_UI("lima.ui.launchui", n_("lima.config.ui.flaunchui.description"), "true", Boolean.class, true, true), SUPPORT_EMAIL("lima.misc.supportemail", n_("lima.misc.supportemail.description"), "support(a)codelutin.com", String.class, false, false), OPENEJB_REMOTEMODE("lima.openejb.remotemode", n_("lima.openejb.remotemode.description"), "false", String.class, false, false), - LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false); + LIMA_HOST_ADDRESS("lima.host.address", n_("lima.config.host.adress"), "localhost", String.class, false, false), + LIMA_STATE_DIRECTORY("lima.state.dir", n_("lima.config.state.dir"), "${lima.data.dir}/limaState.xml", String.class, false, false); public final String key; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-07-16 09:51:27 UTC (rev 3528) @@ -98,7 +98,7 @@ // show main ui MainView ui = new MainView(rootContext); - swingSession = new SwingSession(createFileLimaState(), false); + swingSession = new SwingSession(getLimaStateFile(), false); LimaContext.MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui); @@ -108,24 +108,14 @@ return ui; } - //Creation of xml lima state file - protected File createFileLimaState(){ - File limaStateDir = new File("././.lima/reports"); - File limaState = new File("././.lima/reports/limaState.xml"); + //Get xml lima state file + protected File getLimaStateFile(){ - try { - if(!limaStateDir.exists()){ - limaStateDir.mkdirs(); - } - if(!limaState.exists()){ - limaState.createNewFile(); - } - } catch (Exception ex) { - if (log.isInfoEnabled()) { - log.info("can't create lima state file : " + ex.getMessage(), ex); - } - } - return limaState; + LimaConfig limaConfig = LimaConfig.getInstance(); + + File limaStateFile = limaConfig.getLimaStateDirectory(); + + return limaStateFile; } public void changeLanguage(MainView mainUI, Locale newLocale) { Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-07-16 09:51:27 UTC (rev 3528) @@ -75,6 +75,7 @@ lima.config.data.dir.description= lima.config.decimalseparator.description= lima.config.host.adress=Host adress +lima.config.state.dir=State file of LIMA lima.config.i18n.dir.description= lima.config.locale.description=Localization used by LIMA lima.config.resources.dir.description= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-07-16 08:54:47 UTC (rev 3527) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-07-16 09:51:27 UTC (rev 3528) @@ -75,6 +75,7 @@ lima.config.data.dir.description= lima.config.decimalseparator.description= lima.config.host.adress=Adresse du serveur distant +lima.config.state.dir=Fichier d'état de l'application lima.config.i18n.dir.description= lima.config.locale.description=Locale utilisée par l'application lima.config.resources.dir.description=

1 0

r3527 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 16 Jul '12

16 Jul '12

Author: mallon Date: 2012-07-16 10:54:47 +0200 (Mon, 16 Jul 2012) New Revision: 3527 Url: http://chorem.org/repositories/revision/lima/3527 Log: fixes #698 Apr?\195?\168s correction de la table du panneau de saisie des ?\195?\169critures, l'ajout d'une troisi?\195?\168me entr?\195?\169e via la touche tabulation ne g?\195?\169n?\195?\168re plus d'erreur d'index. 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/FinancialTransactionViewHandler.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 2012-07-13 16:42:21 UTC (rev 3526) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-07-16 08:54:47 UTC (rev 3527) @@ -26,6 +26,8 @@ package org.chorem.lima.ui.financialtransaction; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; @@ -67,6 +69,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; + private static final Log log = LogFactory.getLog(FinancialTransactionViewHandler.class); + protected FinancialTransactionViewHandler handler; private int x_tab; @@ -228,9 +232,13 @@ //end of row else { x_tab = 0; - y_tab++; } + if (log.isInfoEnabled()) { + log.info("Valeur de x_tab : " + x_tab + "\n" + + "Valeur de y_tab : " + y_tab); + } + //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 @@ -295,6 +303,7 @@ x_tab++; } } + } } } 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 2012-07-13 16:42:21 UTC (rev 3526) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-07-16 08:54:47 UTC (rev 3527) @@ -66,7 +66,6 @@ */ public class FinancialTransactionViewHandler implements ServiceListener { - /** log. */ private static final Log log = LogFactory.getLog(FinancialTransactionViewHandler.class); /** Managed view. */

1 0

r3526 - in trunk: . lima-swing lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 13 Jul '12

13 Jul '12

Author: mallon Date: 2012-07-13 18:42:21 +0200 (Fri, 13 Jul 2012) New Revision: 3526 Url: http://chorem.org/repositories/revision/lima/3526 Log: fixes #645 L etat des composants (Taille de colonnes d un tableau, par exemple) sont sauvegardes pour l ensemble des panneaux (Donc, lors de la fermeture, puis de la re-ouverture de lima, les etats ne sont pas reinitialises.). Modified: trunk/lima-swing/pom.xml trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.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/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/pom.xml Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2012-07-13 11:54:39 UTC (rev 3525) +++ trunk/lima-swing/pom.xml 2012-07-13 16:42:21 UTC (rev 3526) @@ -104,8 +104,15 @@ <artifactId>openejb-loader</artifactId> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + </dependency> + </dependencies> +    Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2012-07-13 11:54:39 UTC (rev 3525) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2012-07-13 16:42:21 UTC (rev 3526) @@ -228,7 +228,7 @@ </JMenuBar> <BetaLayerUI id="betaLayer" /> <JPanel id="mainPanel" layout='{new BorderLayout()}' decorator="boxed"> - <JTabbedPane id="contentTabbedPane" constraints="BorderLayout.CENTER"/> + <JTabbedPane id="contentTabbedPane" constraints="BorderLayout.CENTER" onStateChanged="getHandler().swingSession.save()"/> </JPanel> </JFrame> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-07-13 11:54:39 UTC (rev 3525) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2012-07-13 16:42:21 UTC (rev 3526) @@ -25,22 +25,10 @@ package org.chorem.lima.ui; -import static org.nuiton.i18n.I18n._; - -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.net.URL; -import java.util.Locale; - -import javax.swing.JButton; -import javax.swing.JTabbedPane; - import jaxx.runtime.JAXXContext; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.editor.config.ConfigUIHelper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; @@ -68,7 +56,18 @@ import org.chorem.lima.ui.vatchart.VatChartView; import org.chorem.lima.ui.vatreports.VatReportView; import org.nuiton.util.DesktopUtil; +import org.nuiton.widget.SwingSession; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.net.URL; +import java.util.Locale; + +import static org.nuiton.i18n.I18n._; + /** * Handler for main view. * <p/> @@ -86,6 +85,8 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(MainViewHandler.class); + protected SwingSession swingSession; + /** * Methode pour initialiser l'ui principale sans l'afficher. * @@ -97,6 +98,8 @@ // show main ui MainView ui = new MainView(rootContext); + swingSession = new SwingSession(createFileLimaState(), false); + LimaContext.MAIN_UI_ENTRY_DEF.setContextValue(rootContext, ui); // set fullscreen propery on main ui @@ -105,6 +108,26 @@ return ui; } + //Creation of xml lima state file + protected File createFileLimaState(){ + File limaStateDir = new File("././.lima/reports"); + File limaState = new File("././.lima/reports/limaState.xml"); + + try { + if(!limaStateDir.exists()){ + limaStateDir.mkdirs(); + } + if(!limaState.exists()){ + limaState.createNewFile(); + } + } catch (Exception ex) { + if (log.isInfoEnabled()) { + log.info("can't create lima state file : " + ex.getMessage(), ex); + } + } + return limaState; + } + public void changeLanguage(MainView mainUI, Locale newLocale) { LimaConfig config = mainUI.getConfig(); @@ -124,6 +147,8 @@ * @param ui l'ui principale de l'application */ public void close(MainView ui) { + /*Save Lima state*/ + swingSession.save(); if (log.isInfoEnabled()) { log.info("Lima quitting..."); } @@ -291,6 +316,7 @@ MainView mainView = getUI(rootContext); AccountView accountView = new AccountView(mainView); showTab(mainView, _("lima.charts.account"), accountView); + swingSession.add(accountView); } /** @@ -302,6 +328,7 @@ MainView mainView = getUI(rootContext); EntryBookView entryBookView = new EntryBookView(mainView); showTab(mainView, _("lima.common.entrybooks"), entryBookView); + swingSession.add(entryBookView); } /** @@ -313,6 +340,7 @@ MainView mainView = getUI(rootContext); FiscalPeriodView fiscalPeriodView = new FiscalPeriodView(mainView); showTab(mainView, _("lima.charts.fiscalyear"), fiscalPeriodView); + swingSession.add(fiscalPeriodView); } /** @@ -325,6 +353,7 @@ FinancialPeriodView financialPeriodView = new FinancialPeriodView(mainView); showTab(mainView, _("lima.charts.financialperiod"), financialPeriodView); + swingSession.add(financialPeriodView); } /** @@ -337,6 +366,7 @@ FinancialStatementChartView financialStatementView = new FinancialStatementChartView(mainView); showTab(mainView, _("lima.charts.financialstatement"), financialStatementView); + swingSession.add(financialStatementView); } /** @@ -348,6 +378,7 @@ MainView mainView = getUI(rootContext); VatChartView vatChartView = new VatChartView(mainView); showTab(mainView, _("lima.charts.vatstatement"), vatChartView); + swingSession.add(vatChartView); } /** @@ -360,6 +391,7 @@ AccountsReportsView accountsReportsView = new AccountsReportsView(mainView); showTab(mainView, _("lima.reports.accounts"), accountsReportsView); + swingSession.add(accountsReportsView); } /** @@ -372,6 +404,7 @@ EntryBooksReportsView entryBooksReportsView = new EntryBooksReportsView(mainView); showTab(mainView, _("lima.reports.entrybooks"), entryBooksReportsView); + swingSession.add(entryBooksReportsView); } @@ -386,6 +419,7 @@ new FinancialTransactionView(mainView); showTab(mainView, _("lima.entries.writetransaction"), transactionView); + swingSession.add(transactionView); } public void showTransactionUnbalancedView(JAXXContext rootContext) { @@ -394,6 +428,7 @@ new FinancialTransactionUnbalancedView(mainView); showTab(mainView, _("lima.entries.searchunbalancedtransaction"), searchResultView); + swingSession.add(searchResultView); } public void showTransactionSearchView(JAXXContext rootContext) { @@ -401,24 +436,28 @@ FinancialTransactionSearchView searchView = new FinancialTransactionSearchView(mainView); showTab(mainView, _("lima.entries.searchtransaction"), searchView); + swingSession.add(searchView); } public void showLetteringView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); LetteringView letteringView = new LetteringView(mainView); showTab(mainView, _("lima.entries.lettering"), letteringView); + swingSession.add(letteringView); } public void showBalanceView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); BalanceView balanceView = new BalanceView(mainView); showTab(mainView, _("lima.reports.balance"), balanceView); + swingSession.add(balanceView); } public void showLedgerView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); LedgerView ledgerView = new LedgerView(mainView); showTab(mainView, _("lima.reports.ledger"), ledgerView); + swingSession.add(ledgerView); } public void showFinancialStatementReportsView(JAXXContext rootContext) { @@ -427,13 +466,14 @@ new FinancialStatementReportView(mainView); showTab(mainView, _("lima.reports.financialstatement"), financialStatementReportView); + swingSession.add(financialStatementReportView); } public void showVatReportView(JAXXContext rootContext) { MainView mainView = getUI(rootContext); VatReportView vatReportView = new VatReportView(mainView); showTab(mainView, _("lima.reports.vat"), vatReportView); - + swingSession.add(vatReportView); } public void showImportExportView(JAXXContext rootContext, 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 2012-07-13 11:54:39 UTC (rev 3525) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-07-13 16:42:21 UTC (rev 3526) @@ -26,8 +26,6 @@ package org.chorem.lima.ui.financialtransaction; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; @@ -69,8 +67,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; - private static final Log log = LogFactory.getLog(FinancialTransactionTable.class); - protected FinancialTransactionViewHandler handler; private int x_tab; 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 2012-07-13 11:54:39 UTC (rev 3525) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-07-13 16:42:21 UTC (rev 3526) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table> +<Table name="test"> <import> javax.swing.ListSelectionModel 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 2012-07-13 11:54:39 UTC (rev 3525) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-07-13 16:42:21 UTC (rev 3526) @@ -96,23 +96,23 @@ */ public void init() { - // fiscal periods - List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); - view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods); - if (log.isDebugEnabled()) { - log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size())); - } - if (!fiscalPeriods.isEmpty()) { - view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0)); - } - - // entry books - List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); - view.getEntryBookComboBoxModel().setObjects(allEntryBooks); - - if (log.isDebugEnabled()) { - log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); - } + // fiscal periods + List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); + view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods); + if (log.isDebugEnabled()) { + log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size())); + } + if (!fiscalPeriods.isEmpty()) { + view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0)); + } + + // entry books + List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); + view.getEntryBookComboBoxModel().setObjects(allEntryBooks); + + if (log.isDebugEnabled()) { + log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); + } } /** Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-13 11:54:39 UTC (rev 3525) +++ trunk/pom.xml 2012-07-13 16:42:21 UTC (rev 3526) @@ -236,6 +236,12 @@ <version>1.7.0</version> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-widgets</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> </dependencyManagement>

1 0

r3525 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialtransaction resources
by mallon＠users.chorem.org 13 Jul '12

13 Jul '12

Author: mallon Date: 2012-07-13 13:54:39 +0200 (Fri, 13 Jul 2012) New Revision: 3525 Url: http://chorem.org/repositories/revision/lima/3525 Log: fixes #651 Correction sur la table, afin d empecher le retour en debut de tableau lorsque la derniere ligne est selectionnee et que la touche entree est utilisee pour passer a la ligne suivante. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/resources/log4j.properties 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 2012-07-13 11:01:02 UTC (rev 3524) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-07-13 11:54:39 UTC (rev 3525) @@ -26,6 +26,8 @@ package org.chorem.lima.ui.financialtransaction; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; @@ -67,6 +69,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3133690382049594727L; + private static final Log log = LogFactory.getLog(FinancialTransactionTable.class); + protected FinancialTransactionViewHandler handler; private int x_tab; @@ -146,11 +150,24 @@ private class MyKeyAdapter extends KeyAdapter { + FinancialTransactionTable table = FinancialTransactionTable.this; + @Override public void keyPressed(KeyEvent e) { final FinancialTransactionViewHandler handler = getHandler(); + /*Allow to block access to the first row when touch enter pressed, if selection on + * last row*/ + if (e.getKeyCode() == KeyEvent.VK_ENTER){ + int selectedRow = table.getSelectedRow()+1; + if(selectedRow != table.getRowCount()){ + table.setRowSelectionInterval(table.getSelectedRow(), table.getSelectedRow()); + } else { + table.setRowSelectionInterval(table.getSelectedRow()-1, table.getSelectedRow()-1); + } + } + // delete selected row with the key : delete or ctrl + clear // ou de l'entree if (e.getKeyCode() == KeyEvent.VK_DELETE Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-07-13 11:01:02 UTC (rev 3524) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-07-13 11:54:39 UTC (rev 3525) @@ -38,3 +38,4 @@ # package level log4j.logger.org.chorem.lima=INFO +log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionTable=DEBUG

1 0

r3524 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 13 Jul '12

13 Jul '12

Author: mallon Date: 2012-07-13 13:01:02 +0200 (Fri, 13 Jul 2012) New Revision: 3524 Url: http://chorem.org/repositories/revision/lima/3524 Log: fixes #694 Correction sur les modeles delegues, afin de gerer la s?\195?\169lection de ligne via le 'control-click'; correction suppl?\195?\169mentaire pour le calcul de deb. / cred. / solde. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-13 07:31:05 UTC (rev 3523) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-13 11:01:02 UTC (rev 3524) @@ -201,9 +201,7 @@ } } - query += /*" and :beginDate <= F.transactionDate" + - " and F.transactionDate <= :endDate"+*/ - " and E.financialTransaction.transactionDate between :beginDate and :endDate " + + query += " and E.financialTransaction.transactionDate between :beginDate and :endDate " + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; entries = context.findAll(query, "account", filter.getAccount().getAccountNumber() + "%", "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-13 07:31:05 UTC (rev 3523) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-13 11:01:02 UTC (rev 3524) @@ -63,14 +63,8 @@ boolean oldLettrer = isLettred(); if(lettred && (solde == BigDecimal.ZERO || solde.intValue() == 0)){ this.lettred = lettred; - if (log.isInfoEnabled()) { - log.info("Lettred true"); - } }else{ this.lettred = false; - if (log.isInfoEnabled()) { - log.info("Lettred false"); - } } firePropertyChange(LETTRED_PROPERTY, oldLettrer, this.lettred); } @@ -108,16 +102,9 @@ public void setCredit(BigDecimal credit) { BigDecimal oldCredit = getCredit(); - if (log.isInfoEnabled()) { - log.info("Credit : " + credit); - } - if (credit != BigDecimal.ZERO){ this.credit = credit.add(oldCredit); }else{ - if (log.isInfoEnabled()) { - log.info("Credit passe a zero"); - } this.credit=BigDecimal.ZERO; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-13 07:31:05 UTC (rev 3523) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-13 11:01:02 UTC (rev 3524) @@ -48,40 +48,50 @@ public LetteringSelectionModel(LetteringTableModel letteringTableModel, LetteringEditModel editModel) { this.letteringTableModel = letteringTableModel; this.editModel = editModel; - editModel.resetDebitCreditBalance(); } + //@Override + public void addSelectionInterval(int row, int column){ + setSelectionInterval(row, column); + } + + //@Override + public void removeSelectionInterval(int row, int column){ + //setSelectionInterval(row, column); + } + @Override public void setSelectionInterval(int row, int column){ - if (log.isInfoEnabled()) { - log.info("Selection ligne..."); - } - resetAttribute(); - super.clearSelection(); + if ( selectedRows.isEmpty() || !searchRowSelected(row)){ - lineSelected = row; - String currentLettring = getCurrentLettring(); + if (log.isInfoEnabled()) { + log.info("Selection ligne..."); + } + resetAttribute(); + super.clearSelection(); - setValueIsAdjusting(true); + lineSelected = row; + String currentLettring = getCurrentLettring(); - try { - //select entries with the same letter of the selected entry - for(Entry entry : getEntries()){ - if (log.isInfoEnabled()) { - log.info("Parcours..."); - } - if (StringUtils.isNotBlank(entry.getLettering())){ - if (entry.getLettering().equals(currentLettring)){ - int entryToSelect = letteringTableModel.getIndexOfEntry(entry); - selectedRows.add(entryToSelect); - super.addSelectionInterval(entryToSelect, entryToSelect); + setValueIsAdjusting(true); + + try { + //select entries with the same letter of the selected entry + for(Entry entry : getEntries()){ + if (StringUtils.isNotBlank(entry.getLettering())){ + if (entry.getLettering().equals(currentLettring)){ + int entryToSelect = letteringTableModel.getIndexOfEntry(entry); + selectedRows.add(entryToSelect); + super.addSelectionInterval(entryToSelect, entryToSelect); + } } } + } finally { + setValueIsAdjusting(false); } - } finally { - setValueIsAdjusting(false); + updateBalanceAndLetteringButton(false); } - updateBalanceAndLetteringButton(false); + resetAttribute(); } /**PropertyChange on editModel in the handler, and, there, @@ -109,6 +119,20 @@ } } + /**search if the selected row is in the list + * (List of precedent selected rows) + * @param row line searched in the list + * @return true if line find + * */ + public boolean searchRowSelected(int row){ + for (Integer rowSearching : selectedRows){ + if (rowSearching == row){ + return true; + } + } + return false; + } + public List<Entry> getEntries(){ return letteringTableModel.getEntries(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-13 07:31:05 UTC (rev 3523) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-13 11:01:02 UTC (rev 3524) @@ -49,9 +49,11 @@ private static final long serialVersionUID = 3133690382049594727L; protected LetteringViewHandler handler; + protected boolean controlTouchPressed; public LetteringTable(LetteringTableModel letteringTableModel) { super(letteringTableModel); + controlTouchPressed = false; //Get new date editor setDefaultEditor(Date.class, new DateTableCellEditor()); @@ -64,13 +66,5 @@ setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); - - } - - //@Override - /*public void changeSelection(int rowIndex , int columnIndex, boolean bascule, boolean extend) { - - }*/ - } 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 2012-07-13 07:31:05 UTC (rev 3523) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-13 11:01:02 UTC (rev 3524) @@ -70,6 +70,7 @@ protected AccountService accountService; protected FinancialTransactionService financialTransactionService; protected EntryBookService entryBookService; + protected LetteringFilter filter; protected LetteringEditModel editModel; @@ -96,9 +97,6 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (log.isInfoEnabled()) { - log.info("Filter changing..."); - } editModel.resetDebitCreditBalance(); updateAllEntries(); } @@ -110,9 +108,6 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (log.isInfoEnabled()) { - log.info("Filter changing..."); - } editModel.resetDebitCreditBalance(); updateAllEntries(); } @@ -122,30 +117,21 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (log.isInfoEnabled()) { - log.info("Property change listener sur edit model"); - } updateBalanceAndLetteringButton(); } }); } public void loadComboAndRows(){ - log.debug("loadComboAndRows"); List<Account> allAccounts = accountService.getAllAccounts(); view.getAccountComboBoxModel().setObjects(allAccounts); - log.debug("loadComboAndRows"); - if (!allAccounts.isEmpty()) { view.getAccountComboBox().setSelectedItem(allAccounts.get(0)); } - if (log.isDebugEnabled()) { - log.debug("1er item comptes : " + allAccounts.get(0)); - } //By default, we have the beginning of the fiscal period (Or of current //date if no fiscal period) and the end of the current date @@ -164,25 +150,14 @@ Date defaultDateEndCurrent = DateUtils.setDays(new Date(), dernierJourMoisCourant); - if (log.isDebugEnabled()) { - log.debug("Date de debut : " + defaultDateBegFiscalPeriod); - log.debug("Date de fin : " + defaultDateEndCurrent); - } view.getPickerDebut().setDate(defaultDateBegFiscalPeriod); view.getPickerFin().setDate(defaultDateEndCurrent); - - log.debug("Val select letter : " + view.getLetteredCheckGroup().getSelectedButton().getName()); - filter.getFiscalDateFilter().setDateStart(defaultDateBegFiscalPeriod); filter.getFiscalDateFilter().setDateEnd(defaultDateEndCurrent); filter.setDisplayUnlettred(true); updateAllEntries(); - - if (log.isInfoEnabled()) { - log.info("Nb entries model (After update all entries) : " + view.getTableModel().getNumberOfEntries()); - } } protected List<Entry> findAllEntries(LetteringFilter filter){ @@ -196,10 +171,6 @@ public void updateAllEntries() { - if (log.isInfoEnabled()) { - log.info("updateAllEntries"); - } - if (filter != null) { List<Entry> entries = findAllEntries(filter); @@ -212,9 +183,6 @@ } view.getTableModel().updateEntries(entries, datesEntree, journalEntrees); - if (log.isInfoEnabled()) { - log.info("Nb entries model : " + view.getTableModel().getNumberOfEntries()); - } } editModel.resetDebitCreditBalance(); view.getLettringAndUnlettringSelectionModel().clearSelection(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-13 07:31:05 UTC (rev 3523) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-13 11:01:02 UTC (rev 3524) @@ -67,12 +67,7 @@ letteringSelectionModel.resetAttribute(); } - editModel.resetDebitCreditBalance(); - if (log.isInfoEnabled()) { - log.info("debit : " + editModel.getDebit() + "\n" + - "credit : " + editModel.getCredit() + "\n" + - "solde : " + editModel.getSolde()); - } + //editModel.resetDebitCreditBalance(); delegate.setSelectionInterval(row, column); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java 2012-07-13 07:31:05 UTC (rev 3523) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java 2012-07-13 11:01:02 UTC (rev 3524) @@ -47,6 +47,17 @@ } @Override + public void addSelectionInterval(int row, int column){ + setSelectionInterval(row, column); + } + + @Override + public void removeSelectionInterval(int row, int column){ + deleteLine(row, column); + updateBalanceAndLetteringButton(true); + } + + @Override public void setSelectionInterval(int row, int column){ if (log.isInfoEnabled()) { @@ -68,11 +79,7 @@ log.info("New row selected"); } }else { - deleteLine(row); - super.removeSelectionInterval(row, column); - if (log.isInfoEnabled()) { - log.info("Old row : deleting..."); - } + deleteLine(row, column); } updateBalanceAndLetteringButton(true); } @@ -82,13 +89,18 @@ * and delete it * @param row line to delete * */ - public void deleteLine(int row){ + public void deleteLine(int row, int column){ for (Integer rowSearching : selectedRows){ if (rowSearching == row){ selectedRows.remove(rowSearching); break; } } + + super.removeSelectionInterval(row, column); + if (log.isInfoEnabled()) { + log.info("Old row : deleting..."); + } } /**search if the selected row is in the list

1 0

r3523 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 13 Jul '12

13 Jul '12

Author: mallon Date: 2012-07-13 09:31:05 +0200 (Fri, 13 Jul 2012) New Revision: 3523 Url: http://chorem.org/repositories/revision/lima/3523 Log: Correction sur la table du lettrage pour la selection. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-12 17:05:02 UTC (rev 3522) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-13 07:31:05 UTC (rev 3523) @@ -68,8 +68,9 @@ } - @Override - public void changeSelection(int rowIndex , int columnIndex, boolean bascule, boolean extend) { - } + //@Override + /*public void changeSelection(int rowIndex , int columnIndex, boolean bascule, boolean extend) { + }*/ + }

1 0

r3522 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 12 Jul '12

12 Jul '12

Author: mallon Date: 2012-07-12 19:05:02 +0200 (Thu, 12 Jul 2012) New Revision: 3522 Url: http://chorem.org/repositories/revision/lima/3522 Log: fixes #693 Correction de la requete de selection des comptes. Desormais, toutes les entrees se trouvant dans un compte debutant par le meme numero que celui selectionne sont affichees. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-12 15:31:00 UTC (rev 3521) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-12 17:05:02 UTC (rev 3522) @@ -191,7 +191,7 @@ String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + " where E.financialTransaction = F" + - " and E.account = :account "; + " and E.account.accountNumber like :account "; if (filter.getDisplayLettered() || filter.getDisplayUnlettred()){ if (filter.getDisplayUnlettred()){ @@ -206,7 +206,7 @@ " and E.financialTransaction.transactionDate between :beginDate and :endDate " + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; - entries = context.findAll(query, "account", filter.getAccount(), "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); + entries = context.findAll(query, "account", filter.getAccount().getAccountNumber() + "%", "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); return entries; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-12 15:31:00 UTC (rev 3521) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2012-07-12 17:05:02 UTC (rev 3522) @@ -65,5 +65,11 @@ //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + } + + @Override + public void changeSelection(int rowIndex , int columnIndex, boolean bascule, boolean extend) { + } + }

1 0

r3521 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 12 Jul '12

12 Jul '12

Author: mallon Date: 2012-07-12 17:31:00 +0200 (Thu, 12 Jul 2012) New Revision: 3521 Url: http://chorem.org/repositories/revision/lima/3521 Log: Correction concernant le lettrage, quand aucune lettre n'est d?\195?\169j?\195?\160 pr?\195?\169sente en base. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.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 2012-07-12 15:26:15 UTC (rev 3520) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-12 15:31:00 UTC (rev 3521) @@ -138,7 +138,7 @@ //TODO:permettre de lettrer avec plus de trois lettres - if (lastActualLetters != null){ + if (lastActualLetters != null && !lastActualLetters.isEmpty()){ if (lastActualLetters.length() > 2 && lastActualLetters.charAt(2) != 'Z'){ nextThirdLetter = incrementLetter(2, lastActualLetters); }else if (lastActualLetters.length() > 1 && lastActualLetters.charAt(1) != 'Z'){ 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 2012-07-12 15:26:15 UTC (rev 3520) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-12 15:31:00 UTC (rev 3521) @@ -222,22 +222,10 @@ public void updateBalanceAndLetteringButton(){ - /**Update table and reset credit / debit / balance - * only when one of buttons lettering/unlettering - * is true and goes to false and only in the case - * of lettring (Not in case of balance equal to zero)*/ - /* if ( (view.lettered.isEnabled() != editModel.isLettred() || view.noLettered.isEnabled() != editModel.isUnLettred()) - && (view.lettered.isEnabled() || view.noLettered.isEnabled()) - && (!view.getSoldeTextField().getText().equals("0.00") && !view.getSoldeTextField().getText().equals("0"))){ - if (log.isInfoEnabled()) { - log.info("Changing state"); - } - updateAllEntries(); - }else{*/ - view.creditTextField.setText(editModel.getCredit().toString()); - view.debitTexttField.setText(editModel.getDebit().toString()); - view.soldeTextField.setText(editModel.getSolde().toString()); - //} + view.creditTextField.setText(editModel.getCredit().toString()); + view.debitTexttField.setText(editModel.getDebit().toString()); + view.soldeTextField.setText(editModel.getSolde().toString()); + view.lettered.setEnabled(editModel.isLettred()); view.noLettered.setEnabled(editModel.isUnLettred());

1 0

r3520 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 12 Jul '12

12 Jul '12

Author: mallon Date: 2012-07-12 17:26:15 +0200 (Thu, 12 Jul 2012) New Revision: 3520 Url: http://chorem.org/repositories/revision/lima/3520 Log: fixes #692 R?\195?\169initialisation de la liste des entr?\195?\169es lors du changement de mod?\195?\168le de s?\195?\169lection, et remise ?\195?\160 z?\195?\169ro des debit / credit / solde lors du delettrage. Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java Deleted: 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 2012-07-12 10:27:43 UTC (rev 3519) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/AddLetterForm.jaxx 2012-07-12 15:26:15 UTC (rev 3520) @@ -1,81 +0,0 @@ - - -<JDialog modal="true" - defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" - onWindowClosing="performCancel();"> - <import> - jaxx.runtime.swing.JAXXButtonGroup - </import> - - <JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> - <Boolean id="validOk" javaBean='true'/> - - <script> - <![CDATA[ - - getRootPane().setDefaultButton(ok); - protected void performCancel() { - setValidOk(false); - dispose(); - } - ]]> - </script> - - <Table> - <row fill="horizontal"> - <cell> - <JRadioButton id="newLetter" - text='lima.entries.lettering.radiobutton.new' - value='{true}' buttonGroup="{getRadioButtons()}" - selected='true'/> - </cell> - <cell> - <JTextField editable="false" visible="{newLetter.isSelected()}" - id='newLetterTextField'/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="listLetter" - text='lima.entries.lettering.radiobutton.list' - value='{false}' buttonGroup="{getRadioButtons()}" - selected='true'/> - </cell> - <cell> - <JComboBox id='LetterListComboBox' visible="{listLetter.isSelected()}" - javaBean="new JComboBox()"/> - </cell> - </row> - <row> - <cell fill="none"> - <JButton text="lima.common.cancel" onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" text="lima.common.ok" onActionPerformed="dispose()"/> - </cell> - </row> - </Table> -</JDialog> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-12 10:27:43 UTC (rev 3519) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-12 15:26:15 UTC (rev 3520) @@ -108,9 +108,16 @@ public void setCredit(BigDecimal credit) { BigDecimal oldCredit = getCredit(); + if (log.isInfoEnabled()) { + log.info("Credit : " + credit); + } + if (credit != BigDecimal.ZERO){ this.credit = credit.add(oldCredit); }else{ + if (log.isInfoEnabled()) { + log.info("Credit passe a zero"); + } this.credit=BigDecimal.ZERO; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-12 10:27:43 UTC (rev 3519) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-12 15:26:15 UTC (rev 3520) @@ -23,16 +23,15 @@ * #L% */ -import java.util.ArrayList; -import java.util.List; - -import javax.swing.DefaultListSelectionModel; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.Entry; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + /** * @author sletellier <letellier(a)codelutin.com> */ @@ -42,7 +41,7 @@ protected LetteringTableModel letteringTableModel; protected LetteringEditModel editModel; protected int lineSelected; - protected List<Integer> selectedRows; + protected List<Integer> selectedRows = new ArrayList<Integer>(); //Modele de selection du tableau lors de la selection d une entree lettree @@ -57,7 +56,7 @@ if (log.isInfoEnabled()) { log.info("Selection ligne..."); } - selectedRows = new ArrayList<Integer>(); + resetAttribute(); super.clearSelection(); lineSelected = row; @@ -103,6 +102,13 @@ editModel.setLettred(lettering); } + //to reinitialize model attribute + public void resetAttribute(){ + for (int i = 0; i < selectedRows.size(); i ++){ + selectedRows.remove(i); + } + } + public List<Entry> getEntries(){ return letteringTableModel.getEntries(); } 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 2012-07-12 10:27:43 UTC (rev 3519) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-12 15:26:15 UTC (rev 3520) @@ -216,19 +216,31 @@ log.info("Nb entries model : " + view.getTableModel().getNumberOfEntries()); } } - view.getEditModel().resetDebitCreditBalance(); + editModel.resetDebitCreditBalance(); view.getLettringAndUnlettringSelectionModel().clearSelection(); } public void updateBalanceAndLetteringButton(){ - view.creditTextField.setText(editModel.getCredit().toString()); - view.debitTexttField.setText(editModel.getDebit().toString()); - view.soldeTextField.setText(editModel.getSolde().toString()); + + /**Update table and reset credit / debit / balance + * only when one of buttons lettering/unlettering + * is true and goes to false and only in the case + * of lettring (Not in case of balance equal to zero)*/ + /* if ( (view.lettered.isEnabled() != editModel.isLettred() || view.noLettered.isEnabled() != editModel.isUnLettred()) + && (view.lettered.isEnabled() || view.noLettered.isEnabled()) + && (!view.getSoldeTextField().getText().equals("0.00") && !view.getSoldeTextField().getText().equals("0"))){ + if (log.isInfoEnabled()) { + log.info("Changing state"); + } + updateAllEntries(); + }else{*/ + view.creditTextField.setText(editModel.getCredit().toString()); + view.debitTexttField.setText(editModel.getDebit().toString()); + view.soldeTextField.setText(editModel.getSolde().toString()); + //} view.lettered.setEnabled(editModel.isLettred()); view.noLettered.setEnabled(editModel.isUnLettred()); - if (log.isInfoEnabled()) { - log.info("updateBalanceAndLetteringButton"); - } + //FIXME Allon-11/07/2012 : probleme de rafraichissement de la table, lors //de la delegation de modele ('LetteringSelectionModele') view.getTable().repaint(); @@ -261,14 +273,6 @@ } } - /*public void setBeginDate(Date date) { - view.getTableModel().setSelectedBeginDate(date); - }*/ - - /*public void setEndDate(Date date) { - view.getTableModel().setSelectedEndDate(date); - }*/ - /**Add a group of three letters to n entries*/ public void addLetter() { String newLetters = financialTransactionService.getNextLetters(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-12 10:27:43 UTC (rev 3519) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-12 15:26:15 UTC (rev 3520) @@ -59,12 +59,20 @@ if (!letteringNotExist(row)) { delegate = letteringSelectionModel; + //to reinitialize model attribute when delegation change + unlettringSelectionModel.resetAttribute(); } else { delegate = unlettringSelectionModel; + letteringSelectionModel.resetAttribute(); } editModel.resetDebitCreditBalance(); + if (log.isInfoEnabled()) { + log.info("debit : " + editModel.getDebit() + "\n" + + "credit : " + editModel.getCredit() + "\n" + + "solde : " + editModel.getSolde()); + } delegate.setSelectionInterval(row, column); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java 2012-07-12 10:27:43 UTC (rev 3519) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java 2012-07-12 15:26:15 UTC (rev 3520) @@ -49,13 +49,30 @@ @Override public void setSelectionInterval(int row, int column){ + if (log.isInfoEnabled()) { + if (selectedRows.isEmpty()){ + log.info("Liste de lignes vide"); + }else{ + log.info("Liste de lignes pleines"); + } + if (searchRowSelected(row)){ + log.info("Ligne dans la liste"); + } + } + //Case where line is selected a second time (So, must deselect it on second click) if (selectedRows.isEmpty() || !searchRowSelected(row)){ selectedRows.add(row); super.addSelectionInterval(row, column); + if (log.isInfoEnabled()) { + log.info("New row selected"); + } }else { deleteLine(row); super.removeSelectionInterval(row, column); + if (log.isInfoEnabled()) { + log.info("Old row : deleting..."); + } } updateBalanceAndLetteringButton(true); } @@ -118,6 +135,13 @@ } } + //to reinitialize model attribute + public void resetAttribute(){ + for (int i = 0; i < selectedRows.size(); i ++){ + selectedRows.remove(i); + } + } + @Override public int getSelectionMode() { return MULTIPLE_INTERVAL_SELECTION;

1 0

r3519 - in trunk: lima-business/src/main/java/org/chorem/lima/business lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/accountsreports lima-swing/src/main/java/org/chorem/lima/ui/balance lima-swing/src/main/java/org/chorem/lima/ui/ledger lima-swing/src/main/java/org/chorem/lima/ui/vatchart
by echatellier＠users.chorem.org 12 Jul '12

12 Jul '12

Author: echatellier Date: 2012-07-12 12:27:43 +0200 (Thu, 12 Jul 2012) New Revision: 3519 Url: http://chorem.org/repositories/revision/lima/3519 Log: Fix javadoc Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/AccountingRules.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -58,7 +58,6 @@ * Entrybook rules. * * @param entryBook - * @param topiaTransaction * @throws LimaException */ void removeEntryBookRules(EntryBook entryBook) throws LimaException; @@ -67,7 +66,6 @@ * Fiscal Period rules * * @param fiscalPeriod - * @param transaction * @throws LimaException */ List<FinancialPeriod> createFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException; @@ -80,7 +78,6 @@ * Entry rules * * @param entry - * @param topiaTransaction * @throws LimaException */ void updateEntryRules(Entry entry, Entry entryOld) throws LimaException; @@ -91,7 +88,6 @@ * Financialperiod/entrybook rules * * @param financialTransaction - * @param topiaContext * @throws LimaException */ void checkFinancialPeriodBlockedWithFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException; @@ -100,7 +96,6 @@ * Check if a financial period can be closed. * * @param closedPeriodicEntryBook - * @param topiaContext * @throws LimaException */ void blockClosedPeriodicEntryBookRules(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; 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 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/LimaConfig.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -154,8 +154,6 @@ /** * Load configuration with custom file name. - * - * @param configFileName file name to read */ protected void loadConfiguration() { try { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -244,7 +244,6 @@ * | HeaderAmount | MasterFinancialStatement * * @param csvWriter - * @param topiaContext * @throws LimaException */ public void exportFinancialStatementChartAsCSV(CSVWriter csvWriter) throws LimaException { @@ -320,7 +319,6 @@ * | accounts | masterVatStatement * * @param csvWriter - * @param topiaContext * @throws LimaException */ public void exportVatStatementChartAsCSV(CSVWriter csvWriter) throws LimaException { @@ -382,7 +380,6 @@ * Structure : TYPE | Code | Label | Type * * @param csvWriter - * @param topiaContext * @throws LimaException */ public void exportEntryBookChartAsCSV(CSVWriter csvWriter) throws LimaException { @@ -429,7 +426,6 @@ * Structure : TYPE | AccountNumber | Label | ThirdParty | MasterAccount | GeneralLedger * * @param csvWriter - * @param topiaContext * @throws LimaException */ public void exportAccountsChartAsCSV(CSVWriter csvWriter) throws LimaException { @@ -461,7 +457,6 @@ * | FinancialPeriod BeginDate | FinancialPeriod EndDate | EntryBook Code * * @param csvWriter - * @param topiaContext * @throws LimaException */ public void exportFinancialTransactionsAndEntriesAsCSV(CSVWriter csvWriter) throws LimaException { @@ -515,7 +510,6 @@ * Structure : TYPE | BeginDate | EndDate | Locked * * @param csvWriter - * @param topiaContext * @throws LimaException */ public void exportFiscalPeriodAsCSV(CSVWriter csvWriter) throws LimaException { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialStatementServiceImpl.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -210,7 +210,6 @@ * @param selectedBeginDate * @param selectedEndDate * @param result - * @param topiaContext * @return * @throws LimaException */ @@ -322,7 +321,6 @@ * @param financialStatement * @param selectedBeginDate * @param selectedEndDate - * @param topiaContext * @return * @throws LimaException */ Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -679,7 +679,6 @@ * * @param nextLine * @param fiscalPeriods - * @param topiaContext * @return * @throws ParseException * @throws TopiaException @@ -712,7 +711,6 @@ * Import and create entrybooks Structure : TYPE | Code | Label | Type * * @param nextLine - * @param topiaContext * @return * @throws TopiaException * @throws LimaException @@ -774,7 +772,6 @@ * * @param nextLine * @param financialStatements - * @param topiaContext * @return * @throws LimaException * @throws TopiaException @@ -835,7 +832,6 @@ * * @param nextLine * @param vatStatements - * @param topiaContext * @return * @throws LimaException * @throws TopiaException Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ReportServiceImpl.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -130,7 +130,6 @@ * @param account * @param beginDate * @param endDate - * @param topiaContext * @return * @throws LimaException * @throws TopiaException Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/VatStatementServiceImpl.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -195,7 +195,6 @@ * Gives the list of account numbers from a VatStatement. * * @param vatStatement - * @param topiaContext * @return accountNumbersList * @throws LimaException */ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -118,7 +118,7 @@ /** * Update footer labels containing reports total sum fields. * - * @param results result to render + * @param reportsDatas result to render */ protected void updateFooter(ReportsDatas reportsDatas) { // set amounts credit and debit and solde Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -132,7 +132,7 @@ /** * Update footer labels containing reports total sum fields. * - * @param results result to render + * @param balanceTrial result to render */ protected void updateFooter(BalanceTrial balanceTrial) { // set amounts credit and debit and solde 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 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -150,7 +150,7 @@ /** * Update footer labels containing reports total sum fields. * - * @param results result to render + * @param balanceTrial result to render */ protected void updateFooter(BalanceTrial balanceTrial) { // set amounts credit and debit and solde Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2012-07-12 10:19:37 UTC (rev 3518) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartTreeTableModel.java 2012-07-12 10:27:43 UTC (rev 3519) @@ -188,7 +188,7 @@ * Add VatStatement(path can be null). * * @param path - * @param account + * @param vatStatement * @throws LimaException */ public void addVatStatement(TreePath path, VatStatement vatStatement) throws LimaException { @@ -209,7 +209,7 @@ * Update vatStatement * * @param path - * @param account + * @param vatStatement * @throws LimaException */ public void updateVatStatement(TreePath path, VatStatement vatStatement) throws LimaException { @@ -222,7 +222,7 @@ * Remove vatStatement * * @param path - * @param object + * @param vatStatement * @throws LimaException */ public void removeVatStatementObject(TreePath path, VatStatement vatStatement) throws LimaException {

1 0