cvs commit: jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/component/test ExcaliburComponentManagerTestCase.java

[leif]

leif        02/02/20 22:18:11

  Modified:    src/test/org/apache/avalon/excalibur/component/test
                        ExcaliburComponentManagerTestCase.java
  Log:
  Make the quick changes to get things working with javac more clean.
  
  Revision  Changes    Path
  1.4       +11 -11    
jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/component/test/ExcaliburComponentManagerTestCase.java
  
  Index: ExcaliburComponentManagerTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/component/test/ExcaliburComponentManagerTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExcaliburComponentManagerTestCase.java    20 Feb 2002 15:06:39 -0000      
1.3
  +++ ExcaliburComponentManagerTestCase.java    21 Feb 2002 06:18:11 -0000      
1.4
  @@ -39,7 +39,7 @@
    * it is correctly handling component lifestyle management.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Ryan Shaw</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class ExcaliburComponentManagerTestCase extends TestCase 
   {
  @@ -183,7 +183,7 @@
       {
           private final ComponentStateValidator m_validator = new 
ComponentStateValidator( this );
           
  -        protected ComponentManager m_manager;
  +        protected ComponentManager m_innerManager;
           protected Kid              m_kid;
           
           public void enableLogging( Logger logger )
  @@ -197,9 +197,9 @@
           {
               m_validator.checkComposed();
   
  -            m_manager = manager;
  +            m_innerManager = manager;
               
  -            m_kid = (Kid) m_manager.lookup( Kid.ROLE );
  +            m_kid = (Kid) m_innerManager.lookup( Kid.ROLE );
           }
   
           public void dispose()
  @@ -224,7 +224,7 @@
           public void dispose()
           {
               super.dispose();
  -            AbstractGoodParent.this.m_manager.release( m_kid );
  +            m_innerManager.release( m_kid );
           }
       }
       
  @@ -325,7 +325,7 @@
       public static abstract class AbstractBadCircularKid extends AbstractKid
           implements Composable
       {
  -        protected ComponentManager m_manager;
  +        protected ComponentManager m_innerManager;
           protected Mom              m_mom;
           protected Dad              m_dad;
           
  @@ -333,7 +333,7 @@
           {
               m_validator.checkComposed();
               
  -            m_manager = manager;
  +            m_innerManager = manager;
           }
   
           public String getName()
  @@ -342,8 +342,8 @@
               
               try 
               {
  -                m_mom = (Mom) m_manager.lookup( Mom.ROLE );
  -                m_dad = (Dad) m_manager.lookup( Dad.ROLE );
  +                m_mom = (Mom) m_innerManager.lookup( Mom.ROLE );
  +                m_dad = (Dad) m_innerManager.lookup( Dad.ROLE );
               }
               catch ( ComponentException ce )
               {
  @@ -360,8 +360,8 @@
           {
               super.dispose();
               
  -            AbstractGoodCircularKid.this.m_manager.release( m_mom );
  -            AbstractGoodCircularKid.this.m_manager.release( m_dad );
  +            m_innerManager.release( m_mom );
  +            m_innerManager.release( m_dad );
           }
       }
   
  
  
  

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