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

r1860 - trunk/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org 11 May '10

11 May '10

Author: echatellier Date: 2010-05-11 16:42:58 +0200 (Tue, 11 May 2010) New Revision: 1860 Url: http://nuiton.org/repositories/revision/nuiton-utils/1860 Log: fix #601 : file.toURI seam to encode better file path Modified: trunk/src/main/java/org/nuiton/util/Resource.java Modified: trunk/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/src/main/java/org/nuiton/util/Resource.java 2010-05-11 11:53:05 UTC (rev 1859) +++ trunk/src/main/java/org/nuiton/util/Resource.java 2010-05-11 14:42:58 UTC (rev 1860) @@ -328,12 +328,28 @@ } for (URL urlFile : arrayURL) { - String fileName = urlFile.getFile(); + // EC-20100510 this cause wrong accent encoding + //String fileName = urlFile.getFile(); + String fileName = null; + try { + fileName = urlFile.toURI().getPath(); + } + catch (Exception e) { + if (log.isWarnEnabled()) { + log.warn(e); + } + // warning, this can cause wrong encoding !!! + fileName = urlFile.getFile(); + } + // TODO deal with encoding in windows, this is very durty, but it // works... File file = new File(fileName.replaceAll("%20", " ")); if (!file.exists()) { // this case should not appear + if (log.isDebugEnabled()) { + log.debug("Can't find file " + file + " (" + fileName + ")"); + } continue; } if (isJar(fileName)) {

1 0

r1859 - trunk
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:53:05 +0200 (Tue, 11 May 2010) New Revision: 1859 Url: http://nuiton.org/repositories/revision/nuiton-utils/1859 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 11:53:04 UTC (rev 1858) +++ trunk/pom.xml 2010-05-11 11:53:05 UTC (rev 1859) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3</version> + <version>1.3.1-SNAPSHOT</version> <dependencies> @@ -161,9 +161,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.3</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

r1858 - in tags: . nuiton-utils-1.3
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:53:04 +0200 (Tue, 11 May 2010) New Revision: 1858 Url: http://nuiton.org/repositories/revision/nuiton-utils/1858 Log: [maven-release-plugin] copy for tag nuiton-utils-1.3 Added: tags/nuiton-utils-1.3/ Property changes on: tags/nuiton-utils-1.3 ___________________________________________________________________ Added: svn:ignore + target velocity.log maven.log .eclipse .classpath *.iml *.ipr *.iws .settings .project Added: svn:mergeinfo +

1 0

r1857 - trunk
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:53:02 +0200 (Tue, 11 May 2010) New Revision: 1857 Url: http://nuiton.org/repositories/revision/nuiton-utils/1857 Log: [maven-release-plugin] prepare release nuiton-utils-1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 11:49:31 UTC (rev 1856) +++ trunk/pom.xml 2010-05-11 11:53:02 UTC (rev 1857) @@ -37,7 +37,7 @@ </parent> <artifactId>nuiton-utils</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> <dependencies> @@ -161,9 +161,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.3</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-utils/tags/nuiton-utils-1.3</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-utils/tags/nuiton-utils-1.3</url> </scm> <profiles>

1 0

r1856 - trunk
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:49:31 +0200 (Tue, 11 May 2010) New Revision: 1856 Url: http://nuiton.org/repositories/revision/nuiton-utils/1856 Log: Evolution #597: Use provided log4j (need to specify it in final application) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 11:39:18 UTC (rev 1855) +++ trunk/pom.xml 2010-05-11 11:49:31 UTC (rev 1856) @@ -45,10 +45,7 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> -  - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency>

1 0

