donaldp 02/05/18 20:44:33
Modified: src/java/org/apache/avalon/phoenix/components/application
AppLifecycleHelper.java DefaultApplication.java
Log:
ListenerSupport is now created in DefaultApplication and passed to helper
rather than vice versa
Revision Changes Path
1.12 +4 -8
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/AppLifecycleHelper.java
Index: AppLifecycleHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/AppLifecycleHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AppLifecycleHelper.java 19 May 2002 03:21:55 -0000 1.11
+++ AppLifecycleHelper.java 19 May 2002 03:44:33 -0000 1.12
@@ -38,8 +38,7 @@
/**
* Object to support notification of ApplicationListeners.
*/
- private ListenerSupport m_listenerSupport =
- new ListenerSupport();
+ private final ListenerSupport m_listenerSupport;
private final LifecycleHelper m_lifecycleHelper = new LifecycleHelper();
private final ExportHelper m_exportHelper = new ExportHelper();
@@ -62,9 +61,11 @@
* @param context the ApplicationContext in which this helper operates
*/
protected AppLifecycleHelper( final Application application,
- final ApplicationContext context )
+ final ApplicationContext context,
+ final ListenerSupport listenerSupport )
{
m_context = context;
+ m_listenerSupport = listenerSupport;
m_blockAccessor = new BlockAccessor( context, application );
m_listenerAccessor = new ListenerAccessor( context );
}
@@ -112,11 +113,6 @@
getLogger().error( message );
System.err.println( message );
}
- }
-
- ListenerSupport getListenerSupport()
- {
- return m_listenerSupport;
}
/**
1.21 +12 -8
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java
Index: DefaultApplication.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/DefaultApplication.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultApplication.java 19 May 2002 03:21:55 -0000 1.20
+++ DefaultApplication.java 19 May 2002 03:44:33 -0000 1.21
@@ -50,7 +50,12 @@
private HashMap m_entrys = new HashMap();
private SarMetaData m_sarMetaData;
- public DefaultApplication( SarMetaData sarMetaData )
+ /**
+ * Object to support notification of ApplicationListeners.
+ */
+ private ListenerSupport m_listenerSupport = new ListenerSupport();
+
+ public DefaultApplication( final SarMetaData sarMetaData )
{
m_sarMetaData = sarMetaData;
}
@@ -174,7 +179,7 @@
public void setApplicationContext( final ApplicationContext context )
{
m_context = context;
- m_lifecycle = new AppLifecycleHelper( this, m_context );
+ m_lifecycle = new AppLifecycleHelper( this, m_context,
m_listenerSupport );
setupLogger( m_lifecycle, "lifecycle" );
}
@@ -342,13 +347,12 @@
if( PHASE_STARTUP == name )
{
//... for startup, so indicate to applicable listeners
- m_lifecycle.getListenerSupport().
- fireApplicationStartingEvent( m_sarMetaData );
+ m_listenerSupport.fireApplicationStartingEvent( m_sarMetaData );
}
else
{
//... for shutdown, so indicate to applicable listeners
- m_lifecycle.getListenerSupport().applicationStopping();
+ m_listenerSupport.applicationStopping();
}
//Process blocks, one by one.
@@ -381,7 +385,7 @@
final String message =
REZ.getString( "app.error.run-phase", name, block,
e.getMessage() );
getLogger().error( message, e );
- m_lifecycle.getListenerSupport().applicationFailure( e );
+ m_listenerSupport.applicationFailure( e );
throw e;
}
@@ -397,12 +401,12 @@
if( PHASE_STARTUP == name )
{
//... for startup, so indicate to applicable listeners
- m_lifecycle.getListenerSupport().applicationStarted();
+ m_listenerSupport.applicationStarted();
}
else
{
//... for shutdown, so indicate to applicable listeners
- m_lifecycle.getListenerSupport().applicationStopped();
+ m_listenerSupport.applicationStopped();
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
