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

r2788 - trunk/lima-service/src/main/java/org/chorem/lima/service/util
by echatellier＠users.chorem.org 26 Feb '10

26 Feb '10

Author: echatellier Date: 2010-02-26 15:27:49 +0100 (Fri, 26 Feb 2010) New Revision: 2788 Modified: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java Log: Remove duplicated header. Modified: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java =================================================================== --- trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java 2010-02-26 13:42:33 UTC (rev 2787) +++ trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java 2010-02-26 14:27:49 UTC (rev 2788) @@ -16,20 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/** - * # #% Copyright (C) 2008-2009 Code Lutin, Tony Chemit, Rémi Chapelet - * 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.service.util; import org.apache.commons.logging.Log;

1 0

r2787 - trunk/lima-main/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org 26 Feb '10

26 Feb '10

Author: echatellier Date: 2010-02-26 14:42:33 +0100 (Fri, 26 Feb 2010) New Revision: 2787 Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-main/src/main/java/org/chorem/lima/Main.java Log: Remove enum step (Step.AfterInit.ordinal() can't be used to define an @Step action) Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 13:38:48 UTC (rev 2786) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 13:42:33 UTC (rev 2787) @@ -262,12 +262,10 @@ return type; } } + + public static final int AFTER_INIT_STEP = 0; + public static final int BEFORE_EXIT_STEP = 1; - public static enum Step { - - AfterInit, BeforeExit - } - public static enum Action { HELP(_("lima.action.commandline.help"), LimaAction.class.getName() + "#help", "-h", "--help"), Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2010-02-26 13:38:48 UTC (rev 2786) +++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2010-02-26 13:42:33 UTC (rev 2787) @@ -65,7 +65,7 @@ LimaConfig config = context.getContextValue(LimaConfig.class); - config.doAction(LimaConfig.Step.AfterInit.ordinal()); + config.doAction(LimaConfig.AFTER_INIT_STEP); if (config.isDisplayMainUI()) { // on affiche l'ui principale

1 0

r2786 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org 26 Feb '10

26 Feb '10

Author: echatellier Date: 2010-02-26 14:38:48 +0100 (Fri, 26 Feb 2010) New Revision: 2786 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java Log: Some esthetic fix 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-02-26 13:17:56 UTC (rev 2785) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-02-26 13:38:48 UTC (rev 2786) @@ -31,6 +31,7 @@ import java.util.GregorianCalendar; import java.util.LinkedList; import java.util.List; +import java.util.Locale; import javax.swing.JComboBox; import javax.swing.ListSelectionModel; @@ -167,15 +168,12 @@ addPeriodForm.getEndYearPeriodPanel().validate(); //Init MONTH Periode Combobox - cal.set(Calendar.MONTH, Calendar.JANUARY); - cal.add(Calendar.MONTH, 0); - comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - for(int j = 0; j < 11; j++){ - cal.add(Calendar.MONTH, 1); - comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); - } + cal.set(Calendar.MONTH, Calendar.JANUARY); + for (int j = 0; j <= 11; j++) { + comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, Locale.getDefault())); + comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, Locale.getDefault())); + cal.add(Calendar.MONTH, 1); + } //Add BeginMonth ComboBox to addPeriodForm addPeriodForm.getBeginMonthPeriodPanel().add(comboBeginMonthPeriod); @@ -288,22 +286,21 @@ } PeriodDTO periodCurrent = LimaContext.getContext().getDataManager().getCurrentPeriod(); List<StatusDTO> status = LimaContext.getContext().getDataManager().getStatus(); - // TODO gere locale courante - Calendar cal_beg = new GregorianCalendar(); - if (periodCurrent != null) - { - cal_beg.setTime(periodCurrent.getBegin()); - cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); - } + + Calendar cal_beg = Calendar.getInstance(); + if (periodCurrent != null) { + cal_beg.setTime(periodCurrent.getBegin()); + cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); + } else { - cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); + cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); } cal_beg.set(Calendar.DAY_OF_MONTH, 1); cal_beg.set(Calendar.MONTH, comboBeginMonthPeriod.getSelectedIndex()); Date begin = cal_beg.getTime(); - Calendar cal_end = new GregorianCalendar(); + 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); @@ -377,7 +374,6 @@ form.dispose(); } - /** * Cette méthode permet de retourner une liste des périodes sélectionnées. * @@ -403,6 +399,4 @@ addPeriodForm.setVisible(true); } - } -

1 0

r2785 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by echatellier＠users.chorem.org 26 Feb '10

26 Feb '10

Author: echatellier Date: 2010-02-26 14:17:56 +0100 (Fri, 26 Feb 2010) New Revision: 2785 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java Log: Fix #120, add previous year in period date combo box 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-02-26 12:50:35 UTC (rev 2784) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2010-02-26 13:17:56 UTC (rev 2785) @@ -19,12 +19,27 @@ package org.chorem.lima.ui; +import static org.nuiton.i18n.I18n._; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +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 javax.swing.JComboBox; +import javax.swing.ListSelectionModel; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; import org.chorem.lima.combobox.model.PeriodComboBoxModel; import org.chorem.lima.combobox.renderer.PeriodComboBoxRenderer; -import static org.nuiton.i18n.I18n._; import org.chorem.lima.dto.PeriodDTO; import org.chorem.lima.dto.StatusDTO; import org.chorem.lima.dto.TransactionDTO; @@ -32,15 +47,12 @@ 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; -import javax.swing.*; -import java.awt.event.*; -import java.util.*; -import org.jdesktop.swingx.decorator.*; -import org.nuiton.util.PeriodDates; - - /** * Permet l'affichage du tableau avec les périodes mensuelles. * @@ -48,10 +60,12 @@ */ public class ClosureViewImpl extends ClosureView { - /** - * log - */ + /** serialVersionUID. */ + private static final long serialVersionUID = -8759564865633991757L; + + /** log. */ private static final Log log = LogFactory.getLog(ClosureViewImpl.class); + private final JXTable table; private JComboBox comboBoxPeriod = new JComboBox(); private final ClosureTimeSpanForm form; @@ -73,7 +87,7 @@ // Initialisation du choix pour les périodes initComboBoxPeriod(); - /** Set Period model */ + /* Set Period model */ // Création du model pour le tableau table = new JXTable(LimaContext.getContext().getDataManager().getClosureModel()); table.setRowHeight(24); @@ -83,7 +97,7 @@ table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); table.setColumnControlVisible(true); - /** + /* * Ajout d'un listener lorsque l'utilisateur change de période. */ comboBoxPeriod.addItemListener(new ItemListener() { @@ -97,7 +111,7 @@ } }); // 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) }; @@ -108,7 +122,7 @@ // Ajout du tableau dans l'UI getClosureScrollPane().setViewportView(table); - /** + /* * Initialisation du formulaire pour bloquer ou débloquer une période. */ form = LimaContext.getContext().getMainUI().getClosureTimeSpanForm(); @@ -124,17 +138,25 @@ */ addPeriodForm = LimaContext.getContext().getMainUI().getAddPeriod(); - Calendar cal = new GregorianCalendar(); + Calendar cal = Calendar.getInstance(); //Init YEAR Periode Combobox - cal.add(Calendar.YEAR, 0); - comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR)); - comboEndYearPeriod.addItem(cal.get(Calendar.YEAR)); - for(int i = 0; i < 5; i++){ + // 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); - comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR)); - comboEndYearPeriod.addItem(cal.get(Calendar.YEAR)); } + //Add BeginYear ComboBox to addPeriodForm addPeriodForm.getBeginYearPeriodPanel().add(comboBeginYearPeriod);

1 0

r2784 - trunk/lima-main/src/main/java/org/chorem/lima
by echatellier＠users.chorem.org 26 Feb '10

26 Feb '10

Author: echatellier Date: 2010-02-26 13:50:35 +0100 (Fri, 26 Feb 2010) New Revision: 2784 Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java Log: Update copyright date Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 12:49:46 UTC (rev 2783) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2010-02-26 12:50:35 UTC (rev 2784) @@ -55,7 +55,7 @@ protected static File observeUserDirectory; public String getCopyrightText() { - return "Version " + getVersion() + " Codelutin @ 2008-2009"; + return "Version " + getVersion() + " Codelutin @ 2008-2010"; } /**

1 0

r2783 - trunk/lima-main/src/main/filters
by echatellier＠users.chorem.org 26 Feb '10

26 Feb '10

Author: echatellier Date: 2010-02-26 13:49:46 +0100 (Fri, 26 Feb 2010) New Revision: 2783 Modified: trunk/lima-main/src/main/filters/lima.properties Log: Fix site url Modified: trunk/lima-main/src/main/filters/lima.properties =================================================================== --- trunk/lima-main/src/main/filters/lima.properties 2010-02-21 10:31:12 UTC (rev 2782) +++ trunk/lima-main/src/main/filters/lima.properties 2010-02-26 12:49:46 UTC (rev 2783) @@ -1,6 +1,10 @@ application.name=${project.name} application.version=${project.version} -application.site.url=${project.url} + +# le lien suivant pointe sur le module qui n'a pas de site associ� +#application.site.url=${project.url} +application.site.url=http://maven-site.chorem.org/lima/ + #licence.name=${project.licenses[0].license.name} #licence.url=${project.licenses.0.url} application.organisation.name=${project.organization.name}

1 0

r2782 - trunk
by tchemit＠users.chorem.org 21 Feb '10

21 Feb '10

Author: tchemit Date: 2010-02-21 11:31:12 +0100 (Sun, 21 Feb 2010) New Revision: 2782 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-26 21:08:41 UTC (rev 2781) +++ trunk/pom.xml 2010-02-21 10:31:12 UTC (rev 2782) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.4</version> + <version>2.0.5</version> </parent> <groupId>org.chorem</groupId>

1 0

r2781 - trunk
by tchemit＠users.chorem.org 26 Jan '10

26 Jan '10

Author: tchemit Date: 2010-01-26 22:08:41 +0100 (Tue, 26 Jan 2010) New Revision: 2781 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-25 09:12:11 UTC (rev 2780) +++ trunk/pom.xml 2010-01-26 21:08:41 UTC (rev 2781) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r2780 - trunk
by tchemit＠users.chorem.org 25 Jan '10

25 Jan '10

Author: tchemit Date: 2010-01-25 10:12:11 +0100 (Mon, 25 Jan 2010) New Revision: 2780 Modified: trunk/pom.xml Log: clean pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-25 08:13:22 UTC (rev 2779) +++ trunk/pom.xml 2010-01-25 09:12:11 UTC (rev 2780) @@ -205,8 +205,6 @@  <license.licenseName>gpl_v3</license.licenseName> -  - <helper.includeAttached>false</helper.includeAttached> </properties>

1 0

r2779 - trunk
by tchemit＠users.chorem.org 25 Jan '10

25 Jan '10

Author: tchemit Date: 2010-01-25 09:13:22 +0100 (Mon, 25 Jan 2010) New Revision: 2779 Modified: trunk/pom.xml Log: Utilisation de mavenpom4redmine 2.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-22 10:47:07 UTC (rev 2778) +++ trunk/pom.xml 2010-01-25 08:13:22 UTC (rev 2779) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0.2</version> + <version>2.0.3</version> </parent> <groupId>org.chorem</groupId>

1 0