donaldp 2002/11/09 00:36:28
Modified: component/src/java/org/apache/avalon/excalibur/component
DefaultComponentFactory.java
Log:
optimize imports
Revision Changes Path
1.15 +11 -15
jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/component/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultComponentFactory.java 7 Nov 2002 18:27:52 -0000 1.14
+++ DefaultComponentFactory.java 9 Nov 2002 08:36:27 -0000 1.15
@@ -13,14 +13,12 @@
import org.apache.avalon.excalibur.logger.LogKitManageable;
import org.apache.avalon.excalibur.pool.ObjectFactory;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.LogEnabled;
@@ -28,11 +26,9 @@
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.WrapperServiceManager;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.excalibur.container.legacy.ComponentProxyGenerator;
import org.apache.excalibur.instrument.InstrumentManageable;
import org.apache.excalibur.instrument.InstrumentManager;
@@ -246,7 +242,7 @@
final ComponentManagerProxy manager =
new ComponentManagerProxy( m_componentManager );
ContainerUtil.compose( component, manager );
-
+
// Store the mapping of the component manager to its proxy so it can
// be found to be decommissioned later.
m_composableProxies.put( component, manager );
@@ -258,7 +254,7 @@
final ServiceManagerProxy manager =
new ServiceManagerProxy( m_componentManager );
ContainerUtil.service( component, manager );
-
+
// Store the mapping of the component manager to its proxy so it can
// be found to be decommissioned later.
m_serviceableProxies.put( component, manager );
@@ -327,7 +323,7 @@
getLogger().debug( "ComponentFactory decommissioning instance of " +
m_componentClass.getName() + "." );
}
-
+
// See if we need to unwrap this component. It may have been wrapped in a
proxy
// by the ProxyGenerator.
Object decommissionComponent = m_componentProxies.remove( component );
@@ -336,22 +332,22 @@
// It was not wrapped.
decommissionComponent = component;
}
-
+
ContainerUtil.stop( decommissionComponent );
ContainerUtil.dispose( decommissionComponent );
-
+
if ( decommissionComponent instanceof Composable )
{
// A proxy will have been created. Ensure that components created by it
- // are also released.
+ // are also released.
((ComponentManagerProxy)m_composableProxies.remove(
decommissionComponent )).
releaseAll();
}
-
+
if ( decommissionComponent instanceof Serviceable )
{
// A proxy will have been created. Ensure that components created by it
- // are also released.
+ // are also released.
((ServiceManagerProxy)m_serviceableProxies.remove(
decommissionComponent )).
releaseAll();
}
@@ -460,7 +456,7 @@
extends WrapperServiceManager
{
private final ComponentManager m_realManager;
-
+
/** Use a BucketMap rather than an ArrayList as above because this will
* contain Proxy instances. And proxy instances always return false for
* equals() making a test for inclusion in the list always fail. */
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
