August 2010 - Nuiton-utils-commits - mailman.cloud.codelutin.com

r1917 - trunk
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 17:20:56 +0200 (Sun, 29 Aug 2010) New Revision: 1917 Url: http://nuiton.org/repositories/revision/nuiton-utils/1917 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 15:20:55 UTC (rev 1916) +++ trunk/pom.xml 2010-08-29 15:20:56 UTC (rev 1917) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> <dependencies> @@ -170,9 +170,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.4.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.4.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> </scm> <profiles>

1 0

r1916 - in tags: . nuiton-utils-1.4.1
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 17:20:55 +0200 (Sun, 29 Aug 2010) New Revision: 1916 Url: http://nuiton.org/repositories/revision/nuiton-utils/1916 Log: [maven-release-plugin] copy for tag nuiton-utils-1.4.1 Added: tags/nuiton-utils-1.4.1/ Property changes on: tags/nuiton-utils-1.4.1 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1915 - trunk
by hudson＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: hudson Date: 2010-08-29 17:20:53 +0200 (Sun, 29 Aug 2010) New Revision: 1915 Url: http://nuiton.org/repositories/revision/nuiton-utils/1915 Log: [maven-release-plugin] prepare release nuiton-utils-1.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:52:06 UTC (rev 1914) +++ trunk/pom.xml 2010-08-29 15:20:53 UTC (rev 1915) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> <dependencies> @@ -170,9 +170,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.4.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.4.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1914 - trunk/src/main/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:52:06 +0200 (Sun, 29 Aug 2010) New Revision: 1914 Url: http://nuiton.org/repositories/revision/nuiton-utils/1914 Log: fix author Modified: trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java Modified: trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2010-08-29 14:50:47 UTC (rev 1913) +++ trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2010-08-29 14:52:06 UTC (rev 1914) @@ -56,7 +56,7 @@ * properties for the attached bean since the last call to * {@link #clearModified()} (or {@link #setBean(Object)}. * - * @author chemit <chemit(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> * @since 1.4.1 */ public class BeanMonitor {

1 0

r1913 - in trunk/src: license main/java/org/nuiton/util main/java/org/nuiton/util/beans main/java/org/nuiton/util/converter test/java/org/nuiton/util test/java/org/nuiton/util/beans test/java/org/nuiton/util/converter
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:50:47 +0200 (Sun, 29 Aug 2010) New Revision: 1913 Url: http://nuiton.org/repositories/revision/nuiton-utils/1913 Log: add svn keywords Modified: trunk/src/license/THIRD-PARTY.properties trunk/src/license/project.xml trunk/src/main/java/org/nuiton/util/DateUtil.java trunk/src/main/java/org/nuiton/util/TestUtil.java trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java trunk/src/main/java/org/nuiton/util/converter/package-info.java trunk/src/test/java/org/nuiton/util/DateUtilTest.java trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java trunk/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java Property changes on: trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-08-29 14:47:34 UTC (rev 1912) +++ trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-08-29 14:50:47 UTC (rev 1913) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils * - * $Id: DateUtils.java 1907 2010-08-26 11:09:55Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/src/main/java/org/nuiton/util/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2010 CodeLutin * %% @@ -38,7 +38,7 @@ * * <b>Note: </b> * @author fdesbois - * @version $Id: DateUtils.java 1907 2010-08-26 11:09:55Z tchemit $ + * @version $Id$ * @since 1.4.1 */ public class DateUtil { Property changes on: trunk/src/main/java/org/nuiton/util/DateUtil.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/src/main/java/org/nuiton/util/TestUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TestUtil.java 2010-08-29 14:47:34 UTC (rev 1912) +++ trunk/src/main/java/org/nuiton/util/TestUtil.java 2010-08-29 14:50:47 UTC (rev 1913) @@ -38,7 +38,7 @@ * Created: 22 juin 2010 * * @author fdesbois <fdesbois(a)codelutin.com> - * @version $Id:$ + * @version $Id$ */ public class TestUtil { Property changes on: trunk/src/main/java/org/nuiton/util/TestUtil.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/main/java/org/nuiton/util/converter/package-info.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Modified: trunk/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-08-29 14:47:34 UTC (rev 1912) +++ trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-08-29 14:50:47 UTC (rev 1913) @@ -2,8 +2,8 @@ * #%L * Nuiton Utils * - * $Id: DateUtilsTest.java 1907 2010-08-26 11:09:55Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/src/test/java/org/nuiton/util/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2010 CodeLutin * %% Property changes on: trunk/src/test/java/org/nuiton/util/DateUtilTest.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java 2010-08-29 14:47:34 UTC (rev 1912) +++ trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java 2010-08-29 14:50:47 UTC (rev 1913) @@ -33,7 +33,7 @@ * Tests {@link BeanMonitor}. * * @author tchemit <chemit(a)codelutin.com> - * @serial $Id:$ + * @serial $Id$ * @since 1.4.1 */ public class BeanMonitorTest { Property changes on: trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author

