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

r1785 - in trunk: . src/main/java/org/nuiton src/main/java/org/nuiton/util src/test/java/org/nuiton src/test/java/org/nuiton/log src/test/resources/i18n
by tchemit＠users.nuiton.org 07 Mar '10

07 Mar '10

Author: tchemit Date: 2010-03-07 17:10:52 +0100 (Sun, 07 Mar 2010) New Revision: 1785 Log: - reformat code (80 car per line max) - Evolution #347: Move all i18n api to project i18n - Evolution #348: Use i18n version 1.1 Removed: trunk/src/main/java/org/nuiton/i18n/ trunk/src/test/java/org/nuiton/i18n/ trunk/src/test/resources/i18n/dummy-en.properties trunk/src/test/resources/i18n/dummy-en_GB.properties trunk/src/test/resources/i18n/dummy-en_US.properties trunk/src/test/resources/i18n/dummy-fr.properties trunk/src/test/resources/i18n/dummy-fr_FR.properties trunk/src/test/resources/i18n/dummy.properties trunk/src/test/resources/i18n/dummyOnlyen-en.properties trunk/src/test/resources/i18n/dummyOnlyen.properties trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties trunk/src/test/resources/i18n/dummyOnlyfr.properties trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties trunk/src/test/resources/i18n/verydummy.properties Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java trunk/src/main/java/org/nuiton/util/Resource.java trunk/src/test/java/org/nuiton/log/LutinLogTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/pom.xml 2010-03-07 16:10:52 UTC (rev 1785) @@ -102,7 +102,7 @@ <packaging>jar</packaging> <properties> - <i18n.version>1.0.1</i18n.version> + <i18n.version>1.1-SNAPSHOT</i18n.version>  <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> Modified: trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/main/java/org/nuiton/util/ClassLoaderUtil.java 2010-03-07 16:10:52 UTC (rev 1785) @@ -18,6 +18,7 @@ */ package org.nuiton.util; +import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.lang.reflect.Method; @@ -37,12 +38,13 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ - private static final org.apache.commons.logging.Log log = LogFactory.getLog(ClassLoaderUtil.class); + private static final Log log = LogFactory.getLog(ClassLoaderUtil.class); /** - * Returns the all urls to be used in a {@link java.net.URLClassLoader}. + * Returns the all urls to be used in a {@link URLClassLoader}. * - * If classloader has only one url and the url is a jar, try to load in manifest class-path + * If classloader has only one url and the url is a jar, try to load in + * manifest class-path. * * @param loader the classloader (if null will use system one) * @return all the url found in the classloader @@ -62,20 +64,24 @@ if (Resource.isJar(currentUrl.toString())) { // jar invocation try { - URL[] newArrayURLs = Resource.getClassPathURLsFromJarManifest(currentUrl); + URL[] newArrayURLs = + Resource.getClassPathURLsFromJarManifest( + currentUrl); if (newArrayURLs == null) { continue; } List<URL> newURLs = Arrays.asList(newArrayURLs); for (URL newURL : newURLs) { - if (!urlTreated.contains(newURL) && !urlToTreate.contains(newURL)) { + if (!urlTreated.contains(newURL) && + !urlToTreate.contains(newURL)) { urlToTreate.add(newURL); } } } catch (Exception e) { if (log.isDebugEnabled()) { // this is not a such error, but some jar can not be - log.debug("error with url" + currentUrl + " for reason : " + e.getMessage()); + log.debug("error with url" + currentUrl + + " for reason : " + e.getMessage()); } } } @@ -84,9 +90,10 @@ } /** - * Recupere la liste des urls d'un {@link java.net.URLClassLoader}. + * Recupere la liste des urls d'un {@link URLClassLoader}. * - * Note : Un cas particulier est positionné pour JBoss qui utilise la method getAllURLs. + * Note : Un cas particulier est positionné pour JBoss qui utilise + * la method getAllURLs. * * @param classLoader le class loader a scanner * @return les urls du classloade. @@ -97,7 +104,8 @@ } Method m; try { - // Essai de récupération de la méthode getAllURLs() de RepositoryClassLoader (JBoss) + // Essai de récupération de la méthode getAllURLs() de + // RepositoryClassLoader (JBoss) m = classLoader.getClass().getMethod("getAllURLs"); } catch (Exception e) { m = null; Modified: trunk/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/src/main/java/org/nuiton/util/Resource.java 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/main/java/org/nuiton/util/Resource.java 2010-03-07 16:10:52 UTC (rev 1785) @@ -660,7 +660,7 @@ if (log.isTraceEnabled()) { log.trace("zip to search " + file); } - return new ZipFile(file).getEntry(directory + "/") != null; + return new ZipFile(file).getEntry(directory + '/') != null; } if (file.isDirectory()) { // cas ou le ichier du classLoader est un repertoire Modified: trunk/src/test/java/org/nuiton/log/LutinLogTest.java =================================================================== --- trunk/src/test/java/org/nuiton/log/LutinLogTest.java 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/java/org/nuiton/log/LutinLogTest.java 2010-03-07 16:10:52 UTC (rev 1785) @@ -89,6 +89,11 @@ } +/** + * @deprecated since 20090327 this class seam to produce a frame on each + * log call (produce huge memory consumption), will be deleted soon. + */ +@Deprecated public class LutinLogTest extends TestCase { public void testStack() throws Exception { Deleted: trunk/src/test/resources/i18n/dummy-en.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-en.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-en.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-en.one -two=dummy-en.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-en_GB.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-en_GB.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-en_GB.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-en_GB.one -two=dummy-en_GB.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-en_US.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-en_US.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-en_US.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-en-US.one -two=dummy-en-US.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-fr.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-fr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-fr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-fr.un -two=dummy-fr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy-fr_FR.properties =================================================================== --- trunk/src/test/resources/i18n/dummy-fr_FR.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy-fr_FR.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=dummy-fr_FR.un -two=dummy-fr_FR.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummy.properties =================================================================== --- trunk/src/test/resources/i18n/dummy.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummy.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -very.one=dummy.one -very.two=dummy.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyen-en.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyen-en.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyen-en.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylen.one=dummyOnlyen-en.one -onylen.two=dummyOnlyen-en.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyen.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyen.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyen.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylen.one=dummyOnlyen.one -onylen.two=dummyOnlyen.two \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyfr-fr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylfr.one=dummyOnlyfr-fr.un -onylfr.two=dummyOnlyfr-fr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyfr.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyfr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyfr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylfr.one=dummyOnlyfr.un -onylfr.two=dummyOnlyfr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties =================================================================== --- trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/dummyOnlyfr2-fr.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -onylfr2.one=dummyOnlyfr2-fr.un -onylfr2.two=dummyOnlyfr2-fr.deux \ No newline at end of file Deleted: trunk/src/test/resources/i18n/verydummy.properties =================================================================== --- trunk/src/test/resources/i18n/verydummy.properties 2010-03-01 20:28:08 UTC (rev 1784) +++ trunk/src/test/resources/i18n/verydummy.properties 2010-03-07 16:10:52 UTC (rev 1785) @@ -1,2 +0,0 @@ -one=verydummy.one -two=verydummy.two \ No newline at end of file

