cvs commit: jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/info ContextDescriptor.java DependencyDescriptor.java

[do...@apache.org]

donaldp     2002/09/07 21:55:36

  Modified:    info/src/java/org/apache/avalon/framework/info
                        ContextDescriptor.java DependencyDescriptor.java
  Log:
  Namoing fixcups.
  
  Revision  Changes    Path
  1.4       +14 -4     jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/info/ContextDescriptor.java
  
  Index: ContextDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/info/ContextDescriptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContextDescriptor.java	31 Aug 2002 13:58:18 -0000	1.3
  +++ ContextDescriptor.java	8 Sep 2002 04:55:36 -0000	1.4
  @@ -10,12 +10,13 @@
   import java.util.Properties;
   
   /**
  - * A descriptor describing the Context that the Component
  + * A descriptor describing the Context that the component
    * is passed to describe information about Runtime environment
    * of Component. It contains information such as;
    * <ul>
  - *   <li>classname: the classname of the Context type if it
  - *       differs from base Context class (ie BlockContext).</li>
  + *   <li>type: the type of the Context if it
  + *       differs from base Context class (Such as Phoenixes
  + *       BlockContext).</li>
    *   <li>entrys: a list of entrys contained in context</li>
    * </ul>
    *
  @@ -29,7 +30,16 @@
   public class ContextDescriptor
       extends FeatureDescriptor
   {
  +    /**
  +     * The type of the context. (ie a name of the context
  +     * interface that is required by the component).
  +     */
       private final String m_type;
  +
  +    /**
  +     * The set of entrys to populate the context with
  +     * for this component.
  +     */
       private final EntryDescriptor[] m_entrys;
   
       /**
  
  
  
  1.4       +14 -14    jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/info/DependencyDescriptor.java
  
  Index: DependencyDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/info/DependencyDescriptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DependencyDescriptor.java	8 Sep 2002 04:44:36 -0000	1.3
  +++ DependencyDescriptor.java	8 Sep 2002 04:55:36 -0000	1.4
  @@ -14,13 +14,13 @@
    * a particular Component. This class contains information
    * about;
    * <ul>
  - *   <li>role: the name component uses to look up dependency</li>
  + *   <li>key: the name component uses to look up dependency</li>
    *   <li>service: the class/interface that the dependency must provide</li>
    * </ul>
    *
    * <p>Also associated with each dependency is a set of arbitrary
    * attributes that can be used to store extra information
  - * about dependency. See {@link org.apache.avalon.framework.info.ComponentDescriptor} for example
  + * about dependency. See {@link ComponentDescriptor} for example
    * of how to declare the container specific attributes.</p>
    *
    * <p>Possible uses for the attributes are to declare container
  @@ -45,7 +45,7 @@
       /**
        * The service class/interface that the dependency must provide.
        */
  -    private final String m_implementationKey;
  +    private final String m_serviceKey;
   
       /**
        * True if dependency is optional, false otherwise.
  @@ -55,17 +55,17 @@
       /**
        * Constructor a dependency sans Attributes.
        */
  -    public DependencyDescriptor( final String role,
  -                                 final String implementationKey )
  +    public DependencyDescriptor( final String key,
  +                                 final String service )
       {
  -        this( role, implementationKey, false, null );
  +        this( key, service, false, null );
       }
   
       /**
        * Constructor that has all parts sans parent.
        */
       public DependencyDescriptor( final String key,
  -                                 final String implementationKey,
  +                                 final String service,
                                    final boolean optional,
                                    final Properties attributes )
       {
  @@ -75,13 +75,13 @@
           {
               throw new NullPointerException( "key" );
           }
  -        if( null == implementationKey )
  +        if( null == service )
           {
  -            throw new NullPointerException( "implementationKey" );
  +            throw new NullPointerException( "service" );
           }
   
           m_key = key;
  -        m_implementationKey = implementationKey;
  +        m_serviceKey = service;
           m_optional = optional;
       }
   
  @@ -96,15 +96,15 @@
       }
   
       /**
  -     * Return the service class/interface descriptor that describes the
  +     * Return the service class/interface name that describes the
        * dependency must fulfilled by a provider.
        *
        * @return a reference to service descriptor that describes the fulfillment
        *  obligations that must be met by a service provider.
        */
  -    public String getImplementationKey()
  +    public String getService()
       {
  -        return m_implementationKey;
  +        return m_serviceKey;
       }
   
       /**
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>