1 0

r1912 - in trunk/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:47:34 +0200 (Sun, 29 Aug 2010) New Revision: 1912 Url: http://nuiton.org/repositories/revision/nuiton-utils/1912 Log: add headers + clean BeanUtil Modified: trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java Modified: trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2010-08-29 14:39:36 UTC (rev 1911) +++ trunk/src/main/java/org/nuiton/util/beans/BeanMonitor.java 2010-08-29 14:47:34 UTC (rev 1912) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.beans; import org.apache.commons.logging.Log; Modified: trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java 2010-08-29 14:39:36 UTC (rev 1911) +++ trunk/src/main/java/org/nuiton/util/beans/BeanUtil.java 2010-08-29 14:47:34 UTC (rev 1912) @@ -1,20 +1,34 @@ +/* + * #%L + * Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.beans; import org.apache.commons.beanutils.MethodUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import static org.nuiton.i18n.I18n._; - /** * Usefull methods around the {@link PropertyChangeListener}. * @@ -22,7 +36,10 @@ * @since 1.4.1 */ public class BeanUtil { + public static final String ADD_PROPERTY_CHANGE_LISTENER = "addPropertyChangeListener"; + public static final String REMOVE_PROPERTY_CHANGE_LISTENER = "removePropertyChangeListener"; + protected BeanUtil() { // no instance } @@ -45,7 +62,7 @@ public static void addPropertyChangeListener(PropertyChangeListener listener, Object bean) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { MethodUtils.invokeExactMethod(bean, - "addPropertyChangeListener", + ADD_PROPERTY_CHANGE_LISTENER, new Object[]{listener}, new Class[]{PropertyChangeListener.class} ); @@ -69,7 +86,7 @@ public static void removePropertyChangeListener(PropertyChangeListener listener, Object bean) throws InvocationTargetException, NoSuchMethodException, IllegalAccessException { MethodUtils.invokeExactMethod(bean, - "removePropertyChangeListener", + REMOVE_PROPERTY_CHANGE_LISTENER, new Object[]{listener}, new Class[]{PropertyChangeListener.class} ); Modified: trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java 2010-08-29 14:39:36 UTC (rev 1911) +++ trunk/src/test/java/org/nuiton/util/beans/BeanMonitorTest.java 2010-08-29 14:47:34 UTC (rev 1912) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.util.beans; import org.junit.Assert;

1 0

