svn commit: rev 22820 - in avalon/trunk/runtime/composition: api/src/java/org/apache/avalon/composition/model impl/src/java/org/apache/avalon/composition/model/impl

Author: mcconnell
Date: Sun Jul 11 10:28:06 2004
New Revision: 22820

Modified:
   avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
   avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Log:
make sure addModel throws a model exception

Modified: avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
==============================================================================
--- avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java	(original)
+++ avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java	Sun Jul 11 10:28:06 2004
@@ -166,7 +166,7 @@
     * @param model the model to add 
     * @return the model 
     */
-    DeploymentModel addModel( DeploymentModel model );
+    DeploymentModel addModel( DeploymentModel model ) throws ModelException;
 
    /**
     * Remove a named model from this model.

Modified: avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
==============================================================================
--- avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java	(original)
+++ avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java	Sun Jul 11 10:28:06 2004
@@ -587,7 +587,7 @@
     * @param model a containment or component model 
     * @return the supplied model
     */
-    public DeploymentModel addModel( DeploymentModel model )
+    public DeploymentModel addModel( DeploymentModel model ) throws ModelException
     {
         final String name = model.getName();
         return addModel( name, model );