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

r2801 - trunk
by tchemit＠users.chorem.org 12 Mar '10

12 Mar '10

Author: tchemit Date: 2010-03-12 21:15:47 +0100 (Fri, 12 Mar 2010) New Revision: 2801 Log: Utilisation de mavenpom4redmine 2.0.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-10 14:17:55 UTC (rev 2800) +++ trunk/pom.xml 2010-03-12 20:15:47 UTC (rev 2801) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <groupId>org.chorem</groupId>

1 0

r2800 - in trunk: . lima-main/src/main/java/org/chorem/lima
by tchemit＠users.chorem.org 10 Mar '10

10 Mar '10

Author: tchemit Date: 2010-03-10 15:17:55 +0100 (Wed, 10 Mar 2010) New Revision: 2800 Log: Evolution #137: update to nuiton-i18n 1.1 Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java trunk/pom.xml Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2010-03-01 14:40:47 UTC (rev 2799) +++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2010-03-10 14:17:55 UTC (rev 2800) @@ -43,6 +43,7 @@ import org.apache.commons.beanutils.converters.DateConverter; import org.chorem.lima.tree.model.AccountTreeTableModel; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.util.ConverterUtil; import org.nuiton.util.StringUtil; @@ -102,7 +103,7 @@ long t0 = System.nanoTime(); - I18n.setUniqueBundleName("lima-main-i18n"); + I18n.setInitializer(new DefaultI18nInitializer("lima-main-i18n")); I18n.init(Locale.FRANCE); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 14:40:47 UTC (rev 2799) +++ trunk/pom.xml 2010-03-10 14:17:55 UTC (rev 2800) @@ -186,7 +186,7 @@  <callao.version>0.1.3-SNAPSHOT</callao.version> - <nuiton-utils.version>1.1.4</nuiton-utils.version> + <nuiton-utils.version>1.2</nuiton-utils.version> <eugene.version>1.0.0</eugene.version> <topia.version>2.2.0</topia.version> @@ -196,7 +196,7 @@  <jaxx.version>2.0.0-beta-1</jaxx.version> - <i18n.version>1.0.1</i18n.version> + <i18n.version>1.1</i18n.version>

1 0

r2799 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org 01 Mar '10

01 Mar '10

