donaldp 02/05/18 02:00:51
Modified: src/java/org/apache/avalon/phoenix/interfaces
Application.java
src/java/org/apache/avalon/phoenix/components/application
DefaultApplication.java
Log:
Don't require that blocks returned from Application object implement the
Block interface.
Revision Changes Path
1.9 +1 -3
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Application.java
Index: Application.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Application.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Application.java 10 May 2002 11:08:57 -0000 1.8
+++ Application.java 18 May 2002 09:00:50 -0000 1.9
@@ -7,8 +7,6 @@
*/
package org.apache.avalon.phoenix.interfaces;
-import org.apache.avalon.phoenix.Block;
-
/**
* The Application is a self-contained component that performs a specific
* function.
@@ -27,5 +25,5 @@
String[] getBlockNames();
- Block getBlock( String name );
+ Object getBlock( String name );
}
1.17 +1 -2
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultApplication.java 10 May 2002 11:08:56 -0000 1.16
+++ DefaultApplication.java 18 May 2002 09:00:50 -0000 1.17
@@ -17,7 +17,6 @@
import org.apache.avalon.framework.activity.Startable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.phoenix.ApplicationEvent;
-import org.apache.avalon.phoenix.Block;
import org.apache.avalon.phoenix.interfaces.Application;
import org.apache.avalon.phoenix.interfaces.ApplicationContext;
import org.apache.avalon.phoenix.interfaces.ApplicationException;
@@ -185,7 +184,7 @@
return (String[])m_entrys.keySet().toArray( new String[ 0 ] );
}
- public Block getBlock( final String name )
+ public Object getBlock( final String name )
{
final BlockEntry entry = (BlockEntry)m_entrys.get( name );
if( null == entry ) return null;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
