You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by pr...@apache.org on 2003/06/12 20:44:06 UTC

cvs commit: avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role Role2MetaInfoManager.java

proyal      2003/06/12 11:44:06

  Modified:    fortress/src/java/org/apache/avalon/fortress/impl/role
                        Role2MetaInfoManager.java
  Log:
  Allow a parent to be specified
  
  Revision  Changes    Path
  1.6       +9 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/Role2MetaInfoManager.java
  
  Index: Role2MetaInfoManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/Role2MetaInfoManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Role2MetaInfoManager.java	23 May 2003 13:48:06 -0000	1.5
  +++ Role2MetaInfoManager.java	12 Jun 2003 18:44:06 -0000	1.6
  @@ -63,10 +63,17 @@
   public final class Role2MetaInfoManager implements MetaInfoManager
   {
       private final RoleManager m_manager;
  +    private final MetaInfoManager m_parent;
   
       public Role2MetaInfoManager( final RoleManager manager )
       {
  +        this( manager, null );
  +    }
  +
  +    public Role2MetaInfoManager( final RoleManager manager, final MetaInfoManager parent )
  +    {
           m_manager = manager;
  +        m_parent = parent;
       }
   
       /**
  @@ -87,7 +94,7 @@
           }
           else
           {
  -            return null;
  +            return null != m_parent ? m_parent.getMetaInfoForShortName(shortname ) : null;
           }
       }
   
  @@ -111,7 +118,7 @@
           }
           else
           {
  -            return null;
  +            return null != m_parent ? m_parent.getMetaInfoForClassname( classname ) : null;
           }
       }
   }
  
  
  

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