Author: echatellier Date: 2010-03-01 15:40:47 +0100 (Mon, 01 Mar 2010) New Revision: 2799 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java Log: Update JXTable filters to 1.6, misc improvments Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-03-01 13:50:09 UTC (rev 2798) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-03-01 14:40:47 UTC (rev 2799) @@ -28,13 +28,13 @@ import java.util.Calendar; import java.util.Collections; import java.util.Date; -import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; import java.util.Locale; import javax.swing.JComboBox; import javax.swing.ListSelectionModel; +import javax.swing.RowFilter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -48,10 +48,7 @@ import org.chorem.lima.dto.util.TriPeriodDesc; import org.chorem.lima.table.model.ClosureTableModel; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.Filter; -import org.jdesktop.swingx.decorator.FilterPipeline; import org.jdesktop.swingx.decorator.HighlighterFactory; -import org.jdesktop.swingx.decorator.PatternFilter; /** @@ -106,20 +103,26 @@ public void itemStateChanged(ItemEvent e) { // Récupère la période master PeriodDTO periodMaster = (PeriodDTO) comboBoxPeriod.getSelectedItem(); - Filter[] filterArray = {new PatternFilter("(.*" + (periodMaster.getBegin().getYear() + 1900) + ".*)|(.*Final.*)", 0, 0)}; - FilterPipeline filters = new FilterPipeline(filterArray); - table.setFilters(filters); + //Filter[] filterArray = {new PatternFilter("(.*" + (periodMaster.getBegin().getYear() + 1900) + ".*)|(.*Final.*)", 0, 0)}; + //FilterPipeline filters = new FilterPipeline(filterArray); + + RowFilter<Object, Object> filter = null; + if (periodMaster != null) { + // 0 = check only in first column + // filter : + // period name containing selected periode + // Final = ??? TODO + Calendar calendar = Calendar.getInstance(); + calendar.setTime(periodMaster.getBegin()); + filter = RowFilter.regexFilter("(.*" + calendar.get(Calendar.YEAR) + ".*)|(.*Final.*)", 0); + if (log.isDebugEnabled()) { + log.debug("Apply filter on " + calendar.get(Calendar.YEAR)); + } + } + table.setRowFilter(filter); } }); - // Récupère la période master (celle de l'exercice) - /* - PeriodDTO periodMaster = (PeriodDTO) comboBoxPeriod.getSelectedItem(); - // Définition du tri avec une expression régulière - Filter[] filterArray = { new PatternFilter("(.*"+(periodMaster.getBegin().getYear()+1900)+".*)|(.*Final.*)", 0, 0) }; - FilterPipeline filters = new FilterPipeline(filterArray); - // Applique le tri - table.setFilters(filters); - */ + // Ajout du tableau dans l'UI getClosureScrollPane().setViewportView(table); @@ -143,22 +146,15 @@ //Init YEAR Periode Combobox // take care about previous year #120 - cal.add(Calendar.YEAR, -1); - for (int i = 0; i <= 6; i++) { - int newYear = cal.get(Calendar.YEAR); - comboBeginYearPeriod.addItem(newYear); - comboEndYearPeriod.addItem(newYear); - - // set current year selected - if (i == 0) { - comboBeginYearPeriod.setSelectedItem(newYear); - comboEndYearPeriod.setSelectedItem(newYear); - } - - cal.add(Calendar.YEAR, 1); + int todayYear = cal.get(Calendar.YEAR); + for (int currentYear = todayYear - 1; currentYear <= todayYear + 5; currentYear ++) { + comboBeginYearPeriod.addItem(currentYear); + comboEndYearPeriod.addItem(currentYear); } - + comboBeginYearPeriod.setSelectedItem(todayYear); + comboEndYearPeriod.setSelectedItem(todayYear); + //Add BeginYear ComboBox to addPeriodForm addPeriodForm.getBeginYearPeriodPanel().add(comboBeginYearPeriod); addPeriodForm.getBeginYearPeriodPanel().validate(); @@ -183,7 +179,6 @@ addPeriodForm.getEndMonthPeriodPanel().add(comboEndMonthPeriod); addPeriodForm.getEndMonthPeriodPanel().validate(); - addPeriodForm.setVisible(true); addPeriodForm.getOkButton().addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -287,31 +282,40 @@ PeriodDTO periodCurrent = LimaContext.getContext().getDataManager().getCurrentPeriod(); List<StatusDTO> status = LimaContext.getContext().getDataManager().getStatus(); - Calendar cal_beg = Calendar.getInstance(); + // get begin date + Calendar beginCalendar = Calendar.getInstance(); if (periodCurrent != null) { - cal_beg.setTime(periodCurrent.getBegin()); - cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); + beginCalendar.setTime(periodCurrent.getBegin()); } + beginCalendar.set(Calendar.YEAR, (Integer)comboBeginYearPeriod.getSelectedItem()); + beginCalendar.set(Calendar.DAY_OF_MONTH, 1); + // month is equals to list index + beginCalendar.set(Calendar.MONTH, comboBeginMonthPeriod.getSelectedIndex()); + Date beginDate = beginCalendar.getTime(); + + // get end date + Calendar endCalendar = Calendar.getInstance(); + endCalendar.set(Calendar.YEAR, (Integer)comboEndYearPeriod.getSelectedItem()); + endCalendar.set(Calendar.MONTH , comboEndMonthPeriod.getSelectedIndex()); + int maximum = endCalendar.getActualMaximum(Calendar.DAY_OF_MONTH); + endCalendar.set(Calendar.DAY_OF_MONTH, maximum); + Date endDate = endCalendar.getTime(); + + if (log.isDebugEnabled()) { + log.debug("Add new periode from " + beginDate + " to " + endDate); + } + + String periodName = null; + if (comboBeginYearPeriod.getSelectedIndex() != comboEndYearPeriod.getSelectedIndex()) { + periodName = Integer.toString(beginCalendar.get(Calendar.YEAR)) + "-" + Integer.toString(endCalendar.get(Calendar.YEAR)); + } else { - cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); + periodName = Integer.toString(beginCalendar.get(Calendar.YEAR)); } - cal_beg.set(Calendar.DAY_OF_MONTH, 1); - cal_beg.set(Calendar.MONTH, comboBeginMonthPeriod.getSelectedIndex()); - Date begin = cal_beg.getTime(); + // TODO what is status.get(3) ??? + PeriodDTO period = new PeriodDTO("", periodName, beginDate, endDate, null, null, status.get(3)); - Calendar cal_end = Calendar.getInstance(); - cal_end.add(Calendar.YEAR, comboEndYearPeriod.getSelectedIndex()); - cal_end.set(Calendar.MONTH , comboEndMonthPeriod.getSelectedIndex()); - int maximum = cal_end.getActualMaximum(Calendar.DAY_OF_MONTH); - cal_end.set(Calendar.DAY_OF_MONTH, maximum); - - Date end = cal_end.getTime(); - log.debug("Date de debut: "+begin+" Date de fin: "+end); - - String periodName = comboBeginYearPeriod.getSelectedIndex() != comboEndYearPeriod.getSelectedIndex() ? Integer.toString(cal_beg.get(Calendar.YEAR))+"-"+Integer.toString(cal_end.get(Calendar.YEAR)) : Integer.toString(cal_beg.get(Calendar.YEAR)); - PeriodDTO period = new PeriodDTO("", periodName, begin, end, null, null, status.get(3)); - ClosureTableModel closureModel = (ClosureTableModel) table.getModel(); closureModel.addPeriod(period, status); }