r1911 - trunk/src/test/java/org/nuiton/util
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:39:36 +0200 (Sun, 29 Aug 2010) New Revision: 1911 Url: http://nuiton.org/repositories/revision/nuiton-utils/1911 Log: Evolution #832: Deprecates Log class Modified: trunk/src/test/java/org/nuiton/util/LogTest.java Modified: trunk/src/test/java/org/nuiton/util/LogTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/LogTest.java 2010-08-29 14:38:34 UTC (rev 1910) +++ trunk/src/test/java/org/nuiton/util/LogTest.java 2010-08-29 14:39:36 UTC (rev 1911) @@ -38,6 +38,10 @@ import junit.framework.TestCase; +/** + * @deprecated since 1.4.1, will not be replaced. + */ +@Deprecated public class LogTest extends TestCase { // LogTest protected int callTest = 0;

1 0

r1910 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:38:34 +0200 (Sun, 29 Aug 2010) New Revision: 1910 Url: http://nuiton.org/repositories/revision/nuiton-utils/1910 Log: Evolution #831: Deprecates DateUtils in favour to DateUtil Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-08-29 14:34:29 UTC (rev 1909) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-08-29 14:38:34 UTC (rev 1910) @@ -58,7 +58,7 @@ setFromDate(fromDate); setThruDate(thruDate); - pattern = DateUtils.DEFAULT_PATTERN; + pattern = DateUtil.DEFAULT_PATTERN; } public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) throws IllegalArgumentException { @@ -68,7 +68,7 @@ this.fromCalendar = fromCalendar; this.thruCalendar = thruCalendar; - pattern = DateUtils.DEFAULT_PATTERN; + pattern = DateUtil.DEFAULT_PATTERN; } /** @@ -95,7 +95,7 @@ Calendar calendarThru = Calendar.getInstance(); // Reset time - Date minTime = DateUtils.setMinTimeOfDay(new Date()); + Date minTime = DateUtil.setMinTimeOfDay(new Date()); calendarFrom.setTime(minTime); calendarThru.setTime(minTime); @@ -107,7 +107,7 @@ PeriodDates period = new PeriodDates(calendarFrom, calendarThru); period.initDayOfMonthExtremities(); - period.setPattern(DateUtils.MONTH_PATTERN); + period.setPattern(DateUtil.MONTH_PATTERN); return period; } @@ -181,13 +181,13 @@ // Prepare calendars for while condition : // set first day of month + reset time to 00:00:00.000 - Date tmp = DateUtils.setFirstDayOfMonth(fromCalendar.getTime()); - tmp = DateUtils.setMinTimeOfDay(tmp); - Calendar current = DateUtils.getDefaultCalendar(tmp); + Date tmp = DateUtil.setFirstDayOfMonth(fromCalendar.getTime()); + tmp = DateUtil.setMinTimeOfDay(tmp); + Calendar current = DateUtil.getDefaultCalendar(tmp); - tmp = DateUtils.setFirstDayOfMonth(thruCalendar.getTime()); - tmp = DateUtils.setMinTimeOfDay(tmp); - Calendar end = DateUtils.getDefaultCalendar(tmp); + tmp = DateUtil.setFirstDayOfMonth(thruCalendar.getTime()); + tmp = DateUtil.setMinTimeOfDay(tmp); + Calendar end = DateUtil.getDefaultCalendar(tmp); while (!current.equals(end)) { months.add(current.getTime()); @@ -201,7 +201,7 @@ public List<String> getFormatedMonths() { List<String> results = new ArrayList<String>(); for (Date date : getMonths()) { - String str = DateUtils.formatDate(date, pattern); + String str = DateUtil.formatDate(date, pattern); results.add(str); } return results; @@ -224,30 +224,30 @@ } public boolean beforeEnd(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return beforeEnd(calendar); } public boolean afterEnd(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return afterEnd(calendar); } public boolean afterBegin(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return afterBegin(calendar); } public boolean between(Date date) { - Calendar calendar = DateUtils.getDefaultCalendar(date); + Calendar calendar = DateUtil.getDefaultCalendar(date); return between(calendar); } @Override public String toString() { - String fromStr = DateUtils.formatDate(getFromDate(), pattern); - String thruStr = DateUtils.formatDate(getThruDate(), pattern); + String fromStr = DateUtil.formatDate(getFromDate(), pattern); + String thruStr = DateUtil.formatDate(getThruDate(), pattern); return "[ " + getFromDate() + " (pattern: " + fromStr + ") -> " + getThruDate() + " (pattern: " + thruStr + ") ]"; } Modified: trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java 2010-08-29 14:34:29 UTC (rev 1909) +++ trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java 2010-08-29 14:38:34 UTC (rev 1910) @@ -122,7 +122,7 @@ log.info("getMonths"); // Prepare two calendars with time not equals to 0 - Calendar cal1 = DateUtils.getDefaultCalendar(new Date()); + Calendar cal1 = DateUtil.getDefaultCalendar(new Date()); cal1.set(Calendar.DAY_OF_MONTH, 3); cal1.set(Calendar.MONTH, 2); cal1.set(Calendar.YEAR, 2009); @@ -132,7 +132,7 @@ log.info("getMonths:: time for calendarFrom : " + timeFormat.format(cal1.getTime())); - Calendar cal2 = DateUtils.getDefaultCalendar(new Date()); + Calendar cal2 = DateUtil.getDefaultCalendar(new Date()); cal2.set(Calendar.DAY_OF_MONTH, 22); cal2.set(Calendar.MONTH, 6); cal2.set(Calendar.YEAR, 2009); @@ -147,7 +147,7 @@ Assert.assertEquals(5, months.size()); for (int i = 0; i < 5; i++) { Date monthDate = months.get(i); - int month = DateUtils.getDefaultCalendar(monthDate).get(Calendar.MONTH); + int month = DateUtil.getDefaultCalendar(monthDate).get(Calendar.MONTH); Assert.assertEquals(i + 2, month); // 2, 3, 4, 5, 6 } }

