[webbeans-commits] Webbeans SVN: r251 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Nov 5 18:42:05 EST 2008
Author: pete.muir at jboss.org
Date: 2008-11-05 18:42:05 -0500 (Wed, 05 Nov 2008)
New Revision: 251
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
Log:
container -> manager
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java 2008-11-05 23:40:54 UTC (rev 250)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java 2008-11-05 23:42:05 UTC (rev 251)
@@ -44,12 +44,12 @@
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 @@
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;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-05 23:40:54 UTC (rev 250)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-05 23:42:05 UTC (rev 251)
@@ -169,7 +169,7 @@
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();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java 2008-11-05 23:40:54 UTC (rev 250)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/ProducerMethodBeanModel.java 2008-11-05 23:42:05 UTC (rev 251)
@@ -71,7 +71,7 @@
{
if (getDeclaringBean() == null)
{
- initDeclaringBean(container);
+ initDeclaringBean(manager);
}
deploymentType = declaringBean.getDeploymentType();
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-05 23:40:54 UTC (rev 250)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-05 23:42:05 UTC (rev 251)
@@ -129,7 +129,7 @@
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();
More information about the weld-commits
mailing list