1 0

r2798 - trunk/lima-main/src/main/java/org/chorem/lima/combobox
by echatellier＠users.chorem.org 01 Mar '10

01 Mar '10

Author: echatellier Date: 2010-03-01 14:50:09 +0100 (Mon, 01 Mar 2010) New Revision: 2798 Modified: trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java Log: AJout de commentaire pour savoir a quoi sert ce componsant !!! Modified: trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java 2010-03-01 10:27:57 UTC (rev 2797) +++ trunk/lima-main/src/main/java/org/chorem/lima/combobox/JWideComboBox.java 2010-03-01 13:50:09 UTC (rev 2798) @@ -26,12 +26,17 @@ import java.awt.*; import java.util.Vector; - /** + * Cette combo box surcharge quelques methodes de l'UI par defaut + * pour que le composant popup soit plus grand que la combobox + * elle même. + * * @author ore */ public class JWideComboBox extends JComboBox { + private boolean layingOut = false; + /** * */ @@ -60,8 +65,6 @@ super(aModel); } - private boolean layingOut = false; - /** * */

1 0

r2797 - trunk
by echatellier＠users.chorem.org 01 Mar '10

01 Mar '10

Author: echatellier Date: 2010-03-01 11:27:57 +0100 (Mon, 01 Mar 2010) New Revision: 2797 Modified: trunk/pom.xml Log: Update to swingx 1.6 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 10:16:48 UTC (rev 2796) +++ trunk/pom.xml 2010-03-01 10:27:57 UTC (rev 2797) @@ -100,7 +100,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx</artifactId> - <version>${swing.version}</version> + <version>${swingx.version}</version> </dependency> <dependency> @@ -185,8 +185,8 @@ <projectId>lima</projectId>  - <callao.version>0.1.2</callao.version> - <nuiton-utils.version>1.1.2</nuiton-utils.version> + <callao.version>0.1.3-SNAPSHOT</callao.version> + <nuiton-utils.version>1.1.4</nuiton-utils.version> <eugene.version>1.0.0</eugene.version> <topia.version>2.2.0</topia.version> @@ -201,7 +201,7 @@   <axis.version>1.3</axis.version> - <swing.version>1.0</swing.version> + <swingx.version>1.6</swingx.version>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r2796 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org 01 Mar '10

01 Mar '10

