[waffle-scm] [786] trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters: Better protected method name.

Tue, 26 Aug 2008 09:57:20 -0700

Title: [waffle-scm] [786] trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters: Better protected method name.

Diff

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/AbstractValueConverter.java (785 => 786)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/AbstractValueConverter.java	2008-08-26 12:09:42 UTC (rev 785)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/AbstractValueConverter.java	2008-08-26 12:40:02 UTC (rev 786)
@@ -53,31 +53,38 @@
     }
 
     /**
-     * Accepts parameterized types of raw type List and argument of the type passed in
+     * Accepts parameterized types of List<?> 
+     * 
+     * @param type the Type to accept or reject
+     * @param listArgumentClass
      */
-    protected boolean acceptList(Type type, Class<?> argumentClass) {
+    protected boolean acceptList(Type type, Class<?> listArgumentClass) {
         if (type instanceof ParameterizedType) {
             ParameterizedType parameterizedType = (ParameterizedType) type;
             Type rawType = parameterizedType.getRawType();
             Type argumentType = parameterizedType.getActualTypeArguments()[0];
             return List.class.isAssignableFrom((Class<?>) rawType)
-                    && argumentClass.isAssignableFrom((Class<?>) argumentType);
+                    && listArgumentClass.isAssignableFrom((Class<?>) argumentType);
         }
         return false;
     }
 
     /**
-     * Accepts parameterized types of raw type Map and arguments of the type passed in
+     * Accepts parameterized types of type Map<?,List<?>> 
+     * 
+     * @param type the Type to accept or reject
+     * @param keyArgumentClass the Map key argument Class
+     * @param listArgumentClass the List argument Class
      */
-    protected boolean acceptMap(Type type, Class<?> argumentClass0, Class<?> argumentClass1) {
+    protected boolean acceptMapOfLists(Type type, Class<?> keyArgumentClass, Class<?> listArgumentClass) {
         if (type instanceof ParameterizedType) {
             ParameterizedType parameterizedType = (ParameterizedType) type;
             Type rawType = parameterizedType.getRawType();
             Type argumentType0 = parameterizedType.getActualTypeArguments()[0];
             Type argumentType1 = parameterizedType.getActualTypeArguments()[1];
             return Map.class.isAssignableFrom((Class<?>) rawType)
-                    && argumentClass0.isAssignableFrom((Class<?>) argumentType0)
-                    && acceptList(argumentType1, argumentClass1);
+                    && keyArgumentClass.isAssignableFrom((Class<?>) argumentType0)
+                    && acceptList(argumentType1, listArgumentClass);
         }
         return false;
     }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/StringListMapValueConverter.java (785 => 786)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/StringListMapValueConverter.java	2008-08-26 12:09:42 UTC (rev 785)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/StringListMapValueConverter.java	2008-08-26 12:40:02 UTC (rev 786)
@@ -57,7 +57,7 @@
      * Accepts parameterized types of type Map<String,List<String>>
      */
     public boolean accept(Type type) {
-        return acceptMap(type, String.class, String.class);
+        return acceptMapOfLists(type, String.class, String.class);
     }
 
     public Object convertValue(String propertyName, String value, Type toType) {

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/StringNumberListMapValueConverter.java (785 => 786)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/StringNumberListMapValueConverter.java	2008-08-26 12:09:42 UTC (rev 785)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/converters/StringNumberListMapValueConverter.java	2008-08-26 12:40:02 UTC (rev 786)
@@ -60,7 +60,7 @@
      * Accepts parameterized types of raw type Map and argument types String and Number
      */
     public boolean accept(Type type) {
-        return acceptMap(type, String.class, Number.class);
+        return acceptMapOfLists(type, String.class, Number.class);
     }
 
     public Object convertValue(String propertyName, String value, Type toType) {

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to