avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl DefaultContextModel.java OverrideEntryModel.java
Date Sun, 22 Feb 2004 16:22:17 GMT
mcconnell    2004/02/22 08:22:17

  Modified:    merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
                        DefaultContextModel.java OverrideEntryModel.java
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  1.11      +10 -10    avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
  
  Index: DefaultContextModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultContextModel.java	22 Feb 2004 16:12:58 -0000	1.10
  +++ DefaultContextModel.java	22 Feb 2004 16:22:17 -0000	1.11
  @@ -147,7 +147,7 @@
               {
                    DefaultImportModel model = 
                      new DefaultImportModel( entry, key, m_context );
  -                 m_map.put( alias, model );
  +                 setEntryModel( alias, model );
               }
               else
               {
  @@ -188,7 +188,7 @@
                           String ref = importDirective.getImportKey();
                           DefaultImportModel model = 
                             new DefaultImportModel( entry, ref, m_context );
  -                        m_map.put( alias, model );
  +                        setEntryModel( alias, model );
                       }
                       else if( entryDirective instanceof ConstructorDirective )
                       {
  @@ -200,7 +200,7 @@
                               constructor, 
                               context, 
                               m_map );
  -                        m_map.put( alias, model );
  +                        setEntryModel( alias, model );
                       }
                       else
                       {
  @@ -217,7 +217,7 @@
           }
   
           m_componentContext = 
  -          createComponentContext( m_context, descriptor, directive, m_map );
  +          createComponentContext( classLoader, descriptor, directive, m_map );
       }
   
       
  @@ -253,7 +253,7 @@
       */
       public void setEntryModel( String key, EntryModel model )
       {
  -        return m_map.put( key, model ); 
  +        m_map.put( key, model ); 
       }
   
      /**
  @@ -353,7 +353,7 @@
      /**
       * Creates a component context instance.
       * 
  -    * @param context the deployment context
  +    * @param classloader the deployment context classloader
       * @param descriptor the context descriptor
       * @param directive the context directive
       * @return the context object compliant with the context casting
  @@ -362,13 +362,13 @@
       *   construct the context instance
       */
       private Context createComponentContext( 
  -      ComponentContext context, ContextDescriptor descriptor, 
  +      ClassLoader classloader, 
  +      ContextDescriptor descriptor, 
         ContextDirective directive, Map map )
         throws ModelException
       {
  -        ClassLoader classLoader = context.getClassLoader();
  -        Class clazz = loadContextClass( directive, classLoader );
  -        validateCastingConstraint( descriptor, classLoader, clazz );
  +        Class clazz = loadContextClass( directive, classloader );
  +        validateCastingConstraint( descriptor, classloader, clazz );
           Context base = new DefaultContext( map );
   
           if( clazz.equals( DefaultContext.class ) ) return base; 
  
  
  
  1.2       +2 -2      avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/OverrideEntryModel.java
  
  Index: OverrideEntryModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/OverrideEntryModel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OverrideEntryModel.java	22 Feb 2004 16:12:58 -0000	1.1
  +++ OverrideEntryModel.java	22 Feb 2004 16:22:17 -0000	1.2
  @@ -46,7 +46,7 @@
       * @param context the containment context
       */
       public OverrideEntryModel( 
  -      EntryDescriptor descriptor, Object value ) throws ModelException
  +      EntryDescriptor descriptor, Object value )
       {
           super( descriptor );
           if( value == null )
  
  
  

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


Mime
View raw message