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

[cziegeler]

cziegeler    2003/10/19 10:31:13

  Modified:    src/java/org/apache/cocoon/components
                        CocoonComponentManager.java
  Log:
  Cleaning up code
  
  Revision  Changes    Path
  1.21      +7 -11     
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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CocoonComponentManager.java       19 Oct 2003 15:58:15 -0000      1.20
  +++ CocoonComponentManager.java       19 Oct 2003 17:31:13 -0000      1.21
  @@ -50,8 +50,6 @@
   */
   package org.apache.cocoon.components;
   
  -import java.io.IOException;
  -import java.net.MalformedURLException;
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
  @@ -68,15 +66,13 @@
   import org.apache.cocoon.Processor;
   import org.apache.cocoon.environment.Environment;
   import org.apache.cocoon.xml.XMLConsumer;
  -import org.apache.excalibur.source.Source;
  -import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceResolver;
   
   /**
    * Cocoon Component Manager.
    * This manager extends the [EMAIL PROTECTED] ExcaliburComponentManager}
    * by a special lifecycle handling for a [EMAIL PROTECTED] 
RequestLifecycleComponent}
  - * and by handling the lookup of the [EMAIL PROTECTED] SourceResolver}.
  + * 
    * WARNING: This is a "private" Cocoon core class - do NOT use this class
    * directly - and do not assume that a [EMAIL PROTECTED] 
org.apache.avalon.framework.service.ServiceManager} you get
    * via the compose() method is an instance of CocoonComponentManager.
  @@ -561,7 +557,7 @@
               final Iterator iter = 
this.requestLifecycleComponents.values().iterator();
               while (iter.hasNext()) {
                   final Object[] o = (Object[])iter.next();
  -                final Object component = (Object)o[0];
  +                final Object component = o[0];
                   ((CocoonComponentManager)o[1]).releaseRLComponent( component 
);
               }
               this.requestLifecycleComponents.clear();
  @@ -569,13 +565,13 @@
   
           for(int i = 0; i < autoreleaseComponents.size(); i++) {
               final Object[] o = (Object[])autoreleaseComponents.get(i);
  -            final Object component = (Object)o[0];
  +            final Object component = o[0];
               if (o[1] instanceof ServiceManager) {
                   ((ServiceManager)o[1]).release( component );
               } else {
                   ((ServiceSelector)o[1]).release( component );
                   if (o[2] != null) {
  -                    ((ServiceManager)o[2]).release( (Object)o[1] );
  +                    ((ServiceManager)o[2]).release( o[1] );
                   }
               }
           }
  @@ -632,7 +628,7 @@
           }
           final Object[] o = 
(Object[])this.requestLifecycleComponents.get(role);
           if ( null != o ) {
  -            return (Object)o[0];
  +            return o[0];
           }
           return null;
       }
  @@ -643,7 +639,7 @@
       Object getGlobalRequestLifecycleComponent(final String role) {
           final Object[] o = 
(Object[])this.getGlobalRequestLifcecycleComponents().get(role);
           if ( null != o ) {
  -            return (Object)o[0];
  +            return o[0];
           }
           return null;
       }