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

r1985 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 12:45:57 +0100 (Thu, 23 Dec 2010) New Revision: 1985 Url: http://nuiton.org/repositories/revision/nuiton-utils/1985 Log: Update header Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-23 11:15:31 UTC (rev 1984) +++ trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-23 11:45:57 UTC (rev 1985) @@ -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; import java.util.HashMap;

1 0

r1984 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by bleny＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: bleny Date: 2010-12-23 12:15:31 +0100 (Thu, 23 Dec 2010) New Revision: 1984 Url: http://nuiton.org/repositories/revision/nuiton-utils/1984 Log: fix issue #1159 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-12-23 09:29:07 UTC (rev 1983) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-12-23 11:15:31 UTC (rev 1984) @@ -127,9 +127,15 @@ throw new NullPointerException("fromDate or thruDate can't be null to" + " change dayOfMonth extremities"); } - fromCalendar.set(Calendar.DAY_OF_MONTH, 1); - int maximum = thruCalendar.getActualMaximum(Calendar.DAY_OF_MONTH); - thruCalendar.set(Calendar.DAY_OF_MONTH, maximum); + Date fromDate = fromCalendar.getTime(); + fromDate = DateUtil.setFirstDayOfMonth(fromDate); + fromDate = DateUtil.setMinTimeOfDay(fromDate); + fromCalendar.setTime(fromDate); + + Date thruDate = thruCalendar.getTime(); + thruDate = DateUtil.setLastDayOfMonth(thruDate); + thruDate = DateUtil.setMaxTimeOfDay(thruDate); + thruCalendar.setTime(thruDate); } public void setFromDate(Date fromDate) { Modified: trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java 2010-12-23 09:29:07 UTC (rev 1983) +++ trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java 2010-12-23 11:15:31 UTC (rev 1984) @@ -37,6 +37,7 @@ import java.text.DateFormat; import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.List; /** @author fdesbois */ @@ -81,9 +82,23 @@ } /** Test of initDayOfMonthExtremities method, of class PeriodDates. */ - //@Test + @Test public void testInitDayOfMonthExtremities() { log.info("initDayOfMonthExtremities"); + + PeriodDates period = new PeriodDates(); + period.setFromDate(DateUtil.createDate(9,8,7,23,12,2010)); + period.setThruDate(DateUtil.createDate(6,5,4,26,12,2010)); + + period.initDayOfMonthExtremities(); + + Assert.assertTrue(period.between(DateUtil.createDate(3,2,1,1,12,2010))); + + Calendar lastDayOf2010 = new GregorianCalendar(2010,11,31,23,59,59); + lastDayOf2010.set(Calendar.MILLISECOND, 999); + + Assert.assertEquals(DateUtil.createDate(0,0,0,1,12,2010), period.getFromDate()); + Assert.assertEquals(lastDayOf2010.getTime(), period.getThruDate()); } /** Test of setFromDate method, of class PeriodDates. */

1 0

r1983 - trunk
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:29:07 +0100 (Thu, 23 Dec 2010) New Revision: 1983 Url: http://nuiton.org/repositories/revision/nuiton-utils/1983 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-23 09:29:06 UTC (rev 1982) +++ trunk/pom.xml 2010-12-23 09:29:07 UTC (rev 1983) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.5.2</version> + <version>1.5.3-SNAPSHOT</version> <dependencies> @@ -203,9 +203,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.5.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.5.2</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

