svn commit: r157556 - incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/GenericProbe.java

[cb...@apache.org]

Author: cbegin
Date: Tue Mar 15 08:04:59 2005
New Revision: 157556

URL: http://svn.apache.org/viewcvs?view=rev&rev=157556
Log:
added map support for genericprobe

Modified:
    incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/GenericProbe.java

Modified: incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/GenericProbe.java
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/GenericProbe.java?view=diff&r1=157555&r2=157556
==============================================================================
--- incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/GenericProbe.java (original)
+++ incubator/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/GenericProbe.java Tue Mar 15 08:04:59 2005
@@ -15,6 +15,7 @@
  */
 package com.ibatis.common.beans;
 
+import java.util.Map;
 import java.util.StringTokenizer;
 
 /**
@@ -183,31 +184,52 @@
     }
   }
 
-  private Class getClassPropertyTypeForSetter(Class type, String name) {
+  private Class getClassPropertyTypeForGetter(Class type, String name) {
+
     if (name.indexOf('.') > -1) {
       StringTokenizer parser = new StringTokenizer(name, ".");
       while (parser.hasMoreTokens()) {
         name = parser.nextToken();
-        type = ClassInfo.getInstance(type).getSetterType(name);
+        if (Map.class.isAssignableFrom(type)) {
+          type = Object.class;
+          break;
+        }
+        type = ClassInfo.getInstance(type).getGetterType(name);
       }
     } else {
-      type = ClassInfo.getInstance(type).getSetterType(name);
+      type = ClassInfo.getInstance(type).getGetterType(name);
     }
+
     return type;
   }
 
-  private Class getClassPropertyTypeForGetter(Class type, String name) {
+  /**
+   * Returns the class that the setter expects to receive as a parameter when
+   * setting a property value.
+   *
+   * @param type The class to check
+   * @param name The name of the property
+   * @return The type of the property
+   */
+  private Class getClassPropertyTypeForSetter(Class type, String name) {
+
     if (name.indexOf('.') > -1) {
       StringTokenizer parser = new StringTokenizer(name, ".");
       while (parser.hasMoreTokens()) {
         name = parser.nextToken();
-        type = ClassInfo.getInstance(type).getGetterType(name);
+        if (Map.class.isAssignableFrom(type)) {
+          type = Object.class;
+          break;
+        }
+        type = ClassInfo.getInstance(type).getSetterType(name);
       }
     } else {
-      type = ClassInfo.getInstance(type).getGetterType(name);
+      type = ClassInfo.getInstance(type).getSetterType(name);
     }
+
     return type;
   }
+
 
 }