cvs commit: spice/sandbox/metaclass/src/java/org/realityforge/metaclass/introspector CachingMetaClassAccessor.java MetaClassIntrospector.java WrapperMetaClassAccessor.java

Peter Donald <[email protected]>
Newsgroups gmane.comp.java.spice.cvs
Message-ID <[email protected]>
donaldp     03/10/28 00:15:02

  Modified:    sandbox/metaclass/src/java/org/realityforge/metaclass/introspector
                        CachingMetaClassAccessor.java
                        MetaClassIntrospector.java
                        WrapperMetaClassAccessor.java
  Log:
  Style source files
  
  Revision  Changes    Path
  1.5       +108 -108  spice/sandbox/metaclass/src/java/org/realityforge/metaclass/introspector/CachingMetaClassAccessor.java
  
  Index: CachingMetaClassAccessor.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/introspector/CachingMetaClassAccessor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CachingMetaClassAccessor.java	28 Oct 2003 08:11:53 -0000	1.4
  +++ CachingMetaClassAccessor.java	28 Oct 2003 08:15:01 -0000	1.5
  @@ -15,115 +15,115 @@
    * Caching MetaClassAccessor implementation.
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.4 $ $Date: 2003/10/28 08:11:53 $
  + * @version $Revision: 1.5 $ $Date: 2003/10/28 08:15:01 $
    */
   public class CachingMetaClassAccessor
  -   implements MetaClassAccessor
  +    implements MetaClassAccessor
   {
  -   /**
  -    * Class used to access the MetaData.
  -    */
  -   private MetaClassAccessor m_accessor = new DefaultMetaClassAccessor();
  -
  -   /**
  -    * The cache in which info objects are stored.
  -    * This cache stores maps for ClassLoaders which in
  -    * turn stores info for particular classes in
  -    * classloader.
  -    */
  -   private final Map m_cache = new WeakHashMap();
  -
  -   /**
  -    * Set the MetaClassAccessor to use to locate
  -    * ClassDescriptor objects.
  -    *
  -    * @param accessor the MetaClassAccessor
  -    */
  -   public synchronized void setAccessor( final MetaClassAccessor accessor )
  -   {
  -      if ( null == accessor )
  -      {
  -         throw new NullPointerException( "accessor" );
  -      }
  -      m_accessor = accessor;
  -   }
  -
  -   /**
  -    * Remove all descriptors from registry.
  -    */
  -   public synchronized void clear()
  -   {
  -      m_cache.clear();
  -   }
  -
  -   /**
  -    * @see MetaClassAccessor#getClassDescriptor
  -    */
  -   public synchronized ClassDescriptor getClassDescriptor( final String classname,
  -                                              final ClassLoader classLoader,
  -                                              final MetaClassAccessor accessor )
  -      throws MetaClassException
  -   {
  -      if ( null == classname )
  -      {
  -         throw new NullPointerException( "classname" );
  -      }
  -      if ( null == classLoader )
  -      {
  -         throw new NullPointerException( "classLoader" );
  -      }
  -      final Map cache = getClassLoaderCache( classLoader );
  -      ClassDescriptor descriptor = (ClassDescriptor) cache.get( classname );
  -      if ( null != descriptor )
  -      {
  -         return descriptor;
  -      }
  -      else
  -      {
  -         descriptor =
  -            m_accessor.getClassDescriptor( classname,
  -                                           classLoader,
  -                                           accessor );
  -         cache.put( classname, descriptor );
  -         return descriptor;
  -      }
  -   }
  -
  -   /**
  -    * Register specified descriptor and associated with specified ClassLoader.
  -    *
  -    * @param descriptor the descriptor
  -    * @param classLoader the ClassLoader
  -    */
  -   public synchronized void registerDescriptor( final ClassDescriptor descriptor,
  -                                   final ClassLoader classLoader )
  -   {
  -      if ( null == descriptor )
  -      {
  -         throw new NullPointerException( "descriptor" );
  -      }
  -      if ( null == classLoader )
  -      {
  -         throw new NullPointerException( "classLoader" );
  -      }
  -      final Map cache = getClassLoaderCache( classLoader );
  -      cache.put( descriptor.getName(), descriptor );
  -   }
  -
  -   /**
  -    * Get Cache for specified ClassLoader.
  -    *
  -    * @param classLoader the ClassLoader to get cache for
  -    * @return the Map/Cache for ClassLoader
  -    */
  -   private synchronized Map getClassLoaderCache( final ClassLoader classLoader )
  -   {
  -      Map map = (Map) m_cache.get( classLoader );
  -      if ( null == map )
  -      {
  -         map = new WeakHashMap();
  -         m_cache.put( classLoader, map );
  -      }
  -      return map;
  -   }
  +    /**
  +     * Class used to access the MetaData.
  +     */
  +    private MetaClassAccessor m_accessor = new DefaultMetaClassAccessor();
  +
  +    /**
  +     * The cache in which info objects are stored.
  +     * This cache stores maps for ClassLoaders which in
  +     * turn stores info for particular classes in
  +     * classloader.
  +     */
  +    private final Map m_cache = new WeakHashMap();
  +
  +    /**
  +     * Set the MetaClassAccessor to use to locate
  +     * ClassDescriptor objects.
  +     *
  +     * @param accessor the MetaClassAccessor
  +     */
  +    public synchronized void setAccessor( final MetaClassAccessor accessor )
  +    {
  +        if( null == accessor )
  +        {
  +            throw new NullPointerException( "accessor" );
  +        }
  +        m_accessor = accessor;
  +    }
  +
  +    /**
  +     * Remove all descriptors from registry.
  +     */
  +    public synchronized void clear()
  +    {
  +        m_cache.clear();
  +    }
  +
  +    /**
  +     * @see MetaClassAccessor#getClassDescriptor
  +     */
  +    public synchronized ClassDescriptor getClassDescriptor( final String classname,
  +                                                            final ClassLoader classLoader,
  +                                                            final MetaClassAccessor accessor )
  +        throws MetaClassException
  +    {
  +        if( null == classname )
  +        {
  +            throw new NullPointerException( "classname" );
  +        }
  +        if( null == classLoader )
  +        {
  +            throw new NullPointerException( "classLoader" );
  +        }
  +        final Map cache = getClassLoaderCache( classLoader );
  +        ClassDescriptor descriptor = (ClassDescriptor)cache.get( classname );
  +        if( null != descriptor )
  +        {
  +            return descriptor;
  +        }
  +        else
  +        {
  +            descriptor =
  +                m_accessor.getClassDescriptor( classname,
  +                                               classLoader,
  +                                               accessor );
  +            cache.put( classname, descriptor );
  +            return descriptor;
  +        }
  +    }
  +
  +    /**
  +     * Register specified descriptor and associated with specified ClassLoader.
  +     *
  +     * @param descriptor the descriptor
  +     * @param classLoader the ClassLoader
  +     */
  +    public synchronized void registerDescriptor( final ClassDescriptor descriptor,
  +                                                 final ClassLoader classLoader )
  +    {
  +        if( null == descriptor )
  +        {
  +            throw new NullPointerException( "descriptor" );
  +        }
  +        if( null == classLoader )
  +        {
  +            throw new NullPointerException( "classLoader" );
  +        }
  +        final Map cache = getClassLoaderCache( classLoader );
  +        cache.put( descriptor.getName(), descriptor );
  +    }
  +
  +    /**
  +     * Get Cache for specified ClassLoader.
  +     *
  +     * @param classLoader the ClassLoader to get cache for
  +     * @return the Map/Cache for ClassLoader
  +     */
  +    private synchronized Map getClassLoaderCache( final ClassLoader classLoader )
  +    {
  +        Map map = (Map)m_cache.get( classLoader );
  +        if( null == map )
  +        {
  +            map = new WeakHashMap();
  +            m_cache.put( classLoader, map );
  +        }
  +        return map;
  +    }
   }
  
  
  
  1.6       +8 -8      spice/sandbox/metaclass/src/java/org/realityforge/metaclass/introspector/MetaClassIntrospector.java
  
  Index: MetaClassIntrospector.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/introspector/MetaClassIntrospector.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MetaClassIntrospector.java	28 Oct 2003 08:07:33 -0000	1.5
  +++ MetaClassIntrospector.java	28 Oct 2003 08:15:01 -0000	1.6
  @@ -15,7 +15,7 @@
    * {@link java.beans.Introspector} class does for Java Beans.
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.5 $ $Date: 2003/10/28 08:07:33 $
  + * @version $Revision: 1.6 $ $Date: 2003/10/28 08:15:01 $
    */
   public final class MetaClassIntrospector
   {
  @@ -39,13 +39,13 @@
        */
       private static final CachingMetaClassAccessor c_cachingAccessor = new CachingMetaClassAccessor();
   
  -   /**
  -    * Wrapper Accessor that is passed to the above accessor
  -    * to retrieve ClassDescriptors. Ensures that no Accessor
  -    * can get a direct reference to the CachingMetaClassAccessor
  -    * and thus subvert descriptor loading process.
  -    */
  -   private static final WrapperMetaClassAccessor c_wrapperAccessor = new WrapperMetaClassAccessor( c_cachingAccessor );
  +    /**
  +     * Wrapper Accessor that is passed to the above accessor
  +     * to retrieve ClassDescriptors. Ensures that no Accessor
  +     * can get a direct reference to the CachingMetaClassAccessor
  +     * and thus subvert descriptor loading process.
  +     */
  +    private static final WrapperMetaClassAccessor c_wrapperAccessor = new WrapperMetaClassAccessor( c_cachingAccessor );
   
       /**
        * Flush all of the Introspector's internal caches.  This method is
  
  
  
  1.3       +14 -14    spice/sandbox/metaclass/src/java/org/realityforge/metaclass/introspector/WrapperMetaClassAccessor.java
  
  Index: WrapperMetaClassAccessor.java
  ===================================================================
  RCS file: /cvsroot/spice/spice/sandbox/metaclass/src/java/org/realityforge/metaclass/introspector/WrapperMetaClassAccessor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WrapperMetaClassAccessor.java	28 Oct 2003 07:01:01 -0000	1.2
  +++ WrapperMetaClassAccessor.java	28 Oct 2003 08:15:01 -0000	1.3
  @@ -15,7 +15,7 @@
    * get to the underlying accessor implementation.
    *
    * @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
  - * @version $Revision: 1.2 $ $Date: 2003/10/28 07:01:01 $
  + * @version $Revision: 1.3 $ $Date: 2003/10/28 08:15:01 $
    */
   public class WrapperMetaClassAccessor
       implements MetaClassAccessor
  @@ -25,19 +25,19 @@
        */
       private final MetaClassAccessor m_accessor;
   
  -   /**
  -    * Create an accessor for specified accessor.
  -    *
  -    * @param accessor the accessor
  -    */
  -   public WrapperMetaClassAccessor( final MetaClassAccessor accessor )
  -   {
  -      if( null == accessor )
  -      {
  -         throw new NullPointerException( "accessor" );
  -      }
  -      m_accessor = accessor;
  -   }
  +    /**
  +     * Create an accessor for specified accessor.
  +     *
  +     * @param accessor the accessor
  +     */
  +    public WrapperMetaClassAccessor( final MetaClassAccessor accessor )
  +    {
  +        if( null == accessor )
  +        {
  +            throw new NullPointerException( "accessor" );
  +        }
  +        m_accessor = accessor;
  +    }
   
       /**
        * @see MetaClassAccessor#getClassDescriptor
  
  
  


-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.