1 0

r1784 - trunk
by tchemit＠users.nuiton.org 01 Mar '10

01 Mar '10

Author: tchemit Date: 2010-03-01 21:28:08 +0100 (Mon, 01 Mar 2010) New Revision: 1784 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 20:28:06 UTC (rev 1783) +++ trunk/pom.xml 2010-03-01 20:28:08 UTC (rev 1784) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.5</version> + <version>1.1.6-SNAPSHOT</version> <dependencies> @@ -152,9 +152,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.5</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.5</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

r1783 - in tags: . nuiton-utils-1.1.5
by tchemit＠users.nuiton.org 01 Mar '10

01 Mar '10

Author: tchemit Date: 2010-03-01 21:28:06 +0100 (Mon, 01 Mar 2010) New Revision: 1783 Added: tags/nuiton-utils-1.1.5/ Log: [maven-release-plugin] copy for tag nuiton-utils-1.1.5 Property changes on: tags/nuiton-utils-1.1.5 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1782 - trunk
by tchemit＠users.nuiton.org 01 Mar '10

01 Mar '10

Author: tchemit Date: 2010-03-01 21:28:03 +0100 (Mon, 01 Mar 2010) New Revision: 1782 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release nuiton-utils-1.1.5 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-03-01 17:10:07 UTC (rev 1781) +++ trunk/pom.xml 2010-03-01 20:28:03 UTC (rev 1782) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.5</version> <dependencies> @@ -152,9 +152,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.1.5</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.5</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1781 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 01 Mar '10

