Index: lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java diff -u lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java:1.1 lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java:1.2 --- lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java:1.1 Tue Sep 20 14:32:16 2005 +++ lutinutil/src/java/org/codelutin/util/FormatConverterFactory.java Tue Dec 6 12:10:17 2005 @@ -23,10 +23,10 @@ * Created: 14 septembre 2005 00:19:51 CEST * * @author Benjamin POUSSIN - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ * - * Last update: $Date: 2005/09/20 14:32:16 $ - * by : $Author: bpoussin $ + * Last update: $Date: 2005/12/06 12:10:17 $ + * by : $Author: thimel $ */ package org.codelutin.util; @@ -174,19 +174,13 @@ public Object convert(FormatConverter defaultConverter, Format format, FormatMap values, Object ... args) { - FormatConverter c = findConverter(values.getType(), format); - if(c == null){ - c = defaultConverter; - } + FormatConverter c = findConverter(values.getType(), format, defaultConverter); return c.convert(this, format, values, args); } public Object unconvert(FormatConverter defaultConverter, Format format, FormatMap values, Object ... args) { - FormatConverter c = findConverter(values.getType(), format); - if(c == null){ - c = defaultConverter; - } + FormatConverter c = findConverter(values.getType(), format, defaultConverter); return c.unconvert(this, format, values, args); }