cvs commit: jakarta-tapestry/framework/src/net/sf/tapestry/util AdaptorRegistry.java

[hl...@apache.org]

hlship      2003/01/14 06:02:18

  Modified:    framework/src/net/sf/tapestry/util Tag: hship-2-3
                        AdaptorRegistry.java
  Log:
  Update AdaptorRegistry to handle object arrays usefully.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.3   +39 -2     jakarta-tapestry/framework/src/net/sf/tapestry/util/AdaptorRegistry.java
  
  Index: AdaptorRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/framework/src/net/sf/tapestry/util/AdaptorRegistry.java,v
  retrieving revision 1.3.2.2
  retrieving revision 1.3.2.3
  diff -u -r1.3.2.2 -r1.3.2.3
  --- AdaptorRegistry.java	2 Jan 2003 13:25:34 -0000	1.3.2.2
  +++ AdaptorRegistry.java	14 Jan 2003 14:02:18 -0000	1.3.2.3
  @@ -44,12 +44,27 @@
    *
    *  <p>The AdaptorRegistry caches the results of search; a subsequent search for the
    *  same subject class will be resolved immediately.
  + * 
  + *  <p>AdaptorRegistry does a minor tweak of the "natural" inheritance.
  + *  Normally, the parent class of an object array (i.e., <code>Foo[]</code>) is
  + *  simply <code>Object</code>, even though you may assign 
  + *  <code>Foo[]</code> to a variable of type <code>Object[]</code>.  AdaptorRegistry
  + *  "fixes" this by searching for <code>Object[]</code> as if it was the superclass of
  + *  any object array.  This means that the search path for <code>Foo[]</code> is
  + *  <code>Foo[]</code>, <code>Object[]</code>, then a couple of interfaces 
  + *  {@link java.lang.Cloneable, {@link java.io.Serializable}, etc. that are\
  + *  implicitily implemented by arrarys), and then, finally, <code>Object</code>
  + * 
  + *  <p>
  + *  This tweak doesn't apply to scalar arrays, since scalar arrays may <em>not</em>
  + *  be assigned to <code>Object[]</code>. 
    *
    *  <p>This class is thread safe.
    *
    *
    *  @version $Id$
    *  @author Howard Lewis Ship
  + * 
    **/
   
   public class AdaptorRegistry
  @@ -193,7 +208,7 @@
   
               // Advance up to the next superclass
   
  -            searchClass = searchClass.getSuperclass();
  +            searchClass = getSuperclass(searchClass);
   
           }
   
  @@ -232,6 +247,28 @@
   
           throw new IllegalArgumentException(
               Tapestry.getString("AdaptorRegistry.adaptor-not-found", subjectClass.getName()));
  +    }
  +
  +	/**
  +	 *  Returns the superclass of the given class, with a single tweak:  If the 
  +	 *  search class is an array class, and the component type is an object class
  +	 *  (but not Object), then the simple Object array class is returned.  This reflects
  +	 *  the fact that an array of any class may be assignable to <code>Object[]</code>,
  +	 *  even though the superclass of an array is always simply <code>Object</code>.
  +	 * 
  +	 **/
  +	
  +    private Class getSuperclass(Class searchClass)
  +    {
  +    	if (searchClass.isArray())
  +    	{
  +    		Class componentType = searchClass.getComponentType();
  +    		
  +    		if (!componentType.isPrimitive() && componentType != Object.class)
  +    			return Object[].class;
  +    	}
  +
  +        return searchClass.getSuperclass();
       }
   
       public synchronized String toString()