r1855 - in trunk/src/test/java/org/nuiton/util: . converter
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:39:18 +0200 (Tue, 11 May 2010) New Revision: 1855 Url: http://nuiton.org/repositories/revision/nuiton-utils/1855 Log: move tests Added: trunk/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java Modified: trunk/src/test/java/org/nuiton/util/UnregistreableConverter.java Modified: trunk/src/test/java/org/nuiton/util/UnregistreableConverter.java =================================================================== --- trunk/src/test/java/org/nuiton/util/UnregistreableConverter.java 2010-05-11 11:36:05 UTC (rev 1854) +++ trunk/src/test/java/org/nuiton/util/UnregistreableConverter.java 2010-05-11 11:39:18 UTC (rev 1855) @@ -31,7 +31,9 @@ * A converter with no getType method, so not registreable via {@link ConverterUtil#initConverters()} * * @author tchemit <chemit(a)codelutin.com> + * @deprecated since 1.3, use now {@link org.nuiton.util.converter.UnregistreableConverter}. */ +@Deprecated public class UnregistreableConverter implements Converter{ @Override Added: trunk/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java =================================================================== --- trunk/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java (rev 0) +++ trunk/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java 2010-05-11 11:39:18 UTC (rev 1855) @@ -0,0 +1,43 @@ +/* + * #%L + * Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.util.converter; + +import org.apache.commons.beanutils.Converter; + +/** + * A converter with no getType method, so not registreable via {@link ConverterUtil#initConverters()} + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 (replace class {@code org.nuiton.util.UnregistreableConverter}). + */ +public class UnregistreableConverter implements Converter{ + + @Override + public Object convert(Class type, Object value) { + return value; + } + +} \ No newline at end of file Property changes on: trunk/src/test/java/org/nuiton/util/converter/UnregistreableConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1854 - trunk/src/main/java/org/nuiton/util/converter
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:36:05 +0200 (Tue, 11 May 2010) New Revision: 1854 Url: http://nuiton.org/repositories/revision/nuiton-utils/1854 Log: set new default package where to look converters Modified: trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java Modified: trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java 2010-05-11 11:32:57 UTC (rev 1853) +++ trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java 2010-05-11 11:36:05 UTC (rev 1854) @@ -47,7 +47,7 @@ * le paquetage où chercher les implentations de Converter, si non présents * dans le système */ - protected static final String CONVERTER_PACKAGE = "org.nuiton.util"; + protected static final String CONVERTER_PACKAGE = "org.nuiton.util.converter"; /** un drapeau pour savoir si on doit charger les converters specifiques */ protected static Boolean WAS_INIT = Boolean.FALSE;

1 0

r1853 - trunk
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:32:57 +0200 (Tue, 11 May 2010) New Revision: 1853 Url: http://nuiton.org/repositories/revision/nuiton-utils/1853 Log: Evolution #595: Use log4j 1.2.16 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-11 11:26:30 UTC (rev 1852) +++ trunk/pom.xml 2010-05-11 11:32:57 UTC (rev 1853) @@ -44,7 +44,7 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.14</version> + <version>1.2.16</version>

1 0

r1852 - trunk/src/main/java/org/nuiton/util/converter
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:26:30 +0200 (Tue, 11 May 2010) New Revision: 1852 Url: http://nuiton.org/repositories/revision/nuiton-utils/1852 Log: add header Modified: trunk/src/main/java/org/nuiton/util/converter/package-info.java Modified: trunk/src/main/java/org/nuiton/util/converter/package-info.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/package-info.java 2010-05-11 11:24:21 UTC (rev 1851) +++ trunk/src/main/java/org/nuiton/util/converter/package-info.java 2010-05-11 11:26:30 UTC (rev 1852) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ /** * * This package contains the converter api + the format api. @@ -6,11 +30,11 @@ * This converter api is based on the * http://commons.apache.org/beanutils {@code commons-beanutils}. * <p/> - * Use the {@link org.nuiton.util.ConverterUtil} to register or obtain a + * Use the {@link org.nuiton.util.converter.ConverterUtil} to register or obtain a * converter. * * <h1<Format api</h1> - * see {@link org.nuiton.util.FormatConverter} and others + * see {@link org.nuiton.util.converter.FormatConverter} and others * * @author tchemit <chemit(a)codelutin.com> * @since 1.3

1 0

r1851 - in trunk/src: main/java/org/nuiton/util main/java/org/nuiton/util/converter test/java/org/nuiton/util test/java/org/nuiton/util/converter
by tchemit＠users.nuiton.org 11 May '10

11 May '10

