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/composition-spi/src/java/org/apache/avalon/composition/model ContainmentModel.java
Date Sun, 27 Jul 2003 14:58:39 GMT
mcconnell    2003/07/27 07:58:39

  Modified:    merlin/composition-spi/src/java/org/apache/avalon/composition/model
                        ContainmentModel.java
  Log:
  Simpliciation of the interface by combining the addContainment Profile and addDeploymentProfile
anduer a single addModel operation.
  
  Revision  Changes    Path
  1.12      +9 -9      avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/model/ContainmentModel.java
  
  Index: ContainmentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ContainmentModel.java	27 Jul 2003 03:15:36 -0000	1.11
  +++ ContainmentModel.java	27 Jul 2003 14:58:39 -0000	1.12
  @@ -114,13 +114,13 @@
   
      /**
       * Addition of a new subsidiary model within
  -    * the containment context using the supplied profile.
  +    * the containment context using a supplied profile.
       *
  -    * @param profile a containment of deployment profile 
  -    * @return the model created from  the profile
  +    * @param profile a containment or deployment profile 
  +    * @return the model based on the supplied profile
       * @exception ModelException if an error occurs during model establishment
       */
  -    Model addProfile( Profile profile ) throws ModelException;
  +    Model addModel( Profile profile ) throws ModelException;
   
      /**
       * Addition of a new instance of a deployment model within
  @@ -130,8 +130,8 @@
       * @return the deployment model
       * @exception ModelException if an error occurs during model establishment
       */
  -    DeploymentModel addDeploymentProfile( DeploymentProfile profile ) 
  -      throws ModelException;
  +    //DeploymentModel addDeploymentProfile( DeploymentProfile profile ) 
  +    //  throws ModelException;
   
       // TODO: replaceDeploymentProfile
       // TODO: removeDeploymentProfile
  @@ -144,8 +144,8 @@
       * @return the composition model
       * @exception ModelException if an error occurs during model establishment
       */
  -    ContainmentModel addContainmentProfile( ContainmentProfile profile ) 
  -      throws ModelException;
  +    //ContainmentModel addContainmentProfile( ContainmentProfile profile ) 
  +    //  throws ModelException;
   
       // TODO: replaceContainmentProfile
       // TODO: removeContainmentProfile
  
  
  

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


Mime
View raw message