container -> manager

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@251 1c488680-804c-0410-94cd-c6b725194a0e
weld · Nov 5, 2008 · 42d58ae · 42d58ae
1 parent 4a9990f
commit 42d58ae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java
@@ -44,12 +44,12 @@ public abstract class AbstractBeanModel<T, E> implements BeanModel<T, E>
    private Set<Class<?>> apiTypes;
    protected Set<Injectable<?, ?>> injectionPoints;
    private boolean primitive;
-   protected ManagerImpl container;
+   protected ManagerImpl manager;
 
-   protected void init(ManagerImpl container)
+   protected void init(ManagerImpl manager)
    {
-      this.container = container;
-      mergedStereotypes = new MergedStereotypesModel<T, E>(getAnnotatedItem(), getXmlAnnotatedItem(), container);
+      this.manager = manager;
+      mergedStereotypes = new MergedStereotypesModel<T, E>(getAnnotatedItem(), getXmlAnnotatedItem(), manager);
       initType();
       initPrimitive();
       log.fine("Building Web Bean bean metadata for " +  getType());
@@ -292,7 +292,7 @@ protected void initDeploymentType()
 
          if (getMergedStereotypes().getPossibleDeploymentTypes().size() > 0)
          {
-            this.deploymentType = getDeploymentType(container.getEnabledDeploymentTypes(), getMergedStereotypes().getPossibleDeploymentTypes());
+            this.deploymentType = getDeploymentType(manager.getEnabledDeploymentTypes(), getMergedStereotypes().getPossibleDeploymentTypes());
             log.finest("Deployment type " + deploymentType + " specified by stereotype");
             return;
          }

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
@@ -169,7 +169,7 @@ protected AbstractClassBeanModel<? extends T> getSpecializedType()
       Class<?> superclass = getAnnotatedItem().getType().getSuperclass();
       if ( superclass!=null )
       {
-         return new EnterpriseBeanModel(new SimpleAnnotatedClass(superclass), null, container);
+         return new EnterpriseBeanModel(new SimpleAnnotatedClass(superclass), null, manager);
       }
       else {
          throw new RuntimeException();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java
@@ -71,7 +71,7 @@ protected void initDeploymentType()
       {
          if (getDeclaringBean() == null)
          {
-            initDeclaringBean(container);
+            initDeclaringBean(manager);
          }
          deploymentType = declaringBean.getDeploymentType();
       }

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
@@ -129,7 +129,7 @@ protected AbstractClassBeanModel<? extends T> getSpecializedType()
       Class<?> superclass = getAnnotatedItem().getType().getSuperclass();
       if ( superclass!=null )
       {
-         return new SimpleBeanModel(new SimpleAnnotatedClass(superclass), null, container);
+         return new SimpleBeanModel(new SimpleAnnotatedClass(superclass), null, manager);
       }
       else {
          throw new RuntimeException();