bloritsch 02/02/07 08:55:33
Modified: src/scratchpad/org/apache/avalon/excalibur/system
AbstractContainer.java
Log:
removed m_validator because it causes problems when you extend
AbstractContainer with new lifecycle interfaces. The ContainerManager does
validate lifecycle with ValidatorManager though.
Revision Changes Path
1.13 +1 -13
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/AbstractContainer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AbstractContainer.java 7 Feb 2002 16:50:50 -0000 1.12
+++ AbstractContainer.java 7 Feb 2002 16:55:33 -0000 1.13
@@ -36,14 +36,12 @@
* Manager can expose that to the instantiating class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.12 $ $Date: 2002/02/07 16:50:50 $
+ * @version CVS $Revision: 1.13 $ $Date: 2002/02/07 16:55:33 $
*/
public abstract class AbstractContainer
extends AbstractLogEnabled
implements Contextualizable, Composable, Configurable, Initializable,
Disposable, Container
{
- protected final ComponentStateValidator m_validator = new
ComponentStateValidator( this );
-
protected Context m_context;
private ComponentManager m_manager;
protected ComponentManager m_childManager;
@@ -61,7 +59,6 @@
*/
public void enableLogging( Logger logger )
{
- m_validator.checkLogEnabled();
super.enableLogging( logger );
}
@@ -72,8 +69,6 @@
public void contextualize( Context containerContext )
throws ContextException
{
- m_validator.checkContextualized();
-
m_context = containerContext;
m_logManager = (LoggerManager)
m_context.get(Container.LOGGER_MANAGER);
@@ -116,7 +111,6 @@
public void configure( Configuration configElement )
throws ConfigurationException
{
- m_validator.checkConfigured();
m_configuration = configElement;
Map managerMap = new HashMap();
m_childManager = new ContainerComponentManager( managerMap,
m_manager );
@@ -294,7 +288,6 @@
public void compose( ComponentManager manager )
throws ComponentException
{
- m_validator.checkComposed();
m_manager = manager;
}
@@ -304,7 +297,6 @@
public void initialize()
throws Exception
{
- m_validator.checkInitialized();
Iterator i = m_components.iterator();
FixedSizeBuffer buffer = new FixedSizeBuffer( m_components.size() );
@@ -350,8 +342,6 @@
*/
public void dispose()
{
- m_validator.checkDisposed();
-
Iterator i = m_components.iterator();
while ( i.hasNext() )
@@ -389,8 +379,6 @@
* @return the child component manager
*/
protected final ComponentManager getComponentManager() {
- m_validator.checkActive();
-
return m_childManager;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
