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

r1745 - trunk
by fdesbois＠users.nuiton.org Jan. 15, 2010

Jan. 15, 2010

Author: fdesbois Date: 2010-01-15 17:44:39 +0100 (Fri, 15 Jan 2010) New Revision: 1745 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release nuiton-utils-1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 16:43:29 UTC (rev 1744) +++ trunk/pom.xml 2010-01-15 16:44:39 UTC (rev 1745) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> <dependencies> @@ -154,9 +154,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.3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.1.3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.…</url> </scm> <profiles>

1 0

r1744 - trunk
by fdesbois＠users.nuiton.org Jan. 15, 2010

Jan. 15, 2010

Author: fdesbois Date: 2010-01-15 17:43:29 +0100 (Fri, 15 Jan 2010) New Revision: 1744 Modified: trunk/pom.xml Log: use last release of mavenpom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 13:43:17 UTC (rev 1743) +++ trunk/pom.xml 2010-01-15 16:43:29 UTC (rev 1744) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0</version> </parent> <artifactId>nuiton-utils</artifactId>

1 0

r1743 - trunk/src/main/java/org/nuiton/util/war
by echatellier＠users.nuiton.org Jan. 15, 2010

Jan. 15, 2010

Author: echatellier Date: 2010-01-15 14:43:17 +0100 (Fri, 15 Jan 2010) New Revision: 1743 Modified: trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java Log: Remove unused imports Modified: trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java =================================================================== --- trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java 2010-01-15 12:16:40 UTC (rev 1742) +++ trunk/src/main/java/org/nuiton/util/war/JettyLauncher.java 2010-01-15 13:43:17 UTC (rev 1743) @@ -48,9 +48,6 @@ import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.webapp.WebAppContext; -import org.xml.sax.ContentHandler; -import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; /** * War main class launcher (jetty based).

1 0

r1742 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by echatellier＠users.nuiton.org Jan. 15, 2010

Jan. 15, 2010

Author: echatellier Date: 2010-01-15 13:16:40 +0100 (Fri, 15 Jan 2010) New Revision: 1742 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Log: Add a test on not found properties Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-15 12:07:48 UTC (rev 1741) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-15 12:16:40 UTC (rev 1742) @@ -600,6 +600,7 @@ * * @param option option to replace into * @return replaced option + * @since 1.1.3 */ protected String replaceRecursiveOptions(String option) { Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-01-15 12:07:48 UTC (rev 1741) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-01-15 12:16:40 UTC (rev 1742) @@ -252,5 +252,9 @@ instance.setOption("os", "${system}"); instance.setOption("sysinfo", "I'm running ${os} :)"); assertEquals("I'm running " + System.getProperty("os.name") + " :)", instance.getOption("sysinfo")); + + // test not found properties + instance.setOption("notexists", "Attention ${blah.bloh.bluh} :("); + assertEquals("Attention ${blah.bloh.bluh} :(", instance.getOption("notexists")); } }

1 0

r1741 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org Jan. 15, 2010

Jan. 15, 2010

Author: echatellier Date: 2010-01-15 13:07:48 +0100 (Fri, 15 Jan 2010) New Revision: 1741 Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java Log: Close channel before writing output file and make sure that channel and stream are closed. Modified: trunk/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-14 17:43:52 UTC (rev 1740) +++ trunk/src/main/java/org/nuiton/util/FileUtil.java 2010-01-15 12:07:48 UTC (rev 1741) @@ -1000,26 +1000,39 @@ * @since 1.1.2 */ public static List<CharSequence> grep(String searchRegex, File f, String encoding) throws IOException { - - // Open the file and then get a channel from the stream - FileInputStream fis = new FileInputStream(f); - FileChannel fc = fis.getChannel(); - // Get the file's size and then map it into memory - int sz = (int)fc.size(); - MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); + List<CharSequence> lines = null; - // Decode the file into a char buffer - Charset charset = Charset.forName(encoding); - CharsetDecoder decoder = charset.newDecoder(); - CharBuffer cb = decoder.decode(bb); + FileInputStream fis = null; + FileChannel fc = null; - // Perform the search - List<CharSequence> lines = grep(searchRegex, cb); + try { + // Open the file and then get a channel from the stream + fis = new FileInputStream(f); + fc = fis.getChannel(); - // Close the channel and the stream - fc.close(); - + // Get the file's size and then map it into memory + int sz = (int)fc.size(); + MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); + + // Decode the file into a char buffer + Charset charset = Charset.forName(encoding); + CharsetDecoder decoder = charset.newDecoder(); + CharBuffer cb = decoder.decode(bb); + + // Perform the search + lines = grep(searchRegex, cb); + } + finally { + // Close the channel and the stream + if (fc != null) { + fc.close(); + } + if (fis != null) { + fis.close(); + } + } + return lines; } @@ -1077,28 +1090,53 @@ Pattern pattern = Pattern.compile(searchRegex); - // Open the file and then get a channel from the stream - FileInputStream fis = new FileInputStream(file); - FileChannel fc = fis.getChannel(); + FileInputStream fis = null; + FileChannel fc = null; + String outString = null; + try { + // Open the file and then get a channel from the stream + fis = new FileInputStream(file); + fc = fis.getChannel(); - // Get the file's size and then map it into memory - int sz = (int)fc.size(); - MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); + // Get the file's size and then map it into memory + int sz = (int)fc.size(); + MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, sz); - // Decode the file into a char buffer - // Charset and decoder for encoding - Charset charset = Charset.forName(encoding); - CharsetDecoder decoder = charset.newDecoder(); - CharBuffer cb = decoder.decode(bb); + // Decode the file into a char buffer + // Charset and decoder for encoding + Charset charset = Charset.forName(encoding); + CharsetDecoder decoder = charset.newDecoder(); + CharBuffer cb = decoder.decode(bb); - Matcher matcher = pattern.matcher(cb); - String outString = matcher.replaceAll(replace); + Matcher matcher = pattern.matcher(cb); + outString = matcher.replaceAll(replace); + } + finally { + if (fc != null) { + fc.close(); + } + if (fis != null) { + fis.close(); + } + } - FileOutputStream fos = new FileOutputStream(file.getAbsolutePath()); - PrintStream ps = new PrintStream(fos); - ps.print(outString); - ps.close(); - fos.close(); + if (outString != null) { + FileOutputStream fos = null; + PrintStream ps = null; + try { + fos = new FileOutputStream(file.getAbsolutePath()); + ps = new PrintStream(fos); + ps.print(outString); + } + finally { + if (ps != null) { + ps.close(); + } + if (fos != null) { + fos.close(); + } + } + } } /** @@ -1127,6 +1165,7 @@ * @param fileRegex regex for file to find in current dir * @param encoding encoding to use * @throws IOException + * @since 1.1.2 */ public static void sed(String searchRegex, String replace, String fileRegex, String encoding) throws IOException { sed(searchRegex, replace, new File("."), fileRegex, encoding);

1 0

r1740 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util
by echatellier＠users.nuiton.org Jan. 14, 2010

Jan. 14, 2010

Author: echatellier Date: 2010-01-14 18:43:52 +0100 (Thu, 14 Jan 2010) New Revision: 1740 Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Log: Fix #157 : translate imbricated ${xxx} in properties value. Modified: trunk/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-14 16:16:12 UTC (rev 1739) +++ trunk/src/main/java/org/nuiton/util/ApplicationConfig.java 2010-01-14 17:43:52 UTC (rev 1740) @@ -564,7 +564,7 @@ } public String getConfigFileName() { - String result = options.getProperty(CONFIG_FILE_NAME); + String result = getOption(CONFIG_FILE_NAME); return result; } @@ -590,9 +590,55 @@ */ public String getOption(String key) { String value = options.getProperty(key); + // replace ${xxx} + value = replaceRecursiveOptions(value); return value; } + + /** + * Replace inlclude ${xxx} suboption by their values. + * + * @param option option to replace into + * @return replaced option + */ + protected String replaceRecursiveOptions(String option) { + // TODO do a common code with RecursiveProperties code + // TODO but can't overwrite getProperty() method + + String result = option; + + if (result == null) { + return null; + } + + //Ex : result="My name is ${myName}." + int pos = result.indexOf("${", 0); + //Ex : pos=11 + while (pos != -1) { + int posEnd = result.indexOf("}", pos + 1); + //Ex : posEnd=19 + if (posEnd != -1) { + String value = getOption(result.substring(pos + 2, posEnd)); + // Ex : getProperty("myName"); + if (value != null) { + // Ex : value="Thimel" + result = result.substring(0, pos) + value + result.substring(posEnd + 1); + // Ex : result="My name is " + "Thimel" + "." + pos = result.indexOf("${", pos + value.length()); + // Ex : pos=-1 + } else { + // Ex : value=null + pos = result.indexOf("${", posEnd + 1); + // Ex : pos=-1 + } + // Ex : pos=-1 + } + } + + return result; + } + /** * Permet de recuperer l'ensemble des options commencant par une certaine * chaine @@ -636,7 +682,7 @@ T result = null; String cacheKey = key + "-" + clazz.getName(); - String value = options.getProperty(key); + String value = getOption(key); int hash = 0; if (value != null) { hash = value.hashCode(); Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-01-14 16:16:12 UTC (rev 1739) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-01-14 17:43:52 UTC (rev 1740) @@ -1,4 +1,4 @@ -/** +/* * *##% Nuiton utilities library * Copyright (C) 2004 - 2009 CodeLutin * @@ -16,34 +16,19 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/* - * Copyright (C) 2002-2008 Code Lutin, Benjamin Poussin - * - * 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 2 - * 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 Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ package org.nuiton.util; +import java.io.File; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.ListIterator; import java.util.Map; + import junit.framework.TestCase; + import org.nuiton.util.ApplicationConfig.Action; /** @@ -244,4 +229,28 @@ assertEquals(1, dummyActionCall); } + /** + * Test that system properties such as ${user.home}, ${user.name} are + * replaced. + * @throws ArgumentsParserException + */ + public void testSystemProperties() throws ArgumentsParserException { + ApplicationConfig instance = new ApplicationConfig(); + instance.parse(new String[]{}); + instance.printConfig(); + + instance.setOption("hellomessage", "Hello ${user.name} !"); + + assertEquals("Hello " + System.getProperty("user.name") + " !", instance.getOption("hellomessage")); + assertEquals("Hello ${user.name} !", instance.options.getProperty("hellomessage")); + + instance.setOption("tempdir", "${java.io.tmpdir}" + File.separator + "blah"); + File tempDir = instance.getOptionAsFile("tempdir"); + assertEquals(System.getProperty("java.io.tmpdir") + File.separator + "blah", tempDir.getAbsolutePath()); + + instance.setOption("system", "${os.name}"); + instance.setOption("os", "${system}"); + instance.setOption("sysinfo", "I'm running ${os} :)"); + assertEquals("I'm running " + System.getProperty("os.name") + " :)", instance.getOption("sysinfo")); + } }

1 0

r1739 - in trunk/src: main/java/org/nuiton/util test/java/org/nuiton/util test/resources test/resources/org test/resources/org/nuiton test/resources/org/nuiton/util
by echatellier＠users.nuiton.org Jan. 14, 2010

Jan. 14, 2010

Author: echatellier Date: 2010-01-14 17:16:12 +0100 (Thu, 14 Jan 2010) New Revision: 1739 Added: trunk/src/main/java/org/nuiton/util/ReverseFileReader.java trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java trunk/src/test/resources/org/ trunk/src/test/resources/org/nuiton/ trunk/src/test/resources/org/nuiton/util/ trunk/src/test/resources/org/nuiton/util/reverseread.txt Log: Add new reader to read file in reverse order. Added: trunk/src/main/java/org/nuiton/util/ReverseFileReader.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ReverseFileReader.java (rev 0) +++ trunk/src/main/java/org/nuiton/util/ReverseFileReader.java 2010-01-14 16:16:12 UTC (rev 1739) @@ -0,0 +1,137 @@ +/* + * *##% Nuiton utilities library + * 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>. ##%* + */ + +package org.nuiton.util; + +import java.io.Closeable; +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; + +/** + * Reverse file reader. + * + * @author chatellier + * @version $Revision$ + * + * TODO add an interface on it. + * + * Last update : $Date$ + * By : $Author$ + */ +public class ReverseFileReader implements Closeable { + protected String filename; + protected RandomAccessFile randomfile; + protected long position; + + public ReverseFileReader(File file) throws IOException { + // Open up a random access file + this.randomfile = new RandomAccessFile(file, "r"); + // Set our seek position to the end of the file + this.position = this.randomfile.length(); + + // Seek to the end of the file + this.randomfile.seek(this.position); + //Move our pointer to the first valid position at the end of the file. + String thisLine = this.randomfile.readLine(); + while (thisLine == null) { + this.position--; + this.randomfile.seek(this.position); + thisLine = this.randomfile.readLine(); + this.randomfile.seek(this.position); + } + } + + public ReverseFileReader(String filename) throws IOException { + this(filename != null ? new File(filename) : null); + } + + /** + * Read one line from the current position towards the beginning. + * + * @return the next line of text from this file, or null if end of file is encountered before even one byte is read. + * @throws IOException + */ + public String readLine() throws IOException { + int thisCode; + char thisChar; + String finalLine = ""; + + // If our position is less than zero already, we are at the beginning + // with nothing to return. + if (this.position < 0) { + return null; + } + + for (;;) { + // we've reached the beginning of the file + if (this.position < 0) { + break; + } + // Seek to the current position + this.randomfile.seek(this.position); + + // Read the data at this position + thisCode = this.randomfile.readByte(); + thisChar = (char) thisCode; + + // If this is a line break or carrige return, stop looking + if (thisCode == 13 || thisCode == 10) { + // See if the previous character is also a line break character. + // this accounts for crlf combinations + this.randomfile.seek(this.position - 1); + int nextCode = this.randomfile.readByte(); + if ((thisCode == 10 && nextCode == 13) + || (thisCode == 13 && nextCode == 10)) { + // If we found another linebreak character, ignore it + this.position = this.position - 1; + } + // Move the pointer for the next readline + this.position--; + break; + } else { + // This is a valid character append to the string + finalLine = thisChar + finalLine; + } + // Move to the next char + this.position--; + } + // return the line + return finalLine; + } + + /* + * @see java.io.Closeable#close() + */ + @Override + public void close() throws IOException { + if (randomfile != null) { + randomfile.close(); + } + } + + /* + * @see java.lang.Object#finalize() + */ + @Override + protected void finalize() throws Throwable { + close(); + super.finalize(); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/org/nuiton/util/ReverseFileReader.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java (rev 0) +++ trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java 2010-01-14 16:16:12 UTC (rev 1739) @@ -0,0 +1,62 @@ +/* + * *##% Nuiton utilities library + * 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>. ##%* + */ + +package org.nuiton.util; + +import java.io.IOException; +import java.net.URL; + +import junit.framework.Assert; + +import org.junit.Test; + +/** + * Test for reverse reader utility. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class ReverseFileReaderTest { + + /** + * Test to read test file in reverse order. + * + * @throws IOException + */ + @Test + public void testReverseRead() throws IOException { + URL url = ReverseFileReaderTest.class.getResource("reverseread.txt"); + String reverseFile = url.getFile(); + ReverseFileReader reader = new ReverseFileReader(reverseFile); + + String lastRead = reader.readLine(); + Assert.assertEquals("Line 4", lastRead); + + lastRead = reader.readLine(); + Assert.assertEquals("Line 3", lastRead); + + lastRead = reader.readLine(); + Assert.assertEquals("Line 2", lastRead); + + reader.close(); + } +} Property changes on: trunk/src/test/java/org/nuiton/util/ReverseFileReaderTest.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/src/test/resources/org/nuiton/util/reverseread.txt =================================================================== --- trunk/src/test/resources/org/nuiton/util/reverseread.txt (rev 0) +++ trunk/src/test/resources/org/nuiton/util/reverseread.txt 2010-01-14 16:16:12 UTC (rev 1739) @@ -0,0 +1,4 @@ +Line 1 +Line 2 +Line 3 +Line 4 \ No newline at end of file

1 0

r1738 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org Jan. 13, 2010

Jan. 13, 2010

Author: fdesbois Date: 2010-01-13 18:58:31 +0100 (Wed, 13 Jan 2010) New Revision: 1738 Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java Log: Improve createMonthsPeriodFromToday to manage negative month value Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-13 09:51:03 UTC (rev 1737) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-13 17:58:31 UTC (rev 1738) @@ -74,23 +74,53 @@ pattern = DateUtils.DEFAULT_PATTERN; } + /** + * Create a period from the date of today. If monthAfter is negative, the current day will be + * the thruDate of the period. The period extremities will be initialized (first day of month for + * fromDate and last day of month for thruDate) + * <pre> + * Ex 1 : + * Today = 12/05/2009 + * monthAfter = 5 + * Period = 01/05/2009 to 31/10/2009 + * Ex 2 : + * Today = 12/05/2009 + * monthAfter = -4 + * Period = 01/01/2009 to 31/05/2009 + * </pre> + * + * @param monthAfter the number of month from the current one + * @return a new PeriodDates + */ public static PeriodDates createMonthsPeriodFromToday(int monthAfter) { Calendar calendarFrom = new GregorianCalendar(); Calendar calendarThru = new GregorianCalendar(); - calendarFrom.set(Calendar.DAY_OF_MONTH, 1); +// calendarFrom.set(Calendar.DAY_OF_MONTH, 1); +// + + // Reset time 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); + if (monthAfter < 0) { + calendarFrom.add(Calendar.MONTH, monthAfter); + } else { + calendarThru.add(Calendar.MONTH, monthAfter); + } + + +// calendarThru.setTime(calendarFrom.getTime()); + +// int maximum = calendarThru.getActualMaximum(Calendar.DAY_OF_MONTH); +// calendarThru.set(Calendar.DAY_OF_MONTH, maximum); + PeriodDates period = new PeriodDates(calendarFrom, calendarThru); + period.initDayOfMonthExtremities(); period.setPattern(DateUtils.MONTH_PATTERN); return period; }

1 0

r1737 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org Jan. 13, 2010

Jan. 13, 2010

Author: fdesbois Date: 2010-01-13 10:51:03 +0100 (Wed, 13 Jan 2010) New Revision: 1737 Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java Log: Clean file Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-12 16:38:10 UTC (rev 1736) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-13 09:51:03 UTC (rev 1737) @@ -46,12 +46,8 @@ private String pattern; -// private Date fromDate; - private Calendar fromCalendar; -// private Date thruDate; - private Calendar thruCalendar; public PeriodDates() { @@ -65,7 +61,7 @@ setFromDate(fromDate); setThruDate(thruDate); - this.pattern = DateUtils.DEFAULT_PATTERN; + pattern = DateUtils.DEFAULT_PATTERN; } public PeriodDates(Calendar fromCalendar, Calendar thruCalendar) throws IllegalArgumentException { @@ -75,7 +71,7 @@ this.fromCalendar = fromCalendar; this.thruCalendar = thruCalendar; - this.pattern = DateUtils.DEFAULT_PATTERN; + pattern = DateUtils.DEFAULT_PATTERN; } public static PeriodDates createMonthsPeriodFromToday(int monthAfter) { @@ -126,18 +122,18 @@ if (fromCalendar == null) { fromCalendar = new GregorianCalendar(); } - this.fromCalendar.setTime(fromDate); + fromCalendar.setTime(fromDate); } else { - this.fromCalendar = null; + fromCalendar = null; } } public Date getFromDate() { - return this.fromCalendar != null ? this.fromCalendar.getTime() : null; + return fromCalendar != null ? fromCalendar.getTime() : null; } public int getFromMonth() { - return this.fromCalendar.get(Calendar.MONTH); + return fromCalendar.get(Calendar.MONTH); } public void setThruDate(Date thruDate) { @@ -146,14 +142,14 @@ if (thruCalendar == null) { thruCalendar = new GregorianCalendar(); } - this.thruCalendar.setTime(thruDate); + thruCalendar.setTime(thruDate); } else { - this.thruCalendar = null; + thruCalendar = null; } } public Date getThruDate() { - return this.thruCalendar != null ? this.thruCalendar.getTime() : null; + return thruCalendar != null ? thruCalendar.getTime() : null; } public List<Date> getMonths() {

1 0

r1736 - trunk/src/main/java/org/nuiton/util
by fdesbois＠users.nuiton.org Jan. 12, 2010

Jan. 12, 2010

Author: fdesbois Date: 2010-01-12 17:38:10 +0100 (Tue, 12 Jan 2010) New Revision: 1736 Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java Log: Resolve NPE Modified: trunk/src/main/java/org/nuiton/util/PeriodDates.java =================================================================== --- trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-12 15:42:11 UTC (rev 1735) +++ trunk/src/main/java/org/nuiton/util/PeriodDates.java 2010-01-12 16:38:10 UTC (rev 1736) @@ -133,7 +133,7 @@ } public Date getFromDate() { - return this.fromCalendar.getTime(); + return this.fromCalendar != null ? this.fromCalendar.getTime() : null; } public int getFromMonth() { @@ -153,7 +153,7 @@ } public Date getThruDate() { - return this.thruCalendar.getTime(); + return this.thruCalendar != null ? this.thruCalendar.getTime() : null; } public List<Date> getMonths() {

2 1