[nuiton-converter] branch develop updated (67696de -> 0bdd361)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-converter. See http://git.nuiton.org/nuiton-converter.git from 67696de simplify site new 0bdd361 improve api usage The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0bdd3616ecd12a9c43f46429cff57d935838b2aa Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jul 20 18:28:50 2014 +0200 improve api usage Summary of changes: src/main/java/org/nuiton/converter/ColorConverter.java | 4 ++-- src/main/java/org/nuiton/converter/EnumConverter.java | 14 +++++++------- src/main/java/org/nuiton/converter/KeyStrokeConverter.java | 6 +++--- src/main/java/org/nuiton/converter/LocaleConverter.java | 6 +++--- src/main/java/org/nuiton/converter/URIConverter.java | 6 +++--- src/main/java/org/nuiton/converter/URLConverter.java | 6 +++--- .../java/org/nuiton/converter/UnregistreableConverter.java | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 0bdd3616ecd12a9c43f46429cff57d935838b2aa Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Jul 20 18:28:50 2014 +0200 improve api usage --- src/main/java/org/nuiton/converter/ColorConverter.java | 4 ++-- src/main/java/org/nuiton/converter/EnumConverter.java | 14 +++++++------- src/main/java/org/nuiton/converter/KeyStrokeConverter.java | 6 +++--- src/main/java/org/nuiton/converter/LocaleConverter.java | 6 +++--- src/main/java/org/nuiton/converter/URIConverter.java | 6 +++--- src/main/java/org/nuiton/converter/URLConverter.java | 6 +++--- .../java/org/nuiton/converter/UnregistreableConverter.java | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/nuiton/converter/ColorConverter.java b/src/main/java/org/nuiton/converter/ColorConverter.java index 5b9ea94..2356308 100644 --- a/src/main/java/org/nuiton/converter/ColorConverter.java +++ b/src/main/java/org/nuiton/converter/ColorConverter.java @@ -39,7 +39,7 @@ import java.util.Scanner; public class ColorConverter implements Converter { @Override - public Object convert(Class aClass, Object value) { + public <T> T convert(Class<T> aClass, Object value) { if (!isEnabled(aClass)) { throw new ConversionException("unsupported type: " + aClass); } @@ -60,7 +60,7 @@ public class ColorConverter implements Converter { sc.useDelimiter("\\D+"); result = new Color(sc.nextInt(), sc.nextInt(), sc.nextInt()); } - return result; + return aClass.cast(result); } catch (Exception e) { throw new ConversionException( "colors must be of the form #xxxxxx ('#' followed by " + diff --git a/src/main/java/org/nuiton/converter/EnumConverter.java b/src/main/java/org/nuiton/converter/EnumConverter.java index 1d7389b..ce3d49e 100644 --- a/src/main/java/org/nuiton/converter/EnumConverter.java +++ b/src/main/java/org/nuiton/converter/EnumConverter.java @@ -59,10 +59,10 @@ public class EnumConverter implements Converter { protected Class<?> enumType; @Override - public Object convert(Class aClass, Object value) { + public <T> T convert(Class<T> aClass, Object value) { if (value == null) { if (useDefault) { - return defaultValue; + return aClass.cast(defaultValue); } throw new ConversionException(String.format("No value specified for converter %s", this)); } @@ -70,7 +70,7 @@ public class EnumConverter implements Converter { Object result; if (isEnabled(value.getClass(), enumType)) { result = value; - return result; + return aClass.cast(result); } if (value instanceof String) { try { @@ -79,12 +79,12 @@ public class EnumConverter implements Converter { // try an ordinal conversion result = convertFromOrdinal(aClass, value); } - return result; + return aClass.cast(result); } if (value instanceof Integer) { // try a ordinal conversion result = convertFromOrdinal(aClass, value); - return result; + return aClass.cast(result); } } throw new ConversionException( @@ -130,13 +130,13 @@ public class EnumConverter implements Converter { protected Object valueOf(Class<?> aClass, Object value) { Object result; - result = Enum.valueOf((Class<Enum>) aClass, (String) value); + result = Enum.valueOf((Class) aClass, (String) value); return result; } protected EnumSet<?> allOf(Class<?> aClass) { EnumSet<?> vals; - vals = EnumSet.allOf((Class<Enum>) aClass); + vals = EnumSet.allOf((Class) aClass); return vals; } diff --git a/src/main/java/org/nuiton/converter/KeyStrokeConverter.java b/src/main/java/org/nuiton/converter/KeyStrokeConverter.java index 6c4f23b..fc58cd6 100644 --- a/src/main/java/org/nuiton/converter/KeyStrokeConverter.java +++ b/src/main/java/org/nuiton/converter/KeyStrokeConverter.java @@ -42,7 +42,7 @@ public class KeyStrokeConverter implements Converter { static Log log = getLog(KeyStrokeConverter.class); @Override - public Object convert(Class aClass, Object value) { + public <T> T convert(Class<T> aClass, Object value) { if (value == null) { throw new ConversionException( String.format("No value specified for converter %s", this)); @@ -51,11 +51,11 @@ public class KeyStrokeConverter implements Converter { Object result; if (isEnabled(value.getClass())) { result = value; - return result; + return aClass.cast(result); } if (value instanceof String) { result = KeyStroke.getKeyStroke((String) value); - return result; + return aClass.cast(result); } } throw new ConversionException( diff --git a/src/main/java/org/nuiton/converter/LocaleConverter.java b/src/main/java/org/nuiton/converter/LocaleConverter.java index 5a7d30a..95c4d1e 100644 --- a/src/main/java/org/nuiton/converter/LocaleConverter.java +++ b/src/main/java/org/nuiton/converter/LocaleConverter.java @@ -50,7 +50,7 @@ public class LocaleConverter implements Converter { private static final Log log = getLog(LocaleConverter.class); @Override - public Object convert(Class aClass, Object value) { + public <T> T convert(Class<T> aClass, Object value) { if (value == null) { throw new ConversionException("can not convert null value in " + this + " convertor"); @@ -59,11 +59,11 @@ public class LocaleConverter implements Converter { Object result; if (isEnabled(value.getClass())) { result = value; - return result; + return aClass.cast(result); } if (value instanceof String) { result = valueOf(((String) value).trim()); - return result; + return aClass.cast(result); } } throw new ConversionException( diff --git a/src/main/java/org/nuiton/converter/URIConverter.java b/src/main/java/org/nuiton/converter/URIConverter.java index d16734d..2779258 100644 --- a/src/main/java/org/nuiton/converter/URIConverter.java +++ b/src/main/java/org/nuiton/converter/URIConverter.java @@ -43,7 +43,7 @@ public class URIConverter implements Converter { static Log log = getLog(URIConverter.class); @Override - public Object convert(Class aClass, Object value) { + public <T> T convert(Class<T> aClass, Object value) { if (value == null) { throw new ConversionException( String.format("No value specified for converter %s", this)); @@ -52,11 +52,11 @@ public class URIConverter implements Converter { Object result; if (isEnabled(value.getClass())) { result = value; - return result; + return aClass.cast(result); } if (value instanceof String) { result = valueOf((String) value); - return result; + return aClass.cast(result); } } throw new ConversionException( diff --git a/src/main/java/org/nuiton/converter/URLConverter.java b/src/main/java/org/nuiton/converter/URLConverter.java index 1b04c9b..4ebd868 100644 --- a/src/main/java/org/nuiton/converter/URLConverter.java +++ b/src/main/java/org/nuiton/converter/URLConverter.java @@ -43,7 +43,7 @@ public class URLConverter implements Converter { static Log log = getLog(URLConverter.class); @Override - public Object convert(Class aClass, Object value) { + public <T> T convert(Class<T> aClass, Object value) { if (value == null) { throw new ConversionException( String.format("No value specified for converter %s", this)); @@ -52,11 +52,11 @@ public class URLConverter implements Converter { Object result; if (isEnabled(value.getClass())) { result = value; - return result; + return aClass.cast(result); } if (value instanceof String) { result = valueOf((String) value); - return result; + return aClass.cast(result); } } throw new ConversionException( diff --git a/src/test/java/org/nuiton/converter/UnregistreableConverter.java b/src/test/java/org/nuiton/converter/UnregistreableConverter.java index 561a4a7..d3ffef1 100644 --- a/src/test/java/org/nuiton/converter/UnregistreableConverter.java +++ b/src/test/java/org/nuiton/converter/UnregistreableConverter.java @@ -33,8 +33,8 @@ import org.apache.commons.beanutils.Converter; public class UnregistreableConverter implements Converter { @Override - public Object convert(Class type, Object value) { - return value; + public <T> T convert(Class<T> aClass, Object value) { + return aClass.cast(value); } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm