svn commit: r910108 - in /ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion: AbstractConverter.java AbstractLocalizedConverter.java Converter.java Converters.java LocalizedConverter.java MiscConverters.java

[doogie-3]

Author: doogie
Date: Sun Feb 14 22:39:53 2010
New Revision: 910108

URL: http://svn.apache.org/viewvc?rev=910108&view=rev
Log:
Improve the targeted class convert methods, to have a more strict
generics type.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractConverter.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractLocalizedConverter.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractConverter.java?rev=910108&r1=910107&r2=910108&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractConverter.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractConverter.java Sun Feb 14 22:39:53 2010
@@ -37,7 +37,7 @@
         Converters.registerConverter(this);
     }
 
-    public T convert(Class<?> targetClass, S obj) throws ConversionException {
+    public T convert(Class<? extends T> targetClass, S obj) throws ConversionException {
         return convert(obj);
     }
 

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractLocalizedConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractLocalizedConverter.java?rev=910108&r1=910107&r2=910108&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractLocalizedConverter.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/AbstractLocalizedConverter.java Sun Feb 14 22:39:53 2010
@@ -32,11 +32,11 @@
         super(sourceClass, targetClass);
     }
 
-    public T convert(Class<?> targetClass, S obj, Locale locale, TimeZone timeZone) throws ConversionException {
+    public T convert(Class<? extends T> targetClass, S obj, Locale locale, TimeZone timeZone) throws ConversionException {
         return convert(obj, locale, timeZone);
     }
 
-    public T convert(Class<?> targetClass, S obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException {
+    public T convert(Class<? extends T> targetClass, S obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException {
         return convert(obj, locale, timeZone, formatString);
     }
 }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java?rev=910108&r1=910107&r2=910108&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converter.java Sun Feb 14 22:39:53 2010
@@ -52,7 +52,7 @@
      * @return The converted <code>Object</code>
      * @throws ConversionException
      */
-    public T convert(Class<?> targetClass, S obj) throws ConversionException;
+    public T convert(Class<? extends T> targetClass, S obj) throws ConversionException;
 
     /** Returns the source <code>Class</code> for this converter.
      *

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java?rev=910108&r1=910107&r2=910108&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/Converters.java Sun Feb 14 22:39:53 2010
@@ -196,7 +196,7 @@
             return obj;
         }
 
-        public Object convert(Class<?> targetClass, Object obj) throws ConversionException {
+        public Object convert(Class<? extends Object> targetClass, Object obj) throws ConversionException {
             return obj;
         }
 
@@ -229,7 +229,7 @@
             return obj;
         }
 
-        public T convert(Class<?> targetClass, T obj) throws ConversionException {
+        public T convert(Class<? extends T> targetClass, T obj) throws ConversionException {
             return obj;
         }
 

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java?rev=910108&r1=910107&r2=910108&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/LocalizedConverter.java Sun Feb 14 22:39:53 2010
@@ -45,7 +45,7 @@
      * @return The converted <code>Object</code>
      * @throws ConversionException
      */
-    public T convert(Class<?> targetClass, S obj, Locale locale, TimeZone timeZone) throws ConversionException;
+    public T convert(Class<? extends T> targetClass, S obj, Locale locale, TimeZone timeZone) throws ConversionException;
 
     /** Converts <code>obj</code> to <code>T</code>.
      *
@@ -68,5 +68,5 @@
      * @return The converted <code>Object</code>
      * @throws ConversionException
      */
-    public T convert(Class<?> targetClass, S obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException;
+    public T convert(Class<? extends T> targetClass, S obj, Locale locale, TimeZone timeZone, String formatString) throws ConversionException;
 }

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java?rev=910108&r1=910107&r2=910108&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/conversion/MiscConverters.java Sun Feb 14 22:39:53 2010
@@ -148,7 +148,7 @@
             return obj.name();
         }
 
-        public String convert(Class<?> targetClass, Enum obj) throws ConversionException {
+        public String convert(Class<? extends String> targetClass, Enum obj) throws ConversionException {
             return convert(obj);
         }
 
@@ -170,7 +170,7 @@
             throw new UnsupportedOperationException();
         }
 
-        public Enum convert(Class<?> targetClass, String obj) throws ConversionException {
+        public Enum convert(Class<? extends Enum> targetClass, String obj) throws ConversionException {
             return Enum.valueOf(UtilGenerics.<Class<? extends Enum>>cast(targetClass), obj);
         }