cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/lifecycle ComponentEntry.java

[donaldp]

donaldp     02/05/18 20:13:25

  Modified:    src/java/org/apache/avalon/phoenix/components/application
                        BlockEntry.java
  Removed:     src/java/org/apache/avalon/phoenix/components/lifecycle
                        ComponentEntry.java
  Log:
  Merge ComponentEntry back into BlockEntry.
  
  Revision  Changes    Path
  1.12      +28 -5     
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java
  
  Index: BlockEntry.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/BlockEntry.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BlockEntry.java   18 May 2002 09:03:49 -0000      1.11
  +++ BlockEntry.java   19 May 2002 03:13:25 -0000      1.12
  @@ -7,7 +7,7 @@
    */
   package org.apache.avalon.phoenix.components.application;
   
  -import org.apache.avalon.phoenix.components.lifecycle.ComponentEntry;
  +import org.apache.avalon.phoenix.components.lifecycle.State;
   import org.apache.avalon.phoenix.metadata.BlockMetaData;
   import org.apache.avalon.phoenix.metainfo.BlockInfo;
   import org.apache.avalon.phoenix.metainfo.ServiceDescriptor;
  @@ -18,22 +18,44 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
    */
   public class BlockEntry
  -    extends ComponentEntry
   {
  +    private Object m_object;
  +    private State m_state;
  +
       private BlockMetaData m_blockMetaData;
       private BlockInvocationHandler m_invocationHandler;
   
       public BlockEntry( final BlockMetaData blockMetaData )
       {
  -        super( blockMetaData.getName() );
  +        setState( State.VOID );
           m_blockMetaData = blockMetaData;
       }
   
  +    public String getName()
  +    {
  +        return getMetaData().getName();
  +    }
  +
       public BlockMetaData getMetaData()
       {
           return m_blockMetaData;
       }
   
  +    public final synchronized State getState()
  +    {
  +        return m_state;
  +    }
  +
  +    public final synchronized void setState( final State state )
  +    {
  +        m_state = state;
  +    }
  +
  +    public synchronized Object getObject()
  +    {
  +        return m_object;
  +    }
  +
       public synchronized void setObject( final Object object )
       {
           invalidate();
  @@ -44,7 +66,7 @@
               final Class[] interfaces = getServiceClasses( object, 
blockInfo.getServices() );
               m_invocationHandler = new BlockInvocationHandler( object, 
interfaces );
           }
  -        super.setObject( object );
  +        m_object = object;
       }
   
       public synchronized Object getProxy()
  @@ -66,7 +88,8 @@
               m_invocationHandler.invalidate();
               m_invocationHandler = null;
           }
  -        super.invalidate();
  +        m_state = State.VOID;
  +        m_object = null;
       }
   
       private Class[] getServiceClasses( final Object block, final 
ServiceDescriptor[] services )
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>