October 2011 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r2220 - trunk
by maven-release＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: maven-release Date: 2011-10-28 23:25:38 +0200 (Fri, 28 Oct 2011) New Revision: 2220 Url: http://nuiton.org/repositories/revision/nuiton-utils/2220 Log: Update mavenpom4redmineAndCentral to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-26 12:32:35 UTC (rev 2219) +++ trunk/pom.xml 2011-10-28 21:25:38 UTC (rev 2220) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <artifactId>nuiton-utils-parent</artifactId>

1 0

r2219 - trunk/nuiton-utils/src/test/java/org/nuiton/util
by kmorin＠users.nuiton.org 26 Oct '11

26 Oct '11

Author: kmorin Date: 2011-10-26 14:32:35 +0200 (Wed, 26 Oct 2011) New Revision: 2219 Url: http://nuiton.org/repositories/revision/nuiton-utils/2219 Log: replace GregorianCalendra by Calendar Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-10-26 09:03:02 UTC (rev 2218) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-10-26 12:32:35 UTC (rev 2219) @@ -261,7 +261,7 @@ public void testGetAge() { log.info("getAge"); - Calendar calendar = GregorianCalendar.getInstance(); + Calendar calendar = Calendar.getInstance(); calendar.roll(Calendar.YEAR, -20); calendar.roll(Calendar.DATE, -1);

1 0

r2218 - trunk/nuiton-utils/src/test/java/org/nuiton/util
by kmorin＠users.nuiton.org 26 Oct '11

26 Oct '11

Author: kmorin Date: 2011-10-26 11:03:02 +0200 (Wed, 26 Oct 2011) New Revision: 2218 Url: http://nuiton.org/repositories/revision/nuiton-utils/2218 Log: add test for DateUtil.getAge Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-10-26 08:41:00 UTC (rev 2217) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/DateUtilTest.java 2011-10-26 09:03:02 UTC (rev 2218) @@ -34,6 +34,7 @@ import java.text.ParseException; import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.Locale; /** @@ -257,6 +258,31 @@ } @Test + public void testGetAge() { + log.info("getAge"); + + Calendar calendar = GregorianCalendar.getInstance(); + calendar.roll(Calendar.YEAR, -20); + calendar.roll(Calendar.DATE, -1); + + int result = DateUtil.getAge(calendar.getTime()); + log.info("result1 : " + result); + Assert.assertEquals(20, result); + + calendar.add(Calendar.DATE, 2); + + result = DateUtil.getAge(calendar.getTime()); + log.info("result2 : " + result); + Assert.assertEquals(19, result); + + calendar.add(Calendar.YEAR, 25); + + result = DateUtil.getAge(calendar.getTime()); + log.info("result3 : " + result); + Assert.assertEquals(0, result); + } + + @Test public void testGetMonthLibelle() { log.info("getMonthLibelle");

1 0

r2217 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by kmorin＠users.nuiton.org 26 Oct '11

26 Oct '11

Author: kmorin Date: 2011-10-26 10:41:00 +0200 (Wed, 26 Oct 2011) New Revision: 2217 Url: http://nuiton.org/repositories/revision/nuiton-utils/2217 Log: update javadoc Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-10-26 08:37:42 UTC (rev 2216) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-10-26 08:41:00 UTC (rev 2217) @@ -355,13 +355,12 @@ } /** - * Do the difference between the two dates in argument. The result is a number - * of years between the two dates. - * Ex : 01/01/2009 and 28/02/2011 return 2 years. + * Get the age of a person born on the date in argument. The result is a number + * of years between the birth date and now. + * Ex : 01/01/2000 returns 11 years (now date is 26/10/2011). * - * @param beginDate first date - * @param endDate second date - * @return a number of years between beginDate and endDate + * @param birthDate birth date + * @return a number of years between birthDate and now */ public static int getAge(Date birthDate) { int count = 0;

1 0

r2216 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by kmorin＠users.nuiton.org 26 Oct '11

26 Oct '11

Author: kmorin Date: 2011-10-26 10:37:42 +0200 (Wed, 26 Oct 2011) New Revision: 2216 Url: http://nuiton.org/repositories/revision/nuiton-utils/2216 Log: replace getDifferenceInYears by getAge (my actual need and potential need for other people) Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-10-26 08:35:31 UTC (rev 2215) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-10-26 08:37:42 UTC (rev 2216) @@ -363,10 +363,10 @@ * @param endDate second date * @return a number of years between beginDate and endDate */ - public static int getDifferenceInYears(Date beginDate, Date endDate) { + public static int getAge(Date birthDate) { int count = 0; - Calendar fromCalendar = getDefaultCalendar(beginDate); - Calendar thruCalendar = getDefaultCalendar(endDate); + Calendar fromCalendar = getDefaultCalendar(birthDate); + Calendar thruCalendar = getDefaultCalendar(new Date()); fromCalendar.add(Calendar.YEAR, 1); while (fromCalendar.before(thruCalendar)) {

1 0

r2215 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by kmorin＠users.nuiton.org 26 Oct '11

26 Oct '11

Author: kmorin Date: 2011-10-26 10:35:31 +0200 (Wed, 26 Oct 2011) New Revision: 2215 Url: http://nuiton.org/repositories/revision/nuiton-utils/2215 Log: getDifferenceInYears must return ht enumber of full years between the dates Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-10-26 08:32:44 UTC (rev 2214) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-10-26 08:35:31 UTC (rev 2215) @@ -358,7 +358,6 @@ * Do the difference between the two dates in argument. The result is a number * of years between the two dates. * Ex : 01/01/2009 and 28/02/2011 return 2 years. - * Warning, if beginDate is inferior to endDate, the result will be 1 minimum * * @param beginDate first date * @param endDate second date @@ -369,9 +368,10 @@ Calendar fromCalendar = getDefaultCalendar(beginDate); Calendar thruCalendar = getDefaultCalendar(endDate); + fromCalendar.add(Calendar.YEAR, 1); while (fromCalendar.before(thruCalendar)) { + count++; fromCalendar.add(Calendar.YEAR, 1); - count++; } return count; }

1 0

r2214 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by kmorin＠users.nuiton.org 26 Oct '11

26 Oct '11

Author: kmorin Date: 2011-10-26 10:32:44 +0200 (Wed, 26 Oct 2011) New Revision: 2214 Url: http://nuiton.org/repositories/revision/nuiton-utils/2214 Log: add getDifferenceInYears Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-09-30 10:00:52 UTC (rev 2213) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/DateUtil.java 2011-10-26 08:32:44 UTC (rev 2214) @@ -355,6 +355,28 @@ } /** + * Do the difference between the two dates in argument. The result is a number + * of years between the two dates. + * Ex : 01/01/2009 and 28/02/2011 return 2 years. + * Warning, if beginDate is inferior to endDate, the result will be 1 minimum + * + * @param beginDate first date + * @param endDate second date + * @return a number of years between beginDate and endDate + */ + public static int getDifferenceInYears(Date beginDate, Date endDate) { + int count = 0; + Calendar fromCalendar = getDefaultCalendar(beginDate); + Calendar thruCalendar = getDefaultCalendar(endDate); + + while (fromCalendar.before(thruCalendar)) { + fromCalendar.add(Calendar.YEAR, 1); + count++; + } + return count; + } + + /** * Get libelle of the month corresponding to the number given in argument. * * @param monthNumber between 1-12

1 0