01 Mar '10

Author: fdesbois Date: 2010-03-01 18:10:07 +0100 (Mon, 01 Mar 2010) New Revision: 1781 Added: trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java Log: Ano #334 : infinite loop on PeriodDates getMonths method Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-03-01 13:20:13 UTC (rev 1780) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-03-01 17:10:07 UTC (rev 1781) @@ -177,10 +177,21 @@ return months; } - Calendar current = (Calendar) fromCalendar.clone(); - current.set(Calendar.DAY_OF_MONTH, 1); - Calendar end = (Calendar) thruCalendar.clone(); - end.set(Calendar.DAY_OF_MONTH, 1); +// Calendar current = (Calendar) fromCalendar.clone(); +// current.set(Calendar.DAY_OF_MONTH, 1); +// Calendar end = (Calendar) thruCalendar.clone(); +// end.set(Calendar.DAY_OF_MONTH, 1); + + // 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); + + tmp = DateUtils.setFirstDayOfMonth(thruCalendar.getTime()); + tmp = DateUtils.setMinTimeOfDay(tmp); + Calendar end = DateUtils.getDefaultCalendar(tmp); + while (!current.equals(end)) { months.add(current.getTime()); current.add(Calendar.MONTH, 1); Added: trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java 2010-03-01 17:10:07 UTC (rev 1781) @@ -0,0 +1,230 @@ + +package org.nuiton.util; + +import java.text.DateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * @author fdesbois + */ +public class PeriodDatesTest { + + public PeriodDatesTest() { + } + + @BeforeClass + public static void setUpClass() throws Exception { + } + + @AfterClass + public static void tearDownClass() throws Exception { + } + + @Before + public void setUp() { + } + + @After + public void tearDown() { + } + + /** + * Test of createMonthsPeriodFromToday method, of class PeriodDates. + */ + //@Test + public void testCreateMonthsPeriodFromToday() { + System.out.println("createMonthsPeriodFromToday"); + } + + /** + * Test of getPattern method, of class PeriodDates. + */ + //@Test + public void testGetPattern() { + System.out.println("getPattern"); + } + + /** + * Test of setPattern method, of class PeriodDates. + */ + //@Test + public void testSetPattern() { + System.out.println("setPattern"); + } + + /** + * Test of initDayOfMonthExtremities method, of class PeriodDates. + */ + //@Test + public void testInitDayOfMonthExtremities() { + System.out.println("initDayOfMonthExtremities"); + } + + /** + * Test of setFromDate method, of class PeriodDates. + */ + //@Test + public void testSetFromDate() { + System.out.println("setFromDate"); + } + + /** + * Test of getFromDate method, of class PeriodDates. + */ + //@Test + public void testGetFromDate() { + System.out.println("getFromDate"); + } + + /** + * Test of getFromMonth method, of class PeriodDates. + */ + //@Test + public void testGetFromMonth() { + System.out.println("getFromMonth"); + } + + /** + * Test of setThruDate method, of class PeriodDates. + */ + //@Test + public void testSetThruDate() { + System.out.println("setThruDate"); + } + + /** + * Test of getThruDate method, of class PeriodDates. + */ + //@Test + public void testGetThruDate() { + System.out.println("getThruDate"); + } + + /** + * Test of getMonths method, of class PeriodDates. + */ + @Test + public void testGetMonths() { + System.out.println("getMonths"); + + // Prepare two calendars with time not equals to 0 + Calendar cal1 = DateUtils.getDefaultCalendar(new Date()); + cal1.set(Calendar.DAY_OF_MONTH, 3); + cal1.set(Calendar.MONTH, 2); + cal1.set(Calendar.YEAR, 2009); + cal1.set(Calendar.HOUR, 8); + + DateFormat timeFormat = DateFormat.getTimeInstance(); + System.out.println("getMonths:: time for calendarFrom : " + + timeFormat.format(cal1.getTime())); + + Calendar cal2 = DateUtils.getDefaultCalendar(new Date()); + cal2.set(Calendar.DAY_OF_MONTH, 22); + cal2.set(Calendar.MONTH, 6); + cal2.set(Calendar.YEAR, 2009); + cal2.set(Calendar.HOUR, 4); + + System.out.println("getMonths:: time for calendarThru : " + + timeFormat.format(cal2.getTime())); + + PeriodDates period = new PeriodDates(cal1, cal2); + + List<Date> months = period.getMonths(); + 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); + Assert.assertEquals(i+2, month); // 2, 3, 4, 5, 6 + } + } + + /** + * Test of getFormatedMonths method, of class PeriodDates. + */ + //@Test + public void testGetFormatedMonths() { + System.out.println("getFormatedMonths"); + } + + /** + * Test of beforeEnd method, of class PeriodDates. + */ + //@Test + public void testBeforeEnd_Calendar() { + System.out.println("beforeEnd"); + } + + /** + * Test of afterEnd method, of class PeriodDates. + */ + //@Test + public void testAfterEnd_Calendar() { + System.out.println("afterEnd"); + } + + /** + * Test of afterBegin method, of class PeriodDates. + */ + //@Test + public void testAfterBegin_Calendar() { + System.out.println("afterBegin"); + } + + /** + * Test of between method, of class PeriodDates. + */ + //@Test + public void testBetween_Calendar() { + System.out.println("between"); + } + + /** + * Test of beforeEnd method, of class PeriodDates. + */ + //@Test + public void testBeforeEnd_Date() { + System.out.println("beforeEnd"); + } + + /** + * Test of afterEnd method, of class PeriodDates. + */ + //@Test + public void testAfterEnd_Date() { + System.out.println("afterEnd"); + } + + /** + * Test of afterBegin method, of class PeriodDates. + */ + //@Test + public void testAfterBegin_Date() { + System.out.println("afterBegin"); + } + + /** + * Test of between method, of class PeriodDates. + */ + //@Test + public void testBetween_Date() { + System.out.println("between"); + } + + /** + * Test of toString method, of class PeriodDates. + */ + //@Test + public void testToString() { + System.out.println("toString"); + } + +} \ No newline at end of file Property changes on: trunk/src/test/java/org/nuiton/util/PeriodDatesTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r1780 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 01 Mar '10