r1982 - in tags: . nuiton-utils-1.5.2
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:29:06 +0100 (Thu, 23 Dec 2010) New Revision: 1982 Url: http://nuiton.org/repositories/revision/nuiton-utils/1982 Log: [maven-release-plugin] copy for tag nuiton-utils-1.5.2 Added: tags/nuiton-utils-1.5.2/ Property changes on: tags/nuiton-utils-1.5.2 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1981 - trunk
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:29:03 +0100 (Thu, 23 Dec 2010) New Revision: 1981 Url: http://nuiton.org/repositories/revision/nuiton-utils/1981 Log: [maven-release-plugin] prepare release nuiton-utils-1.5.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-23 09:25:30 UTC (rev 1980) +++ trunk/pom.xml 2010-12-23 09:29:03 UTC (rev 1981) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> <dependencies> @@ -203,9 +203,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.5.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.5.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1980 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:25:30 +0100 (Thu, 23 Dec 2010) New Revision: 1980 Url: http://nuiton.org/repositories/revision/nuiton-utils/1980 Log: Add svn keywords Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java Property changes on: trunk/src/main/java/org/nuiton/util/TimeTrace.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1979 - trunk
by sletellier＠users.nuiton.org 23 Dec '10

23 Dec '10

Author: sletellier Date: 2010-12-23 10:24:11 +0100 (Thu, 23 Dec 2010) New Revision: 1979 Url: http://nuiton.org/repositories/revision/nuiton-utils/1979 Log: Up i18n version to 2.0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-22 18:26:23 UTC (rev 1978) +++ trunk/pom.xml 2010-12-23 09:24:11 UTC (rev 1979) @@ -164,7 +164,7 @@ <properties> - <nuitonI18nVersion>2.0.1-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>2.0.1</nuitonI18nVersion>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles>

1 0

r1978 - trunk
by bleny＠users.nuiton.org 22 Dec '10

22 Dec '10

Author: bleny Date: 2010-12-22 19:26:23 +0100 (Wed, 22 Dec 2010) New Revision: 1978 Url: http://nuiton.org/repositories/revision/nuiton-utils/1978 Log: add missing developers at http://maven-site.nuiton.org/nuiton-utils/dev-activity.html ; should tchemit and jcouteau be added ? they are both inherited from mavenpom and it seems OK on nuiton-utils maven site Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-22 17:56:43 UTC (rev 1977) +++ trunk/pom.xml 2010-12-22 18:26:23 UTC (rev 1978) @@ -107,6 +107,55 @@ <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-utils</url> + <developers> + + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + <role>Debian packager</role> + </roles> + </developer> + + <developer> + <name>Éric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + </developers> +

1 0

r1977 - in trunk/src: main/java/org/nuiton/util main/resources/i18n test/java/org/nuiton/util
by bleny＠users.nuiton.org 22 Dec '10

22 Dec '10

