This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-converter. See http://git.nuiton.org/nuiton-converter.git commit d8bcec1f5e314376ad3cae17c47a597347c7fc35 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 23 22:26:27 2014 +0200 preserve stack trace + better usage of log --- .../java/org/nuiton/converter/ColorConverter.java | 12 +++++++++++ .../org/nuiton/converter/KeyStrokeConverter.java | 8 +++++++- .../java/org/nuiton/converter/LocaleConverter.java | 23 +++++++++------------- .../java/org/nuiton/converter/URIConverter.java | 2 +- .../java/org/nuiton/converter/URLConverter.java | 4 ++-- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/nuiton/converter/ColorConverter.java b/src/main/java/org/nuiton/converter/ColorConverter.java index 9e5d8af..8060dd1 100644 --- a/src/main/java/org/nuiton/converter/ColorConverter.java +++ b/src/main/java/org/nuiton/converter/ColorConverter.java @@ -24,10 +24,13 @@ package org.nuiton.converter; import org.apache.commons.beanutils.ConversionException; +import org.apache.commons.logging.Log; import java.awt.Color; import java.util.Scanner; +import static org.apache.commons.logging.LogFactory.getLog; + /** * To convert {@link Color} from and to {@link String}. * @@ -37,6 +40,9 @@ import java.util.Scanner; */ public class ColorConverter implements NuitonConverter<Color> { + /** Logger. */ + private static final Log LOGGER = getLog(ColorConverter.class); + @Override public <T> T convert(Class<T> aClass, Object value) { if (!isEnabled(aClass)) { @@ -74,6 +80,12 @@ public class ColorConverter implements NuitonConverter<Color> { return Color.class; } + public ColorConverter() { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("init color converter " + this); + } + } + protected boolean isEnabled(Class<?> aClass) { return Color.class.equals(aClass); } diff --git a/src/main/java/org/nuiton/converter/KeyStrokeConverter.java b/src/main/java/org/nuiton/converter/KeyStrokeConverter.java index 46be257..fcbb3b2 100644 --- a/src/main/java/org/nuiton/converter/KeyStrokeConverter.java +++ b/src/main/java/org/nuiton/converter/KeyStrokeConverter.java @@ -37,7 +37,6 @@ import static org.apache.commons.logging.LogFactory.getLog; */ public class KeyStrokeConverter implements NuitonConverter<KeyStroke> { - /** Logger. */ private static final Log LOGGER = getLog(KeyStrokeConverter.class); @Override @@ -69,4 +68,11 @@ public class KeyStrokeConverter implements NuitonConverter<KeyStroke> { public Class<KeyStroke> getType() { return KeyStroke.class; } + + public KeyStrokeConverter() { + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("init keystroke converter " + this); + } + } + } diff --git a/src/main/java/org/nuiton/converter/LocaleConverter.java b/src/main/java/org/nuiton/converter/LocaleConverter.java index f8f7ba4..3a0c907 100644 --- a/src/main/java/org/nuiton/converter/LocaleConverter.java +++ b/src/main/java/org/nuiton/converter/LocaleConverter.java @@ -71,23 +71,19 @@ public class LocaleConverter implements NuitonConverter<Locale> { } public Locale valueOf(String value) { - try { - Locale result = convertFullScope(value); - if (result == null) { - result = convertMediumScope(value); - } + Locale result = convertFullScope(value); - if (result == null) { - throw new ConversionException("could not convert locale " + - value); - } + if (result == null) { + result = convertMediumScope(value); + } - return result; - } catch (Exception e) { - throw new ConversionException("could not convert locale " + value + - " for reason " + e.getMessage()); + if (result == null) { + throw new ConversionException("could not convert locale " + value); } + + return result; + } private Locale convertFullScope(String value) { @@ -114,7 +110,6 @@ public class LocaleConverter implements NuitonConverter<Locale> { return null; } - public LocaleConverter() { if (LOGGER.isDebugEnabled()) { LOGGER.debug("init locale converter : " + this); diff --git a/src/main/java/org/nuiton/converter/URIConverter.java b/src/main/java/org/nuiton/converter/URIConverter.java index 8d35723..5c82577 100644 --- a/src/main/java/org/nuiton/converter/URIConverter.java +++ b/src/main/java/org/nuiton/converter/URIConverter.java @@ -69,7 +69,7 @@ public class URIConverter implements NuitonConverter<URI> { return result; } catch (URISyntaxException e) { throw new ConversionException( - String.format("a problem occurs while converting value '%s' with url convertor %s for reason %s", value, this, e.getMessage())); + String.format("a problem occurs while converting value '%s' with url convertor %s", value, this), e); } } diff --git a/src/main/java/org/nuiton/converter/URLConverter.java b/src/main/java/org/nuiton/converter/URLConverter.java index a6f1585..83b5d95 100644 --- a/src/main/java/org/nuiton/converter/URLConverter.java +++ b/src/main/java/org/nuiton/converter/URLConverter.java @@ -39,7 +39,7 @@ import static org.apache.commons.logging.LogFactory.getLog; public class URLConverter implements NuitonConverter<URL> { /** Logger. */ - private static final Log LOGGER = getLog(URLConverter.class); + private static final Log LOGGER = getLog(URLConverter.class); @Override public <T> T convert(Class<T> aClass, Object value) { @@ -69,7 +69,7 @@ public class URLConverter implements NuitonConverter<URL> { return result; } catch (MalformedURLException e) { throw new ConversionException( - String.format("a problem occurs while converting value '%s' with url convertor %s for reason %s", value, this, e.getMessage())); + String.format("a problem occurs while converting value '%s' with url convertor %s", value, this), e); } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.