01 Mar '10

Author: fdesbois Date: 2010-03-01 14:20:13 +0100 (Mon, 01 Mar 2010) New Revision: 1780 Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java trunk/src/test/java/org/nuiton/util/DateUtilsTest.java Log: Ano #333 : Problem with equals in between method Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-02-26 18:40:50 UTC (rev 1779) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-03-01 13:20:13 UTC (rev 1780) @@ -25,6 +25,8 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.logging.Log; /** * Library for manipulating dates. @@ -79,8 +81,7 @@ /** * 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. - * + * 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 @@ -91,7 +92,7 @@ calendar.set(Calendar.YEAR, yy); calendar.set(Calendar.MONTH, mm-1); calendar.set(Calendar.DAY_OF_MONTH, dd); - return calendar.getTime(); + return setMinTimeOfDay(calendar.getTime()); } /** @@ -183,9 +184,10 @@ if (myDate == null) { return false; } - boolean result = true; - result &= myDate.after(beforeDate) || myDate.equals(beforeDate); - result &= afterDate == null || myDate.before(afterDate) || myDate.equals(afterDate); + boolean result = true; + result &= myDate.after(beforeDate) || myDate.compareTo(beforeDate) == 0; + result &= afterDate == null || myDate.before(afterDate) || + myDate.compareTo(afterDate) == 0; return result; } Modified: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-02-26 18:40:50 UTC (rev 1779) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2010-03-01 13:20:13 UTC (rev 1780) @@ -1,6 +1,7 @@ package org.nuiton.util; +import java.util.Calendar; import java.util.Date; import java.util.Locale; import junit.framework.Assert; @@ -54,9 +55,21 @@ /** * Test of createDate method, of class DateUtils. */ - //@Test + @Test public void testCreateDate() { System.out.println("createDate"); + + Date newdate = DateUtils.createDate(3, 3, 2009); + Calendar calendar = DateUtils.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)); } /** @@ -86,9 +99,42 @@ /** * Test of between method, of class DateUtils. */ - //@Test + @Test public void testBetween() { System.out.println("between"); + + Date middle = DateUtils.createDate(3, 3, 2009); + + // middle = begin, and end = null + Date begin = DateUtils.createDate(3, 3, 2009); + Date end = null; + + boolean result = DateUtils.between(middle, begin, end); + Assert.assertTrue(result); + + // middle between the period : march 2009 + PeriodDates period = new PeriodDates(begin, begin); + period.initDayOfMonthExtremities(); + + System.out.println("period : " + period); + + result = DateUtils.between(middle, period.getFromDate(), period.getThruDate()); + Assert.assertTrue(result); + + // middle = period begin + middle = DateUtils.setFirstDayOfMonth(middle); + result = DateUtils.between(middle, period.getFromDate(), period.getThruDate()); + Assert.assertTrue(result); + + // test with different implementation of Date + java.sql.Timestamp middle2 = new java.sql.Timestamp(middle.getTime()); + result = DateUtils.between(middle2, period.getFromDate(), period.getThruDate()); + Assert.assertTrue(result); + + // middle before begin + middle = DateUtils.createDate(2, 2, 2009); + result = DateUtils.between(middle, period.getFromDate(), period.getThruDate()); + Assert.assertFalse(result); } /**