Author: tchemit Date: 2010-05-11 13:24:21 +0200 (Tue, 11 May 2010) New Revision: 1851 Url: http://nuiton.org/repositories/revision/nuiton-utils/1851 Log: Evolution #594: Creates a org.nuiton.util.converter to move Converter api + deprecates Converter api in org.nuiton.util Modified: trunk/src/main/java/org/nuiton/util/ConverterUtil.java trunk/src/main/java/org/nuiton/util/EnumConverter.java trunk/src/main/java/org/nuiton/util/FormatConverter.java trunk/src/main/java/org/nuiton/util/FormatConverterFactory.java trunk/src/main/java/org/nuiton/util/FormatMap.java trunk/src/main/java/org/nuiton/util/URIConverter.java trunk/src/main/java/org/nuiton/util/URLConverter.java trunk/src/main/java/org/nuiton/util/VersionConverter.java trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java trunk/src/main/java/org/nuiton/util/converter/FormatConverter.java trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java trunk/src/main/java/org/nuiton/util/converter/FormatMap.java trunk/src/main/java/org/nuiton/util/converter/URIConverter.java trunk/src/main/java/org/nuiton/util/converter/URLConverter.java trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java trunk/src/test/java/org/nuiton/util/VersionConverterTest.java trunk/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java trunk/src/test/java/org/nuiton/util/converter/VersionConverterTest.java Modified: trunk/src/main/java/org/nuiton/util/ConverterUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/ConverterUtil.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/ConverterUtil.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -36,7 +36,9 @@ * Une classe contenant des méthodes utiles sur les converters et les conversions * * @author tchemit <chemit(a)codelutin.com> + * @deprecated since 1.3, use now the {@link org.nuiton.util.converter.ConverterUtil} class. */ +@Deprecated public class ConverterUtil { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/src/main/java/org/nuiton/util/EnumConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/EnumConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/EnumConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -40,13 +40,15 @@ * Il est possible aussi de convertir une Enum à partir de sa valeur ordinal. * <p/> * Pour enregister un nouveau convertissemnt pour un type d'Enum utiliser les - * méthodes * {@link ConverterUtil#registerEnumConverter(Class)}, - * et {@link ConverterUtil#registerEnumConverter(Class,Object)} . + * méthodes {@link ConverterUtil#registerEnumConverter(Class)}, et + * {@link ConverterUtil#registerEnumConverter(Class,Object)}. * * @author tchemit <chemit(a)codelutin.com> * @see Enum * @see Enum#ordinal() + * @deprecated since 1.3, use now the {@link org.nuiton.util.converter.EnumConverter} class. */ +@Deprecated public class EnumConverter implements Converter { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/src/main/java/org/nuiton/util/FormatConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FormatConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/FormatConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -47,7 +47,10 @@ * pour eviter une conversion supplémentaire qui pourrait-etre couteuse. * * @param <A> le type de l'objet a convertir + * + * @deprecated since 1.3, use the class {@link org.nuiton.util.converter.FormatConverter}. */ +@Deprecated public interface FormatConverter<A> { // FormatConverter Format FORMAT_JAVA = new Format("Format Java"); Modified: trunk/src/main/java/org/nuiton/util/FormatConverterFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FormatConverterFactory.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/FormatConverterFactory.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -62,7 +62,10 @@ * values, AppContext); * </pre> * Dans ce cas pour des raisons d'optimisation + * + * @deprecated since 1.3, use the class {@link org.nuiton.util.converter.FormatConverterFactory}. */ +@Deprecated public class FormatConverterFactory { // FormatConverterFactory /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/src/main/java/org/nuiton/util/FormatMap.java =================================================================== --- trunk/src/main/java/org/nuiton/util/FormatMap.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/FormatMap.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -68,7 +68,10 @@ * Il est souvent plus simple de faire une petite classe avec les methodes * getSQL() et getXML(), qui retourne les valeurs directement dans le bon type * et qui n'ont pas besoin d'argument. + * + * @deprecated since 1.3, use the class {@link org.nuiton.util.converter.FormatMap}. */ +@Deprecated public class FormatMap extends HashMap<Format, Object> { // FormatMap /** */ Modified: trunk/src/main/java/org/nuiton/util/URIConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/URIConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/URIConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -38,7 +38,9 @@ * classe pour convertir une chaine en un objet URI. * * @author tchemit <chemit(a)codelutin.com> + * @deprecated since 1.3, use now the {@link org.nuiton.util.converter.URIConverter} class. */ +@Deprecated public class URIConverter implements Converter { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/src/main/java/org/nuiton/util/URLConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/URLConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/URLConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -38,7 +38,9 @@ * classe pour convertir une chaine en un objet URL. * * @author tchemit <chemit(a)codelutin.com> + * @deprecated since 1.3, use now the {@link org.nuiton.util.converter.URLConverter} class. */ +@Deprecated public class URLConverter implements Converter { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/src/main/java/org/nuiton/util/VersionConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/VersionConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/VersionConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -36,7 +36,9 @@ * * @author tchemit <chemit(a)codelutin.com> * @see Version + * @deprecated since 1.3, use now the {@link org.nuiton.util.converter.VersionConverter} class. */ +@Deprecated public class VersionConverter implements Converter { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/ConverterUtil.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,7 +23,7 @@ * #L% */ -package org.nuiton.util; +package org.nuiton.util.converter; import java.lang.reflect.Method; import java.util.ServiceLoader; @@ -36,6 +36,7 @@ * Une classe contenant des méthodes utiles sur les converters et les conversions * * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 (replace {@code org.nuiton.util.ConverterUtil}). */ public class ConverterUtil { Modified: trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/EnumConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,7 +23,7 @@ * #L% */ -package org.nuiton.util; +package org.nuiton.util.converter; import org.apache.commons.beanutils.ConversionException; import static org.apache.commons.logging.LogFactory.getLog; Modified: trunk/src/main/java/org/nuiton/util/converter/FormatConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/FormatConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/FormatConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -34,9 +34,9 @@ * Last update: $Date$ * by : */ -package org.nuiton.util; +package org.nuiton.util.converter; -import org.nuiton.util.FormatMap.Format; +import org.nuiton.util.converter.FormatMap.Format; /** * Un converter est un objet qui permet de passé d'une representation d'un Modified: trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/FormatConverterFactory.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,23 +23,12 @@ * #L% */ -/* * - * FormatConverterFactory.java - * - * Created: 14 septembre 2005 00:19:51 CEST - * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : */ +package org.nuiton.util.converter; -package org.nuiton.util; - import org.apache.commons.collections.map.MultiKeyMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FormatMap.Format; +import org.nuiton.util.converter.FormatMap.Format; import java.util.Collections; import java.util.Iterator; @@ -62,6 +51,12 @@ * values, AppContext); * </pre> * Dans ce cas pour des raisons d'optimisation + * <p/> + * Created: 14 septembre 2005 00:19:51 CEST + * + * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @version $Id$ + * @since 1.3 replace the class {@code org.nuiton.util.FormatConverterFactory}. */ public class FormatConverterFactory { // FormatConverterFactory @@ -69,6 +64,7 @@ static private Log log = LogFactory.getLog(FormatConverterFactory.class); static protected FormatConverterFactory instance; + /** <Class, from, to -> FormatConverter> */ protected MultiKeyMap converters = new MultiKeyMap(); @@ -102,7 +98,7 @@ * @return le converter souhaité ou defaultConverter */ public FormatConverter<?> getConverter(Class<?> clazz, Format format, - FormatConverter<?> defaultConverter) { + FormatConverter<?> defaultConverter) { FormatConverter<?> result = (FormatConverter<?>) converters.get(clazz, format); if (result == null) { result = defaultConverter; @@ -112,7 +108,7 @@ /** * @param clazz - * @param format + * @param format * @return retourne null si aucun converter trouvé * @see #getConverter(Class, Format, FormatConverter) */ @@ -131,7 +127,7 @@ * @return le converter souhaité ou defaultConverter */ public FormatConverter<?> findConverter(Class<?> clazz, Format format, - FormatConverter<?> defaultConverter) { + FormatConverter<?> defaultConverter) { FormatConverter<?> result = null; LinkedList<Class<?>> interfaces = new LinkedList<Class<?>>(); Modified: trunk/src/main/java/org/nuiton/util/converter/FormatMap.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/FormatMap.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/FormatMap.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -22,21 +22,8 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ +package org.nuiton.util.converter; -/* * - * FormatMap.java - * - * Created: 16 septembre 2005 10:41:58 CEST - * - * @author Benjamin POUSSIN <poussin(a)codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : */ -package org.nuiton.util; - -import org.nuiton.util.FormatMap.Format; - import java.util.HashMap; import java.util.Map; @@ -68,11 +55,17 @@ * Il est souvent plus simple de faire une petite classe avec les methodes * getSQL() et getXML(), qui retourne les valeurs directement dans le bon type * et qui n'ont pas besoin d'argument. + * <p/> + * <p/> + * Created: 16 septembre 2005 10:41:58 CEST + * + * @author Benjamin POUSSIN <poussin(a)codelutin.com> + * @version $Id$ + * @since 1.3 (replace {@code org.nuiton.util.FormatMap} class). */ -public class FormatMap extends HashMap<Format, Object> { // FormatMap +public class FormatMap extends HashMap<FormatMap.Format, Object> { // FormatMap - /** */ - private static final long serialVersionUID = -3386611811885092898L; + private static final long serialVersionUID = 1L; static public class Format { @@ -87,6 +80,7 @@ return name; } } + protected Class<?> clazz; public FormatMap(Class<?> clazz) { @@ -100,7 +94,7 @@ /** * Met a jour la valeur de l'objet. Toutes les autres valeurs calculées * sont oubliées et seront recalculé en fonction de cette nouvelle valeur - * + * * @param format le format a utiliser * @param value */ @@ -113,7 +107,7 @@ * Utilise le FormatConverterFactory par defaut pour la conversion * * @param format le format a utiliser - * @param args les arguments + * @param args les arguments * @return l'objet converti */ public Object convert(Format format, Object... args) { @@ -129,7 +123,7 @@ * @return l'objet converti */ public Object convert(FormatConverterFactory factory, Format format, - Object... args) { + Object... args) { Object result = null; Map<Format, Object> values = this; //if (!values.containsKey(format) || @@ -156,7 +150,9 @@ return result; } - /** Utilise le FormatConverterFactory par defaut pour la conversion + /** + * Utilise le FormatConverterFactory par defaut pour la conversion + * * @param format le format utilise * @param args * @return l'objet java @@ -175,11 +171,11 @@ * @return l'objet java */ public Object unconvert(FormatConverterFactory factory, Format format, - Object... args) { + Object... args) { Object result = null; Map<Format, Object> values = this; if (!values.containsKey(format) && - !values.containsKey(FormatConverter.FORMAT_JAVA)) { + !values.containsKey(FormatConverter.FORMAT_JAVA)) { throw new IllegalArgumentException("Aucun valeur disponible"); } Modified: trunk/src/main/java/org/nuiton/util/converter/URIConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/URIConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/URIConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,7 +23,7 @@ * #L% */ -package org.nuiton.util; +package org.nuiton.util.converter; import org.apache.commons.beanutils.ConversionException; import static org.apache.commons.logging.LogFactory.getLog; @@ -38,6 +38,7 @@ * classe pour convertir une chaine en un objet URI. * * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 (replace {@code org.nuiton.util.URIConverter}). */ public class URIConverter implements Converter { Modified: trunk/src/main/java/org/nuiton/util/converter/URLConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/URLConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/URLConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,7 +23,7 @@ * #L% */ -package org.nuiton.util; +package org.nuiton.util.converter; import org.apache.commons.beanutils.ConversionException; import static org.apache.commons.logging.LogFactory.getLog; @@ -38,6 +38,7 @@ * classe pour convertir une chaine en un objet URL. * * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 (replace {@code org.nuiton.util.URLConverter}). */ public class URLConverter implements Converter { Modified: trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java =================================================================== --- trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/main/java/org/nuiton/util/converter/VersionConverter.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,18 +23,22 @@ * #L% */ -package org.nuiton.util; +package org.nuiton.util.converter; import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; + import static org.nuiton.i18n.I18n._; /** * classe pour convertir une chaine en un objet Version. * * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 (replace {@code org.nuiton.util.VersionConverter}). * @see Version */ public class VersionConverter implements Converter { Modified: trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/test/java/org/nuiton/util/ConverterUtilTest.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -36,7 +36,9 @@ * @author tchemit <chemit(a)codelutin.com> * @version 1.0 * @since <pre>02/13/2008</pre> + * @deprecated since 1.3, use now the {@link org.nuiton.util.converter.ConverterUtilTest} class. */ +@Deprecated public class ConverterUtilTest { @Test Modified: trunk/src/test/java/org/nuiton/util/VersionConverterTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/VersionConverterTest.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/test/java/org/nuiton/util/VersionConverterTest.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -35,7 +35,9 @@ /** * * @author tchemit <chemit(a)codelutin.com> + * @deprecated since 1.3, use now the {@link org.nuiton.util.converter.VersionConverterTest} class. */ +@Deprecated public class VersionConverterTest { VersionConverter converter; Modified: trunk/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/test/java/org/nuiton/util/converter/ConverterUtilTest.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,18 +23,19 @@ * #L% */ -package org.nuiton.util; +package org.nuiton.util.converter; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.Version; /** * ConverterUtil Tester. * * @author tchemit <chemit(a)codelutin.com> - * @version 1.0 + * @version 1.3 (replace class {@code org.nuiton.util.ConverterUtilTest}). * @since <pre>02/13/2008</pre> */ public class ConverterUtilTest { Modified: trunk/src/test/java/org/nuiton/util/converter/VersionConverterTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/converter/VersionConverterTest.java 2010-05-11 11:20:39 UTC (rev 1850) +++ trunk/src/test/java/org/nuiton/util/converter/VersionConverterTest.java 2010-05-11 11:24:21 UTC (rev 1851) @@ -23,18 +23,21 @@ * #L% */ -package org.nuiton.util; +package org.nuiton.util.converter; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.util.Version; + import static org.junit.Assert.*; /** * * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 (replace class {@code org.nuiton.util.VersionConverterTest}). */ public class VersionConverterTest {

1 0