Author: fdesbois Date: 2009-12-16 15:50:21 +0100 (Wed, 16 Dec 2009) New Revision: 1707 Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java trunk/src/main/java/org/nuiton/util/PeriodDates.java trunk/src/test/java/org/nuiton/util/DateUtilsTest.java Log: Add method to getMonthLibelle from a month number Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2009-12-16 13:37:54 UTC (rev 1706) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2009-12-16 14:50:21 UTC (rev 1707) @@ -19,15 +19,15 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* */ +import java.text.DateFormatSymbols; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import java.util.Locale; /** - * DateUtils.java - * * Library for manipulating dates. * * @author fdesbois @@ -54,6 +54,11 @@ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern); return simpleDateFormat.format(date); } + + public static String formatDate(Date date, String pattern, Locale locale) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern, locale); + return simpleDateFormat.format(date); + } /** * Parse a date using the pattern in argument. The pattern is the same using @@ -180,4 +185,24 @@ // 86400000 = 24 * 60 * 60 * 1000 return (int) Math.ceil(((end - begin) / 86400000)); } + + /** + * Get libelle of the month corresponding to the number given in argument. + * @param monthNumber between 1-12 + * @param locale Locale for language support + * @return a String corresponding to the libelle of the month + */ + public static String getMonthLibelle(int monthNumber, Locale locale) { + return new DateFormatSymbols(locale).getMonths()[monthNumber-1]; + } + + /** + * Get libelle of the month corresponding to the number given in argument. + * @param monthNumber between 1-12 + * @return a String corresponding to the libelle of the month + */ + public static String getMonthLibelle(int monthNumber) { + return getMonthLibelle(monthNumber, Locale.getDefault()); + } + } Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2009-12-16 13:37:54 UTC (rev 1706) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2009-12-16 14:50:21 UTC (rev 1707) @@ -64,7 +64,7 @@ this.thruCalendar = new GregorianCalendar(); setThruDate(thruDate); - this.pattern = DateUtils.DEFAULT_PATTERN; + this.pattern = DateUtils.DEFAULT_PATTERN; } public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) { @@ -74,7 +74,7 @@ this.thruDate = thruCalendar.getTime(); this.thruCalendar = thruCalendar; - this.pattern = DateUtils.DEFAULT_PATTERN; + this.pattern = DateUtils.DEFAULT_PATTERN; } public static PeriodDates createMonthsPeriodFromToday(int monthAfter) { Modified: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2009-12-16 13:37:54 UTC (rev 1706) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2009-12-16 14:50:21 UTC (rev 1707) @@ -2,6 +2,7 @@ package org.nuiton.util; import java.util.Date; +import java.util.Locale; import junit.framework.Assert; import org.junit.After; import org.junit.AfterClass; @@ -123,4 +124,16 @@ Assert.assertEquals(11, result); } + @Test + public void testGetMonthLibelle() { + System.out.println("getMonthLibelle"); + + Locale.setDefault(Locale.FRENCH); + String janvier = DateUtils.getMonthLibelle(1); + Assert.assertEquals("janvier", janvier); + + String juli = DateUtils.getMonthLibelle(7, Locale.GERMAN); + Assert.assertEquals("Juli", juli); + } + } \ No newline at end of file