1 0

r1779 - in trunk/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util
by tchemit＠users.nuiton.org 26 Feb '10

26 Feb '10

Author: tchemit Date: 2010-02-26 19:40:50 +0100 (Fri, 26 Feb 2010) New Revision: 1779 Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java trunk/src/main/java/org/nuiton/util/beans/BinderModel.java trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java trunk/src/test/java/org/nuiton/util/VersionConverterTest.java Log: - can bind a subset of the binder model - search property deeply (in super classes and interfaces) - add clear method on binderProvider - add some constructors to make easier the usage of BinderBuilder for simple cases - remove IDE headers Modified: trunk/src/main/java/org/nuiton/util/beans/Binder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-02-26 17:11:54 UTC (rev 1778) +++ trunk/src/main/java/org/nuiton/util/beans/Binder.java 2010-02-26 18:40:50 UTC (rev 1779) @@ -35,9 +35,9 @@ * It is based on a {@link BinderModel} which contains the mapping of properties * to transfert from the source object to the destination object. * - * Use the method {@link #copy(Object, Object)} to transfert properties. + * Use the method {@link #copy(Object, Object,String...)} to transfert properties. * - * Use the method {@link #obtainProperties(Object)} to obtain + * Use the method {@link #obtainProperties(Object,String...)} to obtain * * @author tchemit < chemit(a)codelutin.com > * @param the source bean type @@ -65,17 +65,22 @@ * Note: If a property's value is null, it will not be injected in * the result. * - * @param source the bean to read + * @param source the bean to read + * @param propertyNames subset of properties to load * @return the map of properties obtained indexed by their property name, * or an empty map is the given {@code from} is {@code null}. */ - public Map<String, Object> obtainProperties(I source) { + public Map<String, Object> obtainProperties(I source, + String... propertyNames) { if (source == null) { // special limit case return java.util.Collections.emptyMap(); } + + propertyNames = getProperties(propertyNames); + Map<String, Object> result = new TreeMap<String, Object>(); - for (String sourceProperty : model.getSourceDescriptors()) { + for (String sourceProperty : propertyNames) { try { Object read; @@ -88,7 +93,7 @@ if (readMethod.getReturnType().isPrimitive() && ObjectUtil.getNullValue( readMethod.getReturnType()).equals(read)) { - // for primitive type case, force nullity + // for primitive type case, force nullity read = null; } if (read != null) { @@ -110,16 +115,23 @@ * Note: If {@code from} object is null, then {@code null} values * will be set to mapped properties into {@code dst} * - * @param source the bean to read - * @param target the bean to write + * @param source the bean to read + * @param target the bean to write + * @param propertyNames optional subset of properties to copy (if none is + * specifed, will use all the properties defined in + * binder) * @throws NullPointerException if target parameter is {@code null} */ - public void copy(I source, O target) throws NullPointerException { + public void copy(I source, O target, String... propertyNames) + throws NullPointerException { if (target == null) { throw new NullPointerException("parameter 'target' can no be null"); } - for (String sourceProperty : model.getSourceDescriptors()) { + propertyNames = getProperties(propertyNames); + + for (String sourceProperty : propertyNames) { + String targetProperty = model.getTargetProperty(sourceProperty); try { @@ -148,6 +160,33 @@ } /** + * Obtain the properties, if none is given in {@code propertyNames} + * parameter, will use all property names defined in binder's model, + * otherwise, check that all given property names are safe (registred in + * binder's model). + * + * @param propertyNames optional subset of properties to get + * @return the array of property names + */ + protected String[] getProperties(String... propertyNames) { + + if (propertyNames.length == 0) { + // use all properties in the binder + propertyNames = model.getSourceDescriptors(); + } else { + + // use a subset of properties, must check them + for (String propertyName : propertyNames) { + if (!model.containsSourceProperty(propertyName)) { + throw new IllegalArgumentException("property '" + + propertyName + "' is not known by binder"); + } + } + } + return propertyNames; + } + + /** * Get the model of the binder. * * @return the model of the binder Modified: trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java 2010-02-26 17:11:54 UTC (rev 1778) +++ trunk/src/main/java/org/nuiton/util/beans/BinderBuilder.java 2010-02-26 18:40:50 UTC (rev 1779) @@ -43,11 +43,44 @@ * current model used to build the binder */ protected BinderModel<?, ?> model; + /** + * source properties descriptors + */ protected Map<String, PropertyDescriptor> sourceDescriptors; + /** + * target properties descriptors + */ protected Map<String, PropertyDescriptor> targetDescriptors; + public BinderBuilder() { + } /** + * Creates a mirrored binder for the given {@code type} and add the given + * simple properties. + * + * @param type the type of mirrored binder + * @param properties simple properties to add + */ + public BinderBuilder(Class<?> type, String... properties) { + createBinderModel(type); + addSimpleProperties(properties); + } + + /** + * Creates a binder for the given types and add the given simple properties. + * + * @param sourceType type of the source of the binder + * @param targetType type of the target of the binder + * @param properties simple properties to add + */ + public BinderBuilder(Class<?> sourceType, Class<?> targetType, + String... properties) { + createBinderModel(sourceType, targetType); + addSimpleProperties(properties); + } + + /** * Creates a new binder model for a mirrored binder (source type = target * type). * @@ -98,33 +131,36 @@ // init model model = new BinderModel(sourceType, targetType); - // obtain src descriptors - try { - sourceDescriptors = new TreeMap<String, PropertyDescriptor>(); + // obtain source descriptors + sourceDescriptors = new TreeMap<String, PropertyDescriptor>(); + loadDescriptors(model.getSourceType(), sourceDescriptors); - BeanInfo beanInfo = Introspector.getBeanInfo(model.getSourceType()); - for (PropertyDescriptor descriptor : - beanInfo.getPropertyDescriptors()) { - sourceDescriptors.put(descriptor.getName(), descriptor); - } - } catch (IntrospectionException e) { - throw new RuntimeException("Could not obtain bean properties " + - "descriptors for source type " + sourceType, e); - } - // obtain dst descriptors - try { - targetDescriptors = new TreeMap<String, PropertyDescriptor>(); +// try { +// +// BeanInfo beanInfo = Introspector.getBeanInfo(model.getSourceType()); +// for (PropertyDescriptor descriptor : +// beanInfo.getPropertyDescriptors()) { +// sourceDescriptors.put(descriptor.getName(), descriptor); +// } +// } catch (IntrospectionException e) { +// throw new RuntimeException("Could not obtain bean properties " + +// "descriptors for source type " + sourceType, e); +// } + // obtain target descriptors + targetDescriptors = new TreeMap<String, PropertyDescriptor>(); + loadDescriptors(model.getTargetType(), targetDescriptors); +// try { +// +// BeanInfo beanInfo = Introspector.getBeanInfo(model.getTargetType()); +// for (PropertyDescriptor descriptor : +// beanInfo.getPropertyDescriptors()) { +// targetDescriptors.put(descriptor.getName(), descriptor); +// } +// } catch (IntrospectionException e) { +// throw new RuntimeException("Could not obtain bean properties " + +// "descriptors for target type " + targetType, e); +// } - BeanInfo beanInfo = Introspector.getBeanInfo(model.getTargetType()); - for (PropertyDescriptor descriptor : - beanInfo.getPropertyDescriptors()) { - targetDescriptors.put(descriptor.getName(), descriptor); - } - } catch (IntrospectionException e) { - throw new RuntimeException("Could not obtain bean properties " + - "descriptors for target type " + targetType, e); - } - return this; } @@ -285,7 +321,6 @@ return this; } - protected void addProperty0(String sourceProperty, String targetProperty) { // check srcProperty does not exist @@ -344,6 +379,7 @@ model.addBinding(sourceDescriptor, targetDescriptor); } + protected void checkModelExists() throws IllegalStateException { if (model == null) { throw new IllegalStateException("there is not model, must " + @@ -354,4 +390,30 @@ protected BinderModel<?, ?> getModel() { return model; } + + protected static void loadDescriptors( + Class<?> type, + Map<String, PropertyDescriptor> descriptors) { + try { + + BeanInfo beanInfo = Introspector.getBeanInfo(type); + for (PropertyDescriptor descriptor : + beanInfo.getPropertyDescriptors()) { + if (!descriptors.containsKey(descriptor.getName())) { + descriptors.put(descriptor.getName(), descriptor); + } + } + } catch (IntrospectionException e) { + throw new RuntimeException("Could not obtain bean properties " + + "descriptors for source type " + type, e); + } + Class<?>[] interfaces = type.getInterfaces(); + for (Class<?> i : interfaces) { + loadDescriptors(i, descriptors); + } + Class<?> superClass = type.getSuperclass(); + if (superClass != null && superClass != Object.class) { + loadDescriptors(superClass, descriptors); + } + } } \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/util/beans/BinderModel.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BinderModel.java 2010-02-26 17:11:54 UTC (rev 1778) +++ trunk/src/main/java/org/nuiton/util/beans/BinderModel.java 2010-02-26 18:40:50 UTC (rev 1779) @@ -28,6 +28,8 @@ /** * Model of a {@link Binder}. * + * TODO-TC20100225 should have special cases for collections treatment. + * * @author tchemit < chemit(a)codelutin.com > * @param <S> the source type * @param <T> the target type Modified: trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java =================================================================== --- trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java 2010-02-26 17:11:54 UTC (rev 1778) +++ trunk/src/main/java/org/nuiton/util/beans/BinderProvider.java 2010-02-26 18:40:50 UTC (rev 1779) @@ -253,6 +253,13 @@ return binders; } + public static void clear() { + if (binders!=null) { + binders.clear(); + binders = null; + } + } + /** * Definition of an binder entry (source and target types + context name). * Modified: trunk/src/test/java/org/nuiton/util/VersionConverterTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/VersionConverterTest.java 2010-02-26 17:11:54 UTC (rev 1778) +++ trunk/src/test/java/org/nuiton/util/VersionConverterTest.java 2010-02-26 18:40:50 UTC (rev 1779) @@ -16,10 +16,7 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ + package org.nuiton.util; import org.junit.After;

1 0

r1778 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 26 Feb '10

26 Feb '10

Author: fdesbois Date: 2010-02-26 18:11:54 +0100 (Fri, 26 Feb 2010) New Revision: 1778 Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java Log: Remove duplicated methods + refactor strange method name Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-02-26 16:28:09 UTC (rev 1777) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-02-26 17:11:54 UTC (rev 1778) @@ -274,61 +274,17 @@ /** * Get the date before today (so yesterday no ?) + * * @param date concerned * @return Date before today */ - public static Date getLastDayDate(Date date) { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); + public static Date getYesterday(Date date) { + Calendar cal = getDefaultCalendar(date); cal.roll(Calendar.DAY_OF_MONTH, false); - return cal.getTime(); } /** - * Get the first day of the current month - * @param date concerned - * @return Date of first day of current month - */ - public static Date getBeginMonthDate(Date date) { - Calendar cal = Calendar.getInstance(); - cal.setTime(date); - cal.set(Calendar.DAY_OF_MONTH, 1); - - return cal.getTime(); - } - - /** - * Get the begin date of the day - * @param date concerned - * @return Date of the begin of the day - */ - public static Date getBeginOfDayDate(Date date) { - Calendar calBegin = Calendar.getInstance(); - calBegin.setTime(date); - calBegin.set(Calendar.HOUR, 0); - calBegin.set(Calendar.MINUTE, 0); - calBegin.set(Calendar.SECOND, 0); - - return calBegin.getTime(); - } - - /** - * Get the end date of the day - * @param date concerned - * @return Date of the end of the day - */ - public static Date getEndOfDayDate(Date date) { - Calendar calEnd = Calendar.getInstance(); - calEnd.setTime(date); - calEnd.set(Calendar.HOUR, 23); - calEnd.set(Calendar.MINUTE, 59); - calEnd.set(Calendar.SECOND, 59); - - return calEnd.getTime(); - } - - /** * Get the calendar corresponding to the {@code date}. The default calendar * will be returned (default time zone and locale). *

1 0

r1777 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by sletellier＠users.nuiton.org 26 Feb '10

26 Feb '10

Author: sletellier Date: 2010-02-26 17:28:09 +0100 (Fri, 26 Feb 2010) New Revision: 1777 Modified: trunk/src/main/java/org/nuiton/util/StringUtil.java trunk/src/test/java/org/nuiton/util/StringUtilTest.java Log: Adding method to encode to MD5 Modified: trunk/src/main/java/org/nuiton/util/StringUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/StringUtil.java 2010-02-26 15:33:18 UTC (rev 1776) +++ trunk/src/main/java/org/nuiton/util/StringUtil.java 2010-02-26 16:28:09 UTC (rev 1777) @@ -30,6 +30,8 @@ import java.awt.Color; import java.lang.reflect.Field; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.text.DateFormat; import java.text.MessageFormat; import java.text.ParseException; @@ -573,4 +575,30 @@ return result; } + /** + * Convert a String to MD5 + * + * @param toEncode string concerned + * @return md5 corresponding + */ + public static String encodeMD5(String toEncode) throws NoSuchAlgorithmException { + + byte[] uniqueKey = toEncode.getBytes(); + byte[] hash = null; + + // on récupère un objet qui permettra de crypter la chaine + hash = MessageDigest.getInstance("MD5").digest(uniqueKey); + + StringBuffer hashString = new StringBuffer(); + for (int i = 0; i < hash.length; ++i) { + String hex = Integer.toHexString(hash[i]); + if (hex.length() == 1) { + hashString.append("0"); + hashString.append(hex.charAt(hex.length() - 1)); + } else { + hashString.append(hex.substring(hex.length() - 2)); + } + } + return hashString.toString(); + } } Modified: trunk/src/test/java/org/nuiton/util/StringUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/StringUtilTest.java 2010-02-26 15:33:18 UTC (rev 1776) +++ trunk/src/test/java/org/nuiton/util/StringUtilTest.java 2010-02-26 16:28:09 UTC (rev 1777) @@ -179,5 +179,9 @@ } + @Test + public void testEncodeMD5() throws Exception { + assertEquals("9c4fddff843d03cefe44421acf22c6ec", StringUtil.encodeMD5("natcho")); + } } // StringUtilTest

1 0

r1776 - trunk/src/main/java/org/nuiton/util
by sletellier＠users.nuiton.org 26 Feb '10

26 Feb '10

Author: sletellier Date: 2010-02-26 16:33:18 +0100 (Fri, 26 Feb 2010) New Revision: 1776 Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java Log: Adding usefull method for date manipulations Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-02-26 13:12:42 UTC (rev 1775) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2010-02-26 15:33:18 UTC (rev 1776) @@ -273,6 +273,62 @@ } /** + * Get the date before today (so yesterday no ?) + * @param date concerned + * @return Date before today + */ + public static Date getLastDayDate(Date date) { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.roll(Calendar.DAY_OF_MONTH, false); + + return cal.getTime(); + } + + /** + * Get the first day of the current month + * @param date concerned + * @return Date of first day of current month + */ + public static Date getBeginMonthDate(Date date) { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.set(Calendar.DAY_OF_MONTH, 1); + + return cal.getTime(); + } + + /** + * Get the begin date of the day + * @param date concerned + * @return Date of the begin of the day + */ + public static Date getBeginOfDayDate(Date date) { + Calendar calBegin = Calendar.getInstance(); + calBegin.setTime(date); + calBegin.set(Calendar.HOUR, 0); + calBegin.set(Calendar.MINUTE, 0); + calBegin.set(Calendar.SECOND, 0); + + return calBegin.getTime(); + } + + /** + * Get the end date of the day + * @param date concerned + * @return Date of the end of the day + */ + public static Date getEndOfDayDate(Date date) { + Calendar calEnd = Calendar.getInstance(); + calEnd.setTime(date); + calEnd.set(Calendar.HOUR, 23); + calEnd.set(Calendar.MINUTE, 59); + calEnd.set(Calendar.SECOND, 59); + + return calEnd.getTime(); + } + + /** * Get the calendar corresponding to the {@code date}. The default calendar * will be returned (default time zone and locale). * @@ -284,5 +340,4 @@ calendar.setTime(date); return calendar; } - }

1 0