Author: echatellier Date: 2010-03-01 11:16:48 +0100 (Mon, 01 Mar 2010) New Revision: 2796 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java Log: Remove moved code, undeprecate, still used outside application init Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2010-03-01 10:10:13 UTC (rev 2795) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2010-03-01 10:16:48 UTC (rev 2796) @@ -19,28 +19,17 @@ package org.chorem.lima.ui; -import static org.nuiton.i18n.I18n._; - import java.awt.Window; -import java.io.IOException; -import java.net.URL; -import javax.swing.JOptionPane; - import jaxx.runtime.JAXXContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; -import org.chorem.lima.LimaSplash; -import org.chorem.lima.dto.AccountDTO; -import org.chorem.lima.imports.XMLImport; /** * Barre de progression * * @author Rémi Chapelet - * @deprecated since 0.3.2 (replaced by {@link LimaSplash}) */ public class ProgressBarImpl extends ProgressBar { @@ -76,37 +65,4 @@ // // } - public void loadDefaultAccount(AccountDTO accountRoot) { - if (log.isDebugEnabled()) { - log.debug("Account root : " + accountRoot); - } - if (accountRoot.getChildren().isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("No existing accounts"); - } - - String[] response = {_("lima.response.yes"), _("lima.response.no")}; - int n = JOptionPane.showOptionDialog(this, - _("lima.question.load.accounts"), - _("lima.question"), - JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE, - null, //do not use a custom Icon - response, //the titles of buttons - response[1]); //default button title - if (n == JOptionPane.YES_OPTION) { - XMLImport imports = new XMLImport(); - URL urlFile = ProgressBarImpl.class.getResource("/import/default_pcg.xml"); - try { - imports.importAccount(urlFile.openStream()); - } catch (IOException eee) { - log.error("Erreur chargement du fichier 'default_pcg.xml'", eee); - } - } else { - LimaContext.getContext().getDataManager().resetAccountModel(); - } - } - } - - }

1 0

r2795 - trunk/lima-service-callao
by echatellier＠users.chorem.org 01 Mar '10

01 Mar '10

Author: echatellier Date: 2010-03-01 11:10:13 +0100 (Mon, 01 Mar 2010) New Revision: 2795 Modified: trunk/lima-service-callao/pom.xml Log: Remove duplicated dependency Modified: trunk/lima-service-callao/pom.xml =================================================================== --- trunk/lima-service-callao/pom.xml 2010-03-01 09:45:35 UTC (rev 2794) +++ trunk/lima-service-callao/pom.xml 2010-03-01 10:10:13 UTC (rev 2795) @@ -20,16 +20,11 @@ <artifactId>lima-service</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.chorem.callao</groupId> <artifactId>callao-service</artifactId> </dependency> <dependency> - <groupId>org.chorem.callao</groupId> - <artifactId>callao-service</artifactId> - </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency>

1 0

r2794 - trunk/lima-main/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org 01 Mar '10

01 Mar '10

Author: echatellier Date: 2010-03-01 10:45:35 +0100 (Mon, 01 Mar 2010) New Revision: 2794 Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java Log: Remove duplicated header Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2010-03-01 09:32:36 UTC (rev 2793) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2010-03-01 09:45:35 UTC (rev 2794) @@ -16,20 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/** - * ##% Copyright (C) 2008 Code Lutin, Tony Chemit - * This program is free software; you - * can redistribute it and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. This program is - * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public License for more details. You - * should have received a copy of the GNU General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - * - Suite 330, Boston, MA 02111-1307, USA. - * ##% - */ + package org.chorem.lima; import jaxx.runtime.Util;

1 0

r2793 - trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao
by echatellier＠users.chorem.org 01 Mar '10

01 Mar '10

Author: echatellier Date: 2010-03-01 10:32:36 +0100 (Mon, 01 Mar 2010) New Revision: 2793 Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java Log: Fix a potential / by 0 durring progression update Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java =================================================================== --- trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java 2010-02-26 16:39:12 UTC (rev 2792) +++ trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoTransactionService.java 2010-03-01 09:32:36 UTC (rev 2793) @@ -36,7 +36,6 @@ import org.chorem.lima.service.callao.convertObject.ConvertTransaction; import org.chorem.lima.service.util.ProgressListener; import org.chorem.lima.service.util.ServiceHelper; -import javax.swing.JProgressBar; import static org.nuiton.i18n.I18n._; import org.chorem.callao.service.TransactionServiceImpl; @@ -127,25 +126,29 @@ List<org.chorem.callao.service.dto.TransactionDTO> listTransactionCallao = transactionServiceImpl.getAllTransactionDTO(); // Récupère le nombre de transactions + // TODO le depart a 70 est tres bizar ici + // cela suppose que l'on connait l'ordre de chargement par l'UI double nbTransactions = listTransactionCallao.size(); - double incremente = 30 / nbTransactions; - double value = 70; - for (org.chorem.callao.service.dto.TransactionDTO transactionCallao : listTransactionCallao) { - // Converti la transaction Callao en transaction Lima - TransactionDTO transactionLima = convertTransaction.transactionCallaoToTransactionLima(transactionCallao,journals,periods,status); - // Recherche de toutes les entrées comptables pour cette transaction - List<EntryDTO> listEntryLima = entryServ.getEntryByTransaction(transactionLima, accounts); - // Pour toutes les entrées comptables Lima - for (EntryDTO entryLima : listEntryLima) { - transactionLima.addChild(entryLima); + if (nbTransactions > 0) { + double incremente = 30 / nbTransactions; + double value = 70; + for (org.chorem.callao.service.dto.TransactionDTO transactionCallao : listTransactionCallao) { + // Converti la transaction Callao en transaction Lima + TransactionDTO transactionLima = convertTransaction.transactionCallaoToTransactionLima(transactionCallao,journals,periods,status); + // Recherche de toutes les entrées comptables pour cette transaction + List<EntryDTO> listEntryLima = entryServ.getEntryByTransaction(transactionLima, accounts); + // Pour toutes les entrées comptables Lima + for (EntryDTO entryLima : listEntryLima) { + transactionLima.addChild(entryLima); + } + listTransactionLima.add(transactionLima); + // Incrémente la barre de chargement + value = value + incremente; + + if (progress != null) { + progress.updateProgression(value, _("lima.progressBar.load.etape5")); + } } - listTransactionLima.add(transactionLima); - // Incrémente la barre de chargement - value = value + incremente; - - if (progress != null) { - progress.updateProgression(value, _("lima.progressBar.load.etape5")); - } } return listTransactionLima; }

1 0