1 0

r1909 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:34:29 +0200 (Sun, 29 Aug 2010) New Revision: 1909 Url: http://nuiton.org/repositories/revision/nuiton-utils/1909 Log: Evolution #831: Deprecates DateUtils in favour to DateUtil Added: trunk/src/main/java/org/nuiton/util/DateUtil.java trunk/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java trunk/src/test/java/org/nuiton/util/DateUtilsTest.java Added: trunk/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtil.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-08-29 14:34:29 UTC (rev 1909) @@ -0,0 +1,372 @@ +/* + * #%L + * Nuiton Utils + * + * $Id: DateUtils.java 1907 2010-08-26 11:09:55Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/src/main/java/org/nuiton/util/… $ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.util; + +import java.text.DateFormat; +import java.text.DateFormatSymbols; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +/** + * Library for manipulating dates. + * + * <b>Note: </b> + * @author fdesbois + * @version $Id: DateUtils.java 1907 2010-08-26 11:09:55Z tchemit $ + * @since 1.4.1 + */ +public class DateUtil { + + public static final String DEFAULT_PATTERN = "dd/MM/yyyy"; + + public static final String MONTH_PATTERN = "MM/yyyy"; + + /** + * Format a date using the pattern in argument. The pattern is the same using + * for DateFormat object. + * + * @param date the date to format + * @param pattern the pattern to use + * @return a String corresponding to the date formatted + * @see DateFormat + */ + public static String formatDate(Date date, String pattern) { + 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 + * for DateFormat object. + * + * @param date the String to parse + * @param pattern the pattern to use + * @return a Date corresponding to the String argument parsed + * @throws ParseException for parsing errors + * @see DateFormat + */ + public static Date parseDate(String date, String pattern) throws ParseException { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern); + Date result = simpleDateFormat.parse(date); + return result; + } + + /** + * Create a new date from day, month and year (French version). + * The month is the real month of the year and not the one which is stored + * in Calendar object. + * @param s value of the seconds 1-60 + * @param m value of the minutes 1-60 + * @param h value of the hours 1-24 + * @param dd value of the day 1-31 + * @param mm value of the month 1-12 + * @param yy value of the year 0-9999 + * @return a new date + */ + public static Date createDate(int s, int m, int h, int dd, int mm, int yy) { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.YEAR, yy); + calendar.set(Calendar.MONTH, mm-1); + calendar.set(Calendar.DAY_OF_MONTH, dd); + calendar.set(Calendar.HOUR_OF_DAY, h); + calendar.set(Calendar.MINUTE, m); + calendar.set(Calendar.SECOND, s); + return calendar.getTime(); + } + + /** + * Create a new date from day, month and year (French version). + * The month is the real month of the year and not the one which is stored + * in Calendar object. Time is set to 00:00:00.000 + * @param dd value of the day 1-31 + * @param mm value of the month 1-12 + * @param yy value of the year 0-9999 + * @return a new date + */ + public static Date createDate(int dd, int mm, int yy) { + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.YEAR, yy); + calendar.set(Calendar.MONTH, mm-1); + calendar.set(Calendar.DAY_OF_MONTH, dd); + return setMinTimeOfDay(calendar.getTime()); + } + + /** + * Create a new date after the current date (today) with modification on day, month and year. + * You can use negative values on arguments to have a date before today. + * + * @param ddStep nb days you want to increase from the current date + * @param mmStep nb months you want to increase from the current date + * @param yyStep nb years you want to increase from the current date + * @return a new date from the current date increase by days, months and years. + */ + public static Date createDateAfterToday(int ddStep, int mmStep, int yyStep) { + Calendar calendar = getDefaultCalendar(new Date()); + calendar.add(Calendar.DAY_OF_MONTH, ddStep); + calendar.add(Calendar.MONTH,mmStep); + calendar.add(Calendar.YEAR, yyStep); + return calendar.getTime(); + } + + /** + * Set the last day of month to the date in argument. + * The value depends on the month of the date. (30 april, 28 february, ...) + * + * @param date Date to modify + * @return the date with day of month modified + */ + public static Date setLastDayOfMonth(Date date) { + Calendar calendar = getDefaultCalendar(date); + int maximum = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); + calendar.set(Calendar.DAY_OF_MONTH, maximum); + return calendar.getTime(); + } + + /** + * Set the first day of month to the date in argument. + * + * @param date Date to modify + * @return the date with day of month modified + */ + public static Date setFirstDayOfMonth(Date date) { + Calendar calendar = getDefaultCalendar(date); + calendar.set(Calendar.DAY_OF_MONTH, 1); + return calendar.getTime(); + } + + /** + * Set the min time of the day : 00:00:00.000. + * + * @param date to modify + * @return Date with the time set to the minimum in the day + */ + public static Date setMinTimeOfDay(Date date) { + Calendar calendar = getDefaultCalendar(date); + calendar.set(Calendar.AM_PM, Calendar.AM); + calendar.set(Calendar.HOUR, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + return calendar.getTime(); + } + + /** + * Set the max time of the day. EUROPE : 23:59:59.999. + * + * @param date to modify + * @return Date with the time set to the maximum in the day + */ + public static Date setMaxTimeOfDay(Date date) { + Calendar calendar = getDefaultCalendar(date); + calendar.set(Calendar.AM_PM, Calendar.PM); + calendar.set(Calendar.HOUR, 11); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.SECOND, 59); + calendar.set(Calendar.MILLISECOND, 999); + return calendar.getTime(); + } + + /** + * Check if the first date in argument is included between the two other + * dates. The argument myDate can be equals to beforeDate or afterDate to + * validate the includes. + * + * @param myDate the date to test + * @param beforeDate the first date of the period to test + * @param afterDate the second date of the period to test + * @return true if myDate is included between beforeDate and afterDate + */ + public static boolean between(Date myDate, Date beforeDate, Date afterDate) { + if (myDate == null) { + return false; + } + boolean result = true; + result &= myDate.after(beforeDate) || myDate.compareTo(beforeDate) == 0; + result &= afterDate == null || myDate.before(afterDate) || + myDate.compareTo(afterDate) == 0; + return result; + } + + /** + * Check if the current date is between the two dates in argument. + * + * @param beforeDate the first date of the period + * @param afterDate the second date of the period + * @return true if the current date is included between the two dates, + * false otherwise + * @see #between(Date, Date, Date) + */ + public static boolean currentPeriod(Date beforeDate, Date afterDate) { + return between(new Date(), beforeDate, afterDate); + } + + /** + * Get the month value from a date (between 0 and 11). + * + * @param date the date to extract month + * @return the month value of the date + */ + public static int getMonth(Date date) { + Calendar calendar = getDefaultCalendar(date); + return calendar.get(Calendar.MONTH); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of seconds between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of seconds between beginDate and endDate + */ + public static int getDifferenceInSeconds(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + return (int) Math.ceil((end - begin) / 1000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of minutes between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of minutes between beginDate and endDate + */ + public static int getDifferenceInMinutes(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + // 60000 = 60 * 1000 + return (int) Math.ceil((end - begin) / 60000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of hours between the two dates. + * + * @param beginDate first date + * @param endDate second date + * @return a number of hours between beginDate and endDate + */ + public static int getDifferenceInHours(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + // 3600000 = 60 * 60 * 1000 + return (int) Math.ceil((end - begin) / 3600000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of days between the two dates. + * Ex : 28/01/2009 and 08/02/2009 return 11. + * + * @param beginDate first date + * @param endDate second date + * @return a number of days between beginDate and endDate + */ + public static int getDifferenceInDays(Date beginDate, Date endDate) { + long begin = beginDate.getTime(); + long end = endDate.getTime(); + // 86400000 = 24 * 60 * 60 * 1000 + return (int) Math.ceil((end - begin) / 86400000); + } + + /** + * Do the difference between the two dates in argument. The result is a number + * of months between the two dates. + * Ex : 01/01/2009 and 28/02/2009 return 2 months. + * 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 months between beginDate and endDate + */ + public static int getDifferenceInMonths(Date beginDate, Date endDate) { + int count = 0; + Calendar fromCalendar = getDefaultCalendar(beginDate); + Calendar thruCalendar = getDefaultCalendar(endDate); + + while (fromCalendar.before(thruCalendar)) { + fromCalendar.add(Calendar.MONTH, 1); + count++; + } + return count; + } + + /** + * 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()); + } + + /** + * Get the date before today + * + * @param date concerned + * @return Date before today + */ + public static Date getYesterday(Date date) { + Calendar cal = getDefaultCalendar(date); + cal.roll(Calendar.DAY_OF_MONTH, false); + return cal.getTime(); + } + + /** + * Get the calendar corresponding to the {@code date}. The default calendar + * will be returned (default time zone and locale). + * + * @param date used to set the calendar time + * @return the default calendar with time corresponding to the {@code date} + */ + public static Calendar getDefaultCalendar(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + return calendar; + } +} Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-08-29 14:21:26 UTC (rev 1908) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-08-29 14:34:29 UTC (rev 1909) @@ -34,12 +34,13 @@ import java.util.Locale; /** - * TODO tchemit 2010-08-25 : the name of the class does not fit, it should be called {@code DateUtil}. * Library for manipulating dates. * * @author fdesbois * @version $Id$ + * @deprecated since 1.4.1 (use now {@link DateUtil} */ +@Deprecated public class DateUtils { public static final String DEFAULT_PATTERN = "dd/MM/yyyy"; Added: trunk/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-08-29 14:34:29 UTC (rev 1909) @@ -0,0 +1,291 @@ +/* + * #%L + * Nuiton Utils + * + * $Id: DateUtilsTest.java 1907 2010-08-26 11:09:55Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-utils/trunk/src/test/java/org/nuiton/util/… $ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.util; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +/** + * + * @author fdesbois + * @since 1.4.1 + */ +public class DateUtilTest { + + /** Logger */ + private static final Log log = LogFactory.getLog(DateUtilTest.class); + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of formatDate method, of class DateUtils. + */ + //@Test + public void testFormatDate() { + log.info("formatDate"); + } + + /** + * Test of parseDate method, of class DateUtils. + */ + //@Test + public void testParseDate() { + log.info("parseDate"); + } + + /** + * Test of createDate method, of class DateUtils. + */ + @Test + public void testCreateDate() { + log.info("createDate"); + + Date newdate = DateUtil.createDate(3, 3, 2009); + Calendar calendar = DateUtil.getDefaultCalendar(newdate); + + Assert.assertEquals(3, calendar.get(Calendar.DAY_OF_MONTH)); + Assert.assertEquals(2, calendar.get(Calendar.MONTH)); + Assert.assertEquals(2009, calendar.get(Calendar.YEAR)); + + Assert.assertEquals(0, calendar.get(Calendar.HOUR)); + Assert.assertEquals(0, calendar.get(Calendar.MINUTE)); + Assert.assertEquals(0, calendar.get(Calendar.SECOND)); + Assert.assertEquals(0, calendar.get(Calendar.MILLISECOND)); + } + + /** + * Test of createDateAfterToday method, of class DateUtil. + */ + //@Test + public void testCreateDateAfterToday() { + log.info("createDateAfterToday"); + } + + /** + * Test of setLastDayOfMonth method, of class DateUtil. + */ + //@Test + public void testSetLastDayOfMonth() { + log.info("setLastDayOfMonth"); + } + + /** + * Test of setFirstDayOfMonth method, of class DateUtil. + */ + //@Test + public void testSetFirstDayOfMonth() { + log.info("setFirstDayOfMonth"); + } + + /** + * Test of between method, of class DateUtil. + */ + @Test + public void testBetween() { + log.info("between"); + + Date middle = DateUtil.createDate(3, 3, 2009); + + // middle = begin, and end = null + Date begin = DateUtil.createDate(3, 3, 2009); + Date end = null; + + boolean result = DateUtil.between(middle, begin, end); + Assert.assertTrue(result); + + // middle between the period : march 2009 + PeriodDates period = new PeriodDates(begin, begin); + period.initDayOfMonthExtremities(); + + log.info("period : " + period); + + result = DateUtil.between(middle, period.getFromDate(), period.getThruDate()); + Assert.assertTrue(result); + + // middle = period begin + middle = DateUtil.setFirstDayOfMonth(middle); + result = DateUtil.between(middle, period.getFromDate(), period.getThruDate()); + Assert.assertTrue(result); + + // test with different implementation of Date + Timestamp middle2 = new Timestamp(middle.getTime()); + result = DateUtil.between(middle2, period.getFromDate(), period.getThruDate()); + Assert.assertTrue(result); + + // middle before begin + middle = DateUtil.createDate(2, 2, 2009); + result = DateUtil.between(middle, period.getFromDate(), period.getThruDate()); + Assert.assertFalse(result); + } + + /** + * Test of currentPeriod method, of class DateUtil. + */ + //@Test + public void testCurrentPeriod() { + log.info("currentPeriod"); + } + + /** + * Test of getMonth method, of class DateUtil. + */ + //@Test + public void testGetMonth() { + log.info("getMonth"); + } + + @Test + public void testGetDifferenceInSeconds() { + log.info("getDifferenceInSecondes"); + + Date beginDate = DateUtil.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtil.createDate(0, 11, 0, 3, 2, 2009); + + int result = DateUtil.getDifferenceInSeconds(beginDate, endDate); + Assert.assertEquals(30, result); + + beginDate = DateUtil.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtil.createDate(50, 30, 0, 28, 1, 2009); + + result = DateUtil.getDifferenceInSeconds(beginDate, endDate); + Assert.assertEquals(161, result); + } + + @Test + public void testGetDifferenceInMinutes() { + log.info("getDifferenceInMinutes"); + + Date beginDate = DateUtil.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtil.createDate(0, 12, 0, 3, 2, 2009); + + int result = DateUtil.getDifferenceInMinutes(beginDate, endDate); + Assert.assertEquals(1, result); + + beginDate = DateUtil.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtil.createDate(50, 30, 0, 28, 1, 2009); + + result = DateUtil.getDifferenceInMinutes(beginDate, endDate); + Assert.assertEquals(2, result); + } + + @Test + public void testGetDifferenceInHours() { + log.info("getDifferenceInHours"); + + Date beginDate = DateUtil.createDate(30, 10, 0, 3, 2, 2009); + Date endDate = DateUtil.createDate(0, 11, 0, 4, 2, 2009); + + int result = DateUtil.getDifferenceInHours(beginDate, endDate); + Assert.assertEquals(24, result); + + beginDate = DateUtil.createDate(9, 28, 0, 28, 1, 2009); + endDate = DateUtil.createDate(50, 30, 8, 28, 1, 2009); + + result = DateUtil.getDifferenceInHours(beginDate, endDate); + Assert.assertEquals(8, result); + } + + @Test + public void testGetDifferenceInDays() { + log.info("getDifferenceInDays"); + + Date beginDate = DateUtil.createDate(3, 2, 2009); + Date endDate = DateUtil.createDate(8, 2, 2009); + + int result = DateUtil.getDifferenceInDays(beginDate, endDate); + Assert.assertEquals(5, result); + + beginDate = DateUtil.createDate(28, 1, 2009); + endDate = DateUtil.createDate(8, 2, 2009); + + result = DateUtil.getDifferenceInDays(beginDate, endDate); + Assert.assertEquals(11, result); + } + + @Test + public void testGetDifferenceInMonths() { + log.info("getDifferenceInMonths"); + + Date beginDate = DateUtil.createDate(3, 2, 2009); + Date endDate = DateUtil.createDate(8, 8, 2010); + + int result = DateUtil.getDifferenceInMonths(beginDate, endDate); + log.info("result1 : " + result); + Assert.assertEquals(19, result); + + beginDate = DateUtil.createDate(1, 1, 2009); + endDate = DateUtil.createDate(28, 2, 2009); + + result = DateUtil.getDifferenceInMonths(beginDate, endDate); + log.info("result2 : " + result); + Assert.assertEquals(2, result); + + beginDate = DateUtil.createDate(31, 1, 2009); + endDate = DateUtil.createDate(1, 2, 2009); + + result = DateUtil.getDifferenceInMonths(beginDate, endDate); + log.info("result3 : " + result); + Assert.assertEquals(1, result); + } + + @Test + public void testGetMonthLibelle() { + log.info("getMonthLibelle"); + + Locale.setDefault(Locale.FRENCH); + String janvier = DateUtil.getMonthLibelle(1); + Assert.assertEquals("janvier", janvier); + + String juli = DateUtil.getMonthLibelle(7, Locale.GERMAN); + Assert.assertEquals("Juli", juli); + } + +} Modified: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-08-29 14:21:26 UTC (rev 1908) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-08-29 14:34:29 UTC (rev 1909) @@ -42,7 +42,9 @@ /** * * @author fdesbois + * @deprecated since 1.4.1, use now {@link DateUtilTest} */ +@Deprecated public class DateUtilsTest { /** Logger */

1 0

r1908 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:21:26 +0200 (Sun, 29 Aug 2010) New Revision: 1908 Url: http://nuiton.org/repositories/revision/nuiton-utils/1908 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-26 11:09:55 UTC (rev 1907) +++ trunk/pom.xml 2010-08-29 14:21:26 UTC (rev 1908) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0