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); } - } -