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

r1706 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 16 Dec '09

16 Dec '09

Author: fdesbois Date: 2009-12-16 14:37:54 +0100 (Wed, 16 Dec 2009) New Revision: 1706 Modified: trunk/src/main/java/org/nuiton/util/Resource.java Log: Deprecation of getConfigProperties methods -> Prefer using ApplicationConfig class Modified: trunk/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/src/main/java/org/nuiton/util/Resource.java 2009-12-16 13:28:04 UTC (rev 1705) +++ trunk/src/main/java/org/nuiton/util/Resource.java 2009-12-16 13:37:54 UTC (rev 1706) @@ -174,7 +174,12 @@ * @param filename le nom du fichier à rechercher * @return l'objet Properties de configuration * @throws IOException si une erreur est survenue + * @deprecated since 1.1.2, use {@link org.nuiton.util.ApplicationConfig} class instead + * to {@link org.nuiton.util.ApplicationConfig#setConfigFileName(java.lang.String) } + * and search properties file from more folders with + * {@link org.nuiton.util.ApplicationConfig#parse(java.lang.String[]) } method */ + @Deprecated static public Properties getConfigProperties(String filename) throws IOException { Properties result; @@ -192,7 +197,12 @@ * @param parent les proprietes parent a surcharger * @return l'objet Properties de configuration * @throws IOException si une erreur est survenue + * @deprecated since 1.1.2, use {@link org.nuiton.util.ApplicationConfig} class instead + * to {@link org.nuiton.util.ApplicationConfig#setConfigFileName(java.lang.String) } + * and search properties file from more folders with + * {@link org.nuiton.util.ApplicationConfig#parse(java.lang.String[]) } method */ + @Deprecated static public Properties getConfigProperties(String filename, Properties parent) throws IOException { Properties result;

1 0

r1705 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 16 Dec '09

16 Dec '09

Author: fdesbois Date: 2009-12-16 14:28:04 +0100 (Wed, 16 Dec 2009) New Revision: 1705 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: Improve javadoc Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-16 13:22:57 UTC (rev 1704) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-16 13:28:04 UTC (rev 1705) @@ -749,6 +749,7 @@ /** * Get all options from configuration. + * * @return Properties which contains all options */ public Properties getOptions() { @@ -758,6 +759,7 @@ /** * Set manually options when you don't want to use parse method to check * properties file configured by setConfigFileName. + * * @param options Properties which contains all options to set */ public void setOptions(Properties options) {

1 0

r1704 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 16 Dec '09

16 Dec '09

Author: fdesbois Date: 2009-12-16 14:22:57 +0100 (Wed, 16 Dec 2009) New Revision: 1704 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java Log: - Add methods to get and set directly all options. - Change userHome configuration path to : $HOME/.local/[filename] - Improve call to getResource method from class to search in root path directory (and not ApplicationConfig package) Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-16 10:26:59 UTC (rev 1703) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2009-12-16 13:22:57 UTC (rev 1704) @@ -274,7 +274,10 @@ /** file /etc/[filename] */ String systemPath = File.separator + "etc" + File.separator; /** file $user.home/.[filename] */ - String userPath = getUserHome() + File.separator + "."; + //String userPath = getUserHome() + File.separator + "."; + /** file $user.home/.local/[filename] */ + String userPath = getUserHome() + File.separator + ".local" + + /*File.separator + "share" + File.separator + "applications" + */File.separator; /** vrai si on est en train de parser les options de la ligne de commande */ protected boolean inParseOptionPhase = false; protected Properties defaults = new Properties(); @@ -745,6 +748,23 @@ } /** + * Get all options from configuration. + * @return Properties which contains all options + */ + public Properties getOptions() { + return this.options; + } + + /** + * Set manually options when you don't want to use parse method to check + * properties file configured by setConfigFileName. + * @param options Properties which contains all options to set + */ + public void setOptions(Properties options) { + this.options = options; + } + + /** * Get all set method on this object or super object * * @return map with method name without set and in lower case as key, and @@ -930,7 +950,7 @@ String filename = getConfigFileName(); URL inClasspath = ClassLoader.getSystemClassLoader().getResource(filename); if (inClasspath == null) { - inClasspath = ApplicationConfig.class.getResource(filename); + inClasspath = ApplicationConfig.class.getResource("/" + filename); } if (inClasspath != null) { log.info("Chargement du fichier de config: " + inClasspath);

1 0

r1703 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 16 Dec '09

16 Dec '09

Author: fdesbois Date: 2009-12-16 11:26:59 +0100 (Wed, 16 Dec 2009) New Revision: 1703 Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java Log: Add javadoc Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2009-12-15 16:06:44 UTC (rev 1702) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2009-12-16 10:26:59 UTC (rev 1703) @@ -19,8 +19,6 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* */ - - import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -30,6 +28,8 @@ /** * DateUtils.java * + * Library for manipulating dates. + * * @author fdesbois * @version $Revision: 87 $ * @@ -37,34 +37,60 @@ * by : $Author: fdesbois $ */ public class DateUtils { - - //private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); public static final String DEFAULT_PATTERN = "dd/MM/yyyy"; public static final String MONTH_PATTERN = "MM/yyyy"; - public static String formatDate(Date date, String pattern) - { + /** + * 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 java.text.DateFormat + */ + public static String formatDate(Date date, String pattern) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern); return simpleDateFormat.format(date); } - public static Date parseDate(String date, String pattern) { + /** + * 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 java.text.DateFormat + */ + public static Date parseDate(String date, String pattern) throws ParseException { SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern); - Date result = null; - try { - result = simpleDateFormat.parse(date); - } catch (ParseException eee) { - } + 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 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 = new GregorianCalendar(yy,mm-1,dd); return 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 = new GregorianCalendar(); calendar.setTime(new Date()); @@ -74,6 +100,12 @@ 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 = new GregorianCalendar(); calendar.setTime(date); @@ -82,6 +114,11 @@ 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 = new GregorianCalendar(); calendar.setTime(date); @@ -89,6 +126,14 @@ 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; @@ -99,16 +144,36 @@ 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 either + * @see #between(java.util.Date, java.util.Date, java.util.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 = new GregorianCalendar(); calendar.setTime(date); return calendar.get(Calendar.MONTH); } + /** + * 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();

1 0

r1702 - trunk
by fdesbois＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: fdesbois Date: 2009-12-15 17:06:44 +0100 (Tue, 15 Dec 2009) New Revision: 1702 Modified: trunk/pom.xml Log: Switch to last mavenpom version 1.1.1 + refactor name Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-15 16:00:48 UTC (rev 1701) +++ trunk/pom.xml 2009-12-15 16:06:44 UTC (rev 1702) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.1</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -77,7 +77,7 @@   - <name>Nuiton utilities library</name> + <name>Nuiton Utils</name> <description>Library of usefull class to be used in any project.</description> <inceptionYear>2004</inceptionYear> <url>http://maven-site.nuiton.org/nuiton-utils</url>

1 0

r1701 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by fdesbois＠users.nuiton.org 15 Dec '09

15 Dec '09

Author: fdesbois Date: 2009-12-15 17:00:48 +0100 (Tue, 15 Dec 2009) New Revision: 1701 Added: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java Log: Add method to give difference in days between two dates Modified: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java 2009-12-14 16:02:55 UTC (rev 1700) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2009-12-15 16:00:48 UTC (rev 1701) @@ -108,4 +108,11 @@ calendar.setTime(date); return calendar.get(Calendar.MONTH); } + + 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)); + } } Added: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/DateUtilsTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/util/DateUtilsTest.java 2009-12-15 16:00:48 UTC (rev 1701) @@ -0,0 +1,126 @@ + +package org.nuiton.util; + +import java.util.Date; +import junit.framework.Assert; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * @author fdesbois + */ +public class DateUtilsTest { + + public DateUtilsTest() { + } + + @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() { + System.out.println("formatDate"); + } + + /** + * Test of parseDate method, of class DateUtils. + */ + //@Test + public void testParseDate() { + System.out.println("parseDate"); + } + + /** + * Test of createDate method, of class DateUtils. + */ + //@Test + public void testCreateDate() { + System.out.println("createDate"); + } + + /** + * Test of createDateAfterToday method, of class DateUtils. + */ + //@Test + public void testCreateDateAfterToday() { + System.out.println("createDateAfterToday"); + } + + /** + * Test of setLastDayOfMonth method, of class DateUtils. + */ + //@Test + public void testSetLastDayOfMonth() { + System.out.println("setLastDayOfMonth"); + } + + /** + * Test of setFirstDayOfMonth method, of class DateUtils. + */ + //@Test + public void testSetFirstDayOfMonth() { + System.out.println("setFirstDayOfMonth"); + } + + /** + * Test of between method, of class DateUtils. + */ + //@Test + public void testBetween() { + System.out.println("between"); + } + + /** + * Test of currentPeriod method, of class DateUtils. + */ + //@Test + public void testCurrentPeriod() { + System.out.println("currentPeriod"); + } + + /** + * Test of getMonth method, of class DateUtils. + */ + //@Test + public void testGetMonth() { + System.out.println("getMonth"); + } + + @Test + public void testGetDifferenceInDays() { + System.out.println("getDifferenceInDays"); + + Date beginDate = DateUtils.createDate(3, 2, 2009); + Date endDate = DateUtils.createDate(8, 2, 2009); + + int result = DateUtils.getDifferenceInDays(beginDate, endDate); + Assert.assertEquals(5, result); + + beginDate = DateUtils.createDate(28, 1, 2009); + endDate = DateUtils.createDate(8, 2, 2009); + + result = DateUtils.getDifferenceInDays(beginDate, endDate); + Assert.assertEquals(11, result); + } + +} \ No newline at end of file Property changes on: trunk/src/test/java/org/nuiton/util/DateUtilsTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r1700 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 14 Dec '09

14 Dec '09

Author: echatellier Date: 2009-12-14 17:02:55 +0100 (Mon, 14 Dec 2009) New Revision: 1700 Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java Log: Add @since in javadoc Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2009-12-07 14:22:14 UTC (rev 1699) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2009-12-14 16:02:55 UTC (rev 1700) @@ -948,6 +948,7 @@ * @param cb nio buffer * @return matching lines (or {code null} if no matching lines) * @throws IOException + * @since 1.1.2 */ protected static List<CharSequence> grep(String regex, CharBuffer cb) { @@ -996,6 +997,7 @@ * @param encoding encoding to use * @return matching lines (or {code null} if no matching lines) * @throws IOException + * @since 1.1.2 */ public static List<CharSequence> grep(String searchRegex, File f, String encoding) throws IOException { @@ -1030,6 +1032,7 @@ * @param encoding encoding to use * @return all matching lines for each files * @throws IOException + * @since 1.1.2 */ public static Map<File, List<CharSequence>> grep(String searchRegex, File rootDirectory, String fileRegex, String encoding) throws IOException { Map<File, List<CharSequence>> results = new HashMap<File, List<CharSequence>>(); @@ -1051,6 +1054,7 @@ * @param encoding encoding to use * @return all matching lines for each files * @throws IOException + * @since 1.1.2 */ public static Map<File, List<CharSequence>> grep(String searchRegex, String fileRegex, String encoding) throws IOException { Map<File, List<CharSequence>> results = grep(searchRegex, new File("."), fileRegex, encoding); @@ -1067,6 +1071,7 @@ * @param file File which sed shall be applied * @param encoding charset encoding * @throws IOException + * @since 1.1.2 */ public static void sed(String searchRegex, String replace, File file, String encoding) throws IOException { @@ -1105,6 +1110,7 @@ * @param fileRegex regex for file to find in {@code rootDirectory} * @param encoding encoding to use * @throws IOException + * @since 1.1.2 */ public static void sed(String searchRegex, String replace, File rootDirectory, String fileRegex, String encoding) throws IOException { List<File> files = FileUtil.find(rootDirectory, fileRegex, true);

1 0

r1699 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org 07 Dec '09

07 Dec '09

Author: fdesbois Date: 2009-12-07 15:22:14 +0100 (Mon, 07 Dec 2009) New Revision: 1699 Added: trunk/src/main/java/org/nuiton/util/DateUtils.java trunk/src/main/java/org/nuiton/util/PeriodDates.java Log: Add some Date utils Added: trunk/src/main/java/org/nuiton/util/DateUtils.java =================================================================== --- trunk/src/main/java/org/nuiton/util/DateUtils.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/DateUtils.java 2009-12-07 14:22:14 UTC (rev 1699) @@ -0,0 +1,111 @@ +package org.nuiton.util; + +/** + * *##% Chorem-Commons + * Copyright (C) 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* + */ + + + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; + +/** + * DateUtils.java + * + * @author fdesbois + * @version $Revision: 87 $ + * + * Last update: $Date: 2009-12-01 14:26:40 +0100 (Tue, 01 Dec 2009) $ + * by : $Author: fdesbois $ + */ +public class DateUtils { + + //private static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); + + public static final String DEFAULT_PATTERN = "dd/MM/yyyy"; + + public static final String MONTH_PATTERN = "MM/yyyy"; + + public static String formatDate(Date date, String pattern) + { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern); + return simpleDateFormat.format(date); + } + + public static Date parseDate(String date, String pattern) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern); + Date result = null; + try { + result = simpleDateFormat.parse(date); + } catch (ParseException eee) { + } + return result; + } + + public static Date createDate(int dd, int mm, int yy) { + Calendar calendar = new GregorianCalendar(yy,mm-1,dd); + return calendar.getTime(); + } + + public static Date createDateAfterToday(int ddStep, int mmStep, int yyStep) { + Calendar calendar = new GregorianCalendar(); + calendar.setTime(new Date()); + calendar.add(Calendar.DAY_OF_MONTH, ddStep); + calendar.add(Calendar.MONTH,mmStep); + calendar.add(Calendar.YEAR, yyStep); + return calendar.getTime(); + } + + public static Date setLastDayOfMonth(Date date) { + Calendar calendar = new GregorianCalendar(); + calendar.setTime(date); + int maximum = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); + calendar.set(Calendar.DAY_OF_MONTH, maximum); + return calendar.getTime(); + } + + public static Date setFirstDayOfMonth(Date date) { + Calendar calendar = new GregorianCalendar(); + calendar.setTime(date); + calendar.set(Calendar.DAY_OF_MONTH, 1); + return calendar.getTime(); + } + + public static boolean between(Date myDate, Date beforeDate, Date afterDate) { + if (myDate == null) { + return false; + } + boolean result = true; + result &= myDate.after(beforeDate) || myDate.equals(beforeDate); + result &= afterDate == null || myDate.before(afterDate) || myDate.equals(afterDate); + return result; + } + + public static boolean currentPeriod(Date beforeDate, Date afterDate) { + return between(new Date(), beforeDate, afterDate); + } + + public static int getMonth(Date date) { + Calendar calendar = new GregorianCalendar(); + calendar.setTime(date); + return calendar.get(Calendar.MONTH); + } +} Added: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2009-12-07 14:22:14 UTC (rev 1699) @@ -0,0 +1,214 @@ +package org.nuiton.util; + +/** + * *##% Chorem-Commons + * Copyright (C) 2009 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. ##%* + */ + + + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * PeriodDates.java + * + * Created on 2009-08-13 + * + * @author fdesbois + * @version $Revision: 98 $ + * + * Last update: $Date: 2009-12-04 01:28:16 +0100 (Fri, 04 Dec 2009) $ + * by : $Author: fdesbois $ + */ +public class PeriodDates { + + private static final Log log = LogFactory.getLog(PeriodDates.class); + + private String pattern; + + private Date fromDate; + + private Calendar fromCalendar; + + private Date thruDate; + + private Calendar thruCalendar; + + public PeriodDates() { + } + + public PeriodDates(Date fromDate, Date thruDate) { + this.fromCalendar = new GregorianCalendar(); + setFromDate(fromDate); + + this.thruCalendar = new GregorianCalendar(); + setThruDate(thruDate); + + this.pattern = DateUtils.DEFAULT_PATTERN; + } + + public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) { + this.fromDate = fromCalendar.getTime(); + this.fromCalendar = fromCalendar; + + this.thruDate = thruCalendar.getTime(); + this.thruCalendar = thruCalendar; + + this.pattern = DateUtils.DEFAULT_PATTERN; + } + + public static PeriodDates createMonthsPeriodFromToday(int monthAfter) { + Calendar calendarFrom = new GregorianCalendar(); + Calendar calendarThru = new GregorianCalendar(); + + calendarFrom.set(Calendar.DAY_OF_MONTH, 1); + calendarFrom.set(Calendar.AM_PM, Calendar.AM); + calendarFrom.set(Calendar.HOUR, 0); + calendarFrom.set(Calendar.MINUTE, 0); + calendarFrom.set(Calendar.SECOND, 0); + calendarFrom.set(Calendar.MILLISECOND, 0); + + calendarThru.setTime(calendarFrom.getTime()); + calendarThru.add(Calendar.MONTH, monthAfter); + int maximum = calendarThru.getActualMaximum(Calendar.DAY_OF_MONTH); + calendarThru.set(Calendar.DAY_OF_MONTH, maximum); + + PeriodDates period = new PeriodDates(calendarFrom, calendarThru); + period.setPattern(DateUtils.MONTH_PATTERN); + return period; + } + + public String getPattern() { + return pattern; + } + + public void setPattern(String pattern) { + this.pattern = pattern; + } + + public void setFromDate(Date fromDate) { + this.fromDate = fromDate; + if (fromDate != null) { + if (fromCalendar == null) { + fromCalendar = new GregorianCalendar(); + } + this.fromCalendar.setTime(fromDate); + } else { + this.fromCalendar = null; + } + } + + public Date getFromDate() { + return this.fromDate; + } + + public int getFromMonth() { + return this.fromCalendar.get(Calendar.MONTH); + } + + public void setThruDate(Date thruDate) { + this.thruDate = thruDate; + if (thruDate != null) { + if (thruCalendar == null) { + thruCalendar = new GregorianCalendar(); + } + this.thruCalendar.setTime(thruDate); + } else { + this.thruCalendar = null; + } + } + + public Date getThruDate() { + return this.thruDate; + } + + public List<Date> getMonths() { + List<Date> months = new ArrayList<Date>(); + if (fromCalendar == null || thruCalendar == null) { + return months; + } + + /*int mFrom = fromCalendar.get(Calendar.MONTH); + int mThru = thruCalendar.get(Calendar.MONTH); + int yFrom = fromCalendar.get(Calendar.YEAR); + int yThru = thruCalendar.get(Calendar.YEAR); + + int nbYears = yThru - yFrom; + int monthRatio = nbYears * 12; + + int y = yFrom; + for(int i = mFrom; i <= mThru + monthRatio; i++) { + Calendar result = new GregorianCalendar(y, i%12, 1); + months.add(result.getTime()); + if (i != 0 && i%11 == 0) { + y++; + } + }*/ + + Calendar current = (Calendar) fromCalendar.clone(); + current.set(Calendar.DAY_OF_MONTH, 1); + Calendar end = (Calendar) thruCalendar.clone(); + end.set(Calendar.DAY_OF_MONTH, 1); + while (!current.equals(end)) { + months.add(current.getTime()); + current.add(Calendar.MONTH, 1); + } + months.add(current.getTime()); + + return months; + } + + public List<String> getFormatedMonths() { + List<String> results = new ArrayList<String>(); + for (Date date : getMonths()) { + String str = DateUtils.formatDate(date, pattern); + results.add(str); + } + return results; + } + + public boolean beforeEnd(Calendar calendar) { + return calendar.before(thruCalendar) || calendar.equals(thruCalendar); + } + + public boolean afterEnd(Calendar calendar) { + return calendar.after(thruCalendar); + } + + public boolean afterBegin(Calendar calendar) { + return calendar.after(fromCalendar) || calendar.equals(fromCalendar); + } + + public boolean between(Calendar calendar) { + return beforeEnd(calendar) && afterBegin(calendar); + } + + + @Override + public String toString() { + String fromStr = DateUtils.formatDate(fromDate, pattern); + String thruStr = DateUtils.formatDate(thruDate, pattern); + return "[ " + fromDate + " (pattern: " + fromStr + ") -> " + thruDate + " (pattern: " + thruStr + ") ]"; + } + +}

1 0