[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 06/07/27 15:07:08

  Modified:    src/main/org/jboss/seam  Component.java
  Log:
  cleanup
  
  Revision  Changes    Path
  1.156     +14 -11    jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.155
  retrieving revision 1.156
  diff -u -b -r1.155 -r1.156
  --- Component.java	26 Jul 2006 22:08:08 -0000	1.155
  +++ Component.java	27 Jul 2006 19:07:08 -0000	1.156
  @@ -87,7 +87,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.155 $
  + * @version $Revision: 1.156 $
    */
   @Scope(ScopeType.APPLICATION)
   public class Component
  @@ -141,27 +141,30 @@
   
      private Class<Factory> factory;
   
  +   //only used for tests
      public Component(Class<?> clazz)
      {
         this( clazz, Seam.getComponentName(clazz) );
      }
   
  +   // only used for tests
      public Component(Class<?> clazz, String componentName)
      {
         this(clazz, componentName, Seam.getComponentScope(clazz));
      }
   
  -   public Component(Class<?> clazz, String componentName, ScopeType componentScope)
  +   // only used for tests
  +   public Component(Class<?> clazz, Context applicationContext)
      {
  -      this(clazz, componentName, componentScope, Contexts.getApplicationContext());
  +      this( clazz, Seam.getComponentName(clazz), Seam.getComponentScope(clazz), applicationContext );
      }
   
  -   public Component(Class<?> clazz, Context applicationContext)
  +   public Component(Class<?> clazz, String componentName, ScopeType componentScope)
      {
  -      this( clazz, Seam.getComponentName(clazz), Seam.getComponentScope(clazz), applicationContext );
  +      this(clazz, componentName, componentScope, Contexts.getApplicationContext());
      }
   
  -   public Component(Class<?> clazz, String componentName, ScopeType componentScope, Context applicationContext)
  +   private Component(Class<?> clazz, String componentName, ScopeType componentScope, Context applicationContext)
      {
         beanClass = clazz;
         name = componentName;
  @@ -579,7 +582,7 @@
         if ( log.isDebugEnabled() ) log.debug("interceptor stack: " + interceptors);
      }
      
  -   private void addInterceptor(Interceptor interceptor)
  +   public void addInterceptor(Interceptor interceptor)
      {
         if ( interceptor.getType()==InterceptorType.SERVER)
         {