cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components CocoonComponentManager.java

[cziegeler]

cziegeler    2003/10/22 08:48:51

  Modified:    src/java/org/apache/cocoon/components
                        CocoonComponentManager.java
  Log:
  Remove obsolete code
  
  Revision  Changes    Path
  1.26      +3 -39     
cocoon-2.2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
  
  Index: CocoonComponentManager.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- CocoonComponentManager.java       22 Oct 2003 15:37:50 -0000      1.25
  +++ CocoonComponentManager.java       22 Oct 2003 15:48:51 -0000      1.26
  @@ -53,7 +53,6 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
  -import org.apache.excalibur.source.SourceResolver;
   
   import java.util.ArrayList;
   import java.util.Iterator;
  @@ -72,13 +71,9 @@
    * @version CVS $Id$
    */
   public final class CocoonComponentManager
  -implements SourceResolver, ServiceManager
  +implements ServiceManager
   {
   
  -
  -    /** The configured [EMAIL PROTECTED] SourceResolver} */
  -    private SourceResolver sourceResolver;
  -
       /** The parent component manager for implementing parent aware 
components */
       private ServiceManager parentManager;
   
  @@ -107,21 +102,7 @@
        */
       public Object lookup( final String role )
       throws ServiceException {
  -        if( null == role ) {
  -            final String message =
  -                "ComponentLocator Attempted to retrieve component with null 
role.";
  -
  -            throw new ServiceException( role, message );
  -        }
  -        if ( role.equals(SourceResolver.ROLE) ) {
  -            if ( null == this.sourceResolver ) {
  -                this.sourceResolver = (SourceResolver) parentManager.lookup( 
role );
  -            }
  -            return this;
  -        }
  -
  -
  -        return component;
  +        return parentManager.lookup(role);
       }
   
       /**
  @@ -129,24 +110,7 @@
        * ComponentHandler, and let's the ComponentHandler take care of the 
actual work.
        */
       public void release( final Object component ) {
  -        if( null == component ) {
  -            return;
  -        }
  -
  -        if ( component == this ) {
  -            return;
  -        }
           parentManager.release( component);
  -    }
  -
  -    /**
  -     * Dispose
  -     */
  -    public void dispose() {
  -        if ( null != this.sourceResolver ) {
  -            parentManager.release( this.sourceResolver );
  -            this.sourceResolver = null;
  -        }
       }
   
       /* (non-Javadoc)