avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/dependency DependencyMap.java
Date Mon, 19 Aug 2002 12:44:28 GMT
donaldp     2002/08/19 05:44:28

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/dependency
                        DependencyMap.java
  Log:
  Remove the notion of addition/subtraction of child maps. Will be implemented via the CompoentStore.
  
  Revision  Changes    Path
  1.14      +4 -37     jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/dependency/DependencyMap.java
  
  Index: DependencyMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/dependency/DependencyMap.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DependencyMap.java	19 Aug 2002 12:30:42 -0000	1.13
  +++ DependencyMap.java	19 Aug 2002 12:44:28 -0000	1.14
  @@ -26,13 +26,6 @@
   public class DependencyMap
   {
       /**
  -     * Parent DependencyMap. Components in parent
  -     * DependencyMap are potential Providers for services
  -     * if no component in current assembly satisfies dependency.
  -     */
  -    private final DependencyMap m_parent;
  -
  -    /**
        * The child {@link DependencyMap} objects.
        * Possible consumers of services in this assembly.
        */
  @@ -46,37 +39,10 @@
   
       public DependencyMap( final ComponentStore store )
       {
  -        this( null, store );
  -    }
  -
  -    public DependencyMap( final DependencyMap parent,
  -                          final ComponentStore store )
  -    {
  -        m_parent = parent;
           m_store = store;
       }
   
       /**
  -     * Add child dependency graph.
  -     *
  -     * @param child the child map
  -     */
  -    public void addChild( final DependencyMap child )
  -    {
  -        m_children.add( child );
  -    }
  -
  -    /**
  -     * Remove child dependency graph.
  -     *
  -     * @param child the child map
  -     */
  -    public void removeChild( final DependencyMap child )
  -    {
  -        m_children.remove( child );
  -    }
  -
  -    /**
        * Get the serilized graph of {@link ComponentEntry} objects
        * required when starting up all the components. This makes sure
        * that all providers occur before their coresponding
  @@ -292,9 +258,10 @@
               return component;
           }
   
  -        if( null != m_parent )
  +        final ComponentStore parent = m_store.getParent();
  +        if( null != parent )
           {
  -            return m_parent.getComponent( name );
  +            return parent.getComponent( name );
           }
   
           //Should never happen if Verifier passed checks
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message