avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl ContainmentProfile.java
Date Mon, 09 Jun 2003 01:04:30 GMT
mcconnell    2003/06/08 18:04:29

  Modified:    merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl
                        ContainmentProfile.java
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.2       +1 -57     avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/ContainmentProfile.java
  
  Index: ContainmentProfile.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/src/java/org/apache/avalon/merlin/block/impl/ContainmentProfile.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContainmentProfile.java	29 Apr 2003 21:07:35 -0000	1.1
  +++ ContainmentProfile.java	9 Jun 2003 01:04:29 -0000	1.2
  @@ -179,11 +179,6 @@
       private final ArrayList m_profiles = new ArrayList();
   
       /**
  -     * The containers described within the scope of the container.
  -     */
  -    //private final ArrayList m_containers = new ArrayList();
  -
  -    /**
        * Consolidated service.
        */
       private ServiceDescriptor[] m_services;
  @@ -214,7 +209,6 @@
           setServices( context );
           setDependencies( context );
           setProfiles( context );
  -        //setContainers( context );
       }
   
       //--------------------------------------------------------------------------
  @@ -394,42 +388,6 @@
           return (Profile[])list.toArray( new Profile[ 0 ] );
       }
   
  -    /**
  -     * Add a container profile to this container.
  -     *
  -     * @param containers the container profiles to add to the container
  -     */
  -    //public void addContainers( ContainmentProfile[] containers )
  -    //{
  -    //    for( int i=0; i<containers.length; i++ )
  -    //    {
  -    //        addContainer( containers[i] );
  -    //    }
  -    //}
  -
  -    /**
  -     * Add a container profile to this container.
  -     *
  -     * @param container the container profile to add to the container
  -     */
  -    //public void addContainer( ContainmentProfile container )
  -    //{
  -    //    if( !m_containers.contains( container ) )
  -    //    {
  -    //        m_containers.add( container );
  -    //    }
  -    //}
  -
  -    /**
  -     * Return the set of container descriptors contained within this container.
  -     *
  -     * @return the container descriptors
  -     */
  -    //public ContainmentProfile[] getContainers()
  -    //{
  -    //    return (ContainmentProfile[])m_containers.toArray( new ContainmentProfile[ 0
] );
  -    //}
  -
       private void setProfiles( Context context )
       {
           try
  @@ -443,20 +401,6 @@
               // ignore 
           }
       }
  -
  -    //private void setContainers( Context context )
  -    //{
  -    //    try
  -    //    {
  -    //       ContainmentProfile[] profiles = 
  -    //          (ContainmentProfile[]) context.get( CONTAINERS_KEY );
  -    //        addContainers( profiles );
  -    //    }
  -    //    catch( ContextException e )
  -    //    {
  -    //        // ignore 
  -    //    }
  -    //}
   
       private void setServices( Context context )
       {
  
  
  

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


Mime
View raw message