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/metadata DependencyMetaData.java
Date Tue, 18 Jun 2002 01:40:26 GMT
donaldp     2002/06/17 18:40:26

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/verifier
                        AssemblyVerifier.java
               containerkit/src/java/org/apache/excalibur/containerkit/kernel
                        DependencyGraph.java
               containerkit/src/java/org/apache/excalibur/containerkit/metadata
                        DependencyMetaData.java
  Log:
  Dependency.getName() --> getProviderName()
  
  Revision  Changes    Path
  1.18      +3 -3      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java
  
  Index: AssemblyVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- AssemblyVerifier.java	16 Jun 2002 11:35:22 -0000	1.17
  +++ AssemblyVerifier.java	18 Jun 2002 01:40:26 -0000	1.18
  @@ -250,7 +250,7 @@
   
           for( int i = 0; i < deps.length; i++ )
           {
  -            final String name = deps[ i ].getName();
  +            final String name = deps[ i ].getProviderName();
               final ComponentMetaData other = getComponentMetaData( name, components );
               dependencies.add( other );
           }
  @@ -289,7 +289,7 @@
   
           for( int i = 0; i < roles.length; i++ )
           {
  -            final String providerName = roles[ i ].getName();
  +            final String providerName = roles[ i ].getProviderName();
               final String roleName = roles[ i ].getRole();
               final ServiceDesignator service =
                   info.getDependency( roleName ).getService();
  
  
  
  1.2       +2 -2      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/DependencyGraph.java
  
  Index: DependencyGraph.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/DependencyGraph.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DependencyGraph.java	14 Jun 2002 07:31:12 -0000	1.1
  +++ DependencyGraph.java	18 Jun 2002 01:40:26 -0000	1.2
  @@ -111,7 +111,7 @@
               final DependencyMetaData dependency =
                   component.getDependency( descriptors[ i ].getRole() );
               final ComponentMetaData other =
  -                getComponent( dependency.getName(), components );
  +                getComponent( dependency.getProviderName(), components );
               visitcomponent( other, components, true, done, order );
           }
       }
  @@ -140,7 +140,7 @@
   
               for( int j = 0; j < roles.length; j++ )
               {
  -                final String depends = roles[ j ].getName();
  +                final String depends = roles[ j ].getProviderName();
                   if( depends.equals( name ) )
                   {
                       visitcomponent( other, components, false, done, order );
  
  
  
  1.4       +11 -10    jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/DependencyMetaData.java
  
  Index: DependencyMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/DependencyMetaData.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DependencyMetaData.java	18 Jun 2002 01:37:40 -0000	1.3
  +++ DependencyMetaData.java	18 Jun 2002 01:40:26 -0000	1.4
  @@ -28,26 +28,27 @@
       private final String m_role;
   
       /**
  -     * the name of the component metadata instance that represents a component 
  +     * the name of the component metadata instance that represents a component
        * type that is capable of fullfilling the dependency.
        */
  -    private final String m_name;
  +    private final String m_providerName;
   
       /**
        * Create MetaData with specified name and role.
        *
        * @param role the name client uses to access component
  -     * @param name the name of <code>ComponentMetaData</code> instance
  +     * @param providerName the name of <code>ComponentMetaData</code> instance
        *   that is associated as a service provider
        */
  -    public DependencyMetaData( final String role, final String name )
  +    public DependencyMetaData( final String role,
  +                               final String providerName )
       {
           m_role = role;
  -        m_name = name;
  +        m_providerName = providerName;
       }
   
       /**
  -     * Return the name that will be used by a component instance to access a 
  +     * Return the name that will be used by a component instance to access a
        * dependent service.
        *
        * @return the name that the client component will use to access dependency.
  @@ -59,13 +60,13 @@
       }
   
       /**
  -     * Return the name of a <code>ComponentMetaData</code> instance that will
used to 
  +     * Return the name of a <code>ComponentMetaData</code> instance that will
used to
        * fulfill the dependency.
        *
        * @return the name of the Component that will provide the dependency.
        */
  -    public String getName()
  +    public String getProviderName()
       {
  -        return m_name;
  +        return m_providerName;
       }
   }
  
  
  

--
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