Author: bleny Date: 2010-12-22 18:56:43 +0100 (Wed, 22 Dec 2010) New Revision: 1977 Url: http://nuiton.org/repositories/revision/nuiton-utils/1977 Log: fix #1157 + test Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties trunk/src/test/java/org/nuiton/util/DateUtilTest.java Modified: trunk/src/main/java/org/nuiton/util/DateUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/java/org/nuiton/util/DateUtil.java 2010-12-22 17:56:43 UTC (rev 1977) @@ -96,6 +96,7 @@ */ public static Date createDate(int s, int m, int h, int dd, int mm, int yy) { Calendar calendar = Calendar.getInstance(); + calendar.setTimeInMillis(0L); calendar.set(Calendar.YEAR, yy); calendar.set(Calendar.MONTH, mm-1); calendar.set(Calendar.DAY_OF_MONTH, dd); Modified: trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/resources/i18n/nuiton-utils_en_GB.properties 2010-12-22 17:56:43 UTC (rev 1977) @@ -1,3 +1,6 @@ +Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= +Class\ %s\ can't\ be\ instanciated\ with\ %s= +Your\ class\ %s\ has\ more\ than\ one\ constructor= nuitonutil.config.moving.conf=Moving old configuration file from %s to %s nuitonutil.debug.objectutil.create=Try to create %s with %s nuitonutil.debug.objectutil.instantiate=Can't instantiate %s with params %s Modified: trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/main/resources/i18n/nuiton-utils_fr_FR.properties 2010-12-22 17:56:43 UTC (rev 1977) @@ -1,3 +1,6 @@ +Can't\ find\ assignable\ argument\ for\ %s\ in\ %s= +Class\ %s\ can't\ be\ instanciated\ with\ %s= +Your\ class\ %s\ has\ more\ than\ one\ constructor= nuitonutil.config.moving.conf=D\u00E9placement du fichier de configuration depuis %s vers %s nuitonutil.debug.objectutil.create=Essaye de cr\u00E9er %s avec %s nuitonutil.debug.objectutil.instantiate=Ne peut pas instancier %s avec les param\u00EAtres %s Modified: trunk/src/test/java/org/nuiton/util/DateUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-12-22 17:37:01 UTC (rev 1976) +++ trunk/src/test/java/org/nuiton/util/DateUtilTest.java 2010-12-22 17:56:43 UTC (rev 1977) @@ -35,6 +35,7 @@ import org.junit.Test; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Calendar; import java.util.Date; import java.util.Locale; @@ -85,11 +86,11 @@ * Test of createDate method, of class DateUtils. */ @Test - public void testCreateDate() { + public void testCreateDate() throws ParseException { log.info("createDate"); - Date newdate = DateUtil.createDate(3, 3, 2009); - Calendar calendar = DateUtil.getDefaultCalendar(newdate); + 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)); @@ -102,6 +103,18 @@ } /** + * Non regression test for bug #1157 + * @since 1.5.2 + */ + @Test + public void testCreateDateIsDeterministic() throws ParseException { + Date createdDate = DateUtil.createDate(0, 33, 18, 22, 12, 2010); + Date parsedDate = DateUtil.parseDate("22/12/2010 18:33", "dd/MM/yyyy HH:mm"); + log.info(createdDate.getTime() + " ?= " + parsedDate.getTime()); + Assert.assertEquals(createdDate, parsedDate); + } + + /** * Test of createDateAfterToday method, of class DateUtil. */ //@Test

1 0

r1976 - trunk/src/main/java/org/nuiton/util
by bpoussin＠users.nuiton.org 22 Dec '10

22 Dec '10

Author: bpoussin Date: 2010-12-22 18:37:01 +0100 (Wed, 22 Dec 2010) New Revision: 1976 Url: http://nuiton.org/repositories/revision/nuiton-utils/1976 Log: must use 1000000l to multiple long Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java Modified: trunk/src/main/java/org/nuiton/util/TimeTrace.java =================================================================== --- trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-22 16:58:14 UTC (rev 1975) +++ trunk/src/main/java/org/nuiton/util/TimeTrace.java 2010-12-22 17:37:01 UTC (rev 1976) @@ -52,9 +52,9 @@ } /** time to trigger log time in info level (ns) (default: 1s) */ - protected long timeToLogInfo = 1000 * 1000000; + protected long timeToLogInfo = 1000l * 1000000l; /** time to trigger log time in warn level (ns) (default: 3s) */ - protected long timeToLogWarn = 3000 * 1000000; + protected long timeToLogWarn = 3000l * 1000000l; /** for each method of all proxies, keep number of call */ protected Map<String, CallStat> callCount = new HashMap<String, CallStat>(); @@ -77,7 +77,7 @@ * @param timeToLogInfoMs time in milliseconde after that we log info */ public void setTimeToLogInfo(long timeToLogInfoMs) { - this.timeToLogInfo = timeToLogInfoMs * 1000000; // convert ms -> ns + this.timeToLogInfo = timeToLogInfoMs * 1000000l; // convert ms -> ns } /** @@ -85,7 +85,7 @@ * @param timeToWarnInfoMs time in milliseconde after that we log warn */ public void setTimeToLogWarn(long timeToLogWarnMs) { - this.timeToLogWarn = timeToLogWarnMs * 1000000; // convert ms -> ns + this.timeToLogWarn = timeToLogWarnMs * 1000000l; // convert ms -> ns } public Map<String, CallStat> getCallCount() {

1 0