[webbeans-commits] Webbeans SVN: r418 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bean/proxy and 7 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Dec 5 09:17:47 EST 2008
Author: nickarls
Date: 2008-12-05 09:17:46 -0500 (Fri, 05 Dec 2008)
New Revision: 418
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/MergedStereotypes.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlEnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlSimpleBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractBeanMapAdaptor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/BasicContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ConversationContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanFactory.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
Log:
doc updates
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -107,8 +107,6 @@
/**
* Constructor
- *
- * @param manager The Web Beans manager
*/
public AbstractBean()
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -59,7 +59,6 @@
*
* @param annotatedItem Annotations read from java classes
* @param xmlAnnotatedItem Annotations read from XML
- * @param manager The Web Beans manager
*/
public AbstractClassBean(Class<T> type)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -56,7 +56,6 @@
* Constructor
*
* @param type The type of the bean
- * @param manager The Web Beans manager
*/
public EnterpriseBean(Class<T> type)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -52,8 +52,6 @@
* Constructor
*
* @param field The underlying field abstraction
- * @param declaringBean
- * @param manager The Web Beans manager
*/
@SuppressWarnings("unchecked")
public EventBean(AnnotatedField<T> field)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/MergedStereotypes.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/MergedStereotypes.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/MergedStereotypes.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -48,7 +48,6 @@
* Constructor
*
* @param stereotypeAnnotations The stereotypes to merge
- * @param manager The Web Beans manager
*/
public MergedStereotypes(Set<Annotation> stereotypeAnnotations)
{
@@ -63,7 +62,6 @@
* Perform the merge
*
* @param stereotypeAnnotations The stereotype annotations
- * @param manager The Web Beans manager
*/
protected void merge(Set<Annotation> stereotypeAnnotations)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -56,7 +56,6 @@
*
* @param method The producer method
* @param declaringBean The declaring bean instance
- * @param manager The Web Beans manager
*/
public ProducerMethodBean(Method method, AbstractClassBean<?> declaringBean)
{
@@ -68,7 +67,6 @@
*
* @param method The producer method abstraction
* @param declaringBean The declaring bean
- * @param manager The Web Beans manager
*/
public ProducerMethodBean(AnnotatedMethod<T> method, AbstractClassBean<?> declaringBean)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -58,7 +58,6 @@
* Constructor
*
* @param type The type of the bean
- * @param manager The Web Beans manager
*/
public SimpleBean(Class<T> type)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlEnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlEnterpriseBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlEnterpriseBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -32,7 +32,6 @@
* Constructor
*
* @param type The type of the bean
- * @param manager The Web Beans manager
*/
public XmlEnterpriseBean(Class<T> type)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlSimpleBean.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlSimpleBean.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -32,7 +32,6 @@
* Constructor
*
* @param type The type of the bean
- * @param manager The Web Beans manager
*/
public XmlSimpleBean(Class<T> type)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -49,7 +49,6 @@
*
* @param bean The bean to proxy
* @param beanIndex The index to the bean in the manager bean list
- * @param manager The manager implementation
*/
public ProxyMethodHandler(Bean<?> bean, int beanIndex)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractBeanMapAdaptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractBeanMapAdaptor.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractBeanMapAdaptor.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -1,3 +1,20 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.jboss.webbeans.contexts;
import javax.webbeans.manager.Contextual;
@@ -7,6 +24,11 @@
public abstract class AbstractBeanMapAdaptor implements BeanMap
{
+ /**
+ * Gets a key prefix that should be prefixed to names
+ *
+ * @return The prefix
+ */
protected abstract String getKeyPrefix();
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -125,11 +125,20 @@
this.active.set(Boolean.valueOf(active));
}
+ /**
+ * Destroys a bean
+ *
+ * @param <T> The type of the bean
+ * @param bean The bean to destroy
+ */
private <T> void destroy(Contextual<T> bean)
{
bean.destroy(getBeanMap().get(bean));
}
+ /**
+ * Destroys the context
+ */
public void destroy()
{
for (Contextual<? extends Object> bean : getBeanMap().keySet())
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ApplicationContext.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -32,38 +32,67 @@
*/
public class ApplicationContext extends AbstractContext
{
-
+ // The beans
private BeanMap beanMap;
+ // Is the context active?
private AtomicBoolean active;
+ /**
+ * Constructor
+ */
public ApplicationContext()
{
super(ApplicationScoped.class);
this.active = new AtomicBoolean(true);
}
+ /**
+ * Gets the bean map
+ *
+ * @return The bean map
+ */
@Override
public BeanMap getBeanMap()
{
return this.beanMap;
}
+ /**
+ * Sets the bean map
+ *
+ * @param applicationBeanMap The bean map
+ */
public void setBeanMap(BeanMap applicationBeanMap)
{
this.beanMap = applicationBeanMap;
}
+ /**
+ * Helper method for accessing context
+ *
+ * @return The application context
+ */
public static ApplicationContext instance()
{
return (ApplicationContext) ManagerImpl.instance().getBuiltInContext(ApplicationScoped.class);
}
+ /**
+ * Indicates if the context is active
+ *
+ * @return True if active, false otherwise
+ */
@Override
public boolean isActive()
{
return active.get();
}
+ /**
+ * Sets the active state of the context
+ *
+ * @param active The new state
+ */
@Override
public void setActive(boolean active)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/BasicContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/BasicContext.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/BasicContext.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -34,8 +34,14 @@
*/
public abstract class BasicContext extends AbstractContext
{
+ // The beans
protected ThreadLocal<BeanMap> beans;
+ /**
+ * Constructor
+ *
+ * @param scopeType The scope types
+ */
public BasicContext(Class<? extends Annotation> scopeType)
{
super(scopeType);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ContextMap.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -73,7 +73,14 @@
}
}
}
-
+
+ /**
+ * Gets the list of context with the given scope type
+ *
+ * @param scopeType The scope type to match
+ * @return A list of matching contexts. An empty list is returned if there
+ * are no matches
+ */
public List<Context> getContext(Class<? extends Annotation> scopeType)
{
boolean interrupted = false;
@@ -122,12 +129,12 @@
{
List<Context> contexts = putIfAbsent(context.getScopeType(), new Callable<List<Context>>()
{
-
+
public List<Context> call() throws Exception
{
return new CopyOnWriteArrayList<Context>();
}
-
+
});
contexts.add(context);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ConversationContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ConversationContext.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/ConversationContext.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -27,6 +27,9 @@
public class ConversationContext extends BasicContext
{
+ /**
+ * Constructor
+ */
public ConversationContext()
{
super(ConversationScoped.class);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/DependentContext.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -29,6 +29,9 @@
public class DependentContext extends BasicContext
{
+ /**
+ * Constructor
+ */
public DependentContext()
{
super(Dependent.class);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/RequestContext.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -29,11 +29,19 @@
public class RequestContext extends BasicContext
{
+ /**
+ * Constructor
+ */
public RequestContext()
{
super(RequestScoped.class);
}
+ /**
+ * Helper method for accessing context
+ *
+ * @return The request context
+ */
public static RequestContext instance()
{
return (RequestContext) ManagerImpl.instance().getBuiltInContext(RequestScoped.class);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -48,7 +48,6 @@
/**
* Constructor
*
- * @param manager The Web Beans manager
* @param keyPrefix The storage names prefix
*/
public SessionBeanMap(String keyPrefix)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionContext.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -30,28 +30,46 @@
*/
public class SessionContext extends AbstractContext
{
-
private static LogProvider log = Logging.getLogProvider(SessionContext.class);
-
+ // The beans
private ThreadLocal<BeanMap> beanMap;
+ /**
+ * Constructor
+ */
public SessionContext()
{
super(SessionScoped.class);
log.trace("Created session context");
}
-
+
+ /**
+ * Gets the bean map
+ *
+ * @returns The bean map
+ * @see org.jboss.webbeans.contexts.AbstractContext#getBeanMap()
+ */
@Override
public BeanMap getBeanMap()
{
return beanMap.get();
}
-
+
+ /**
+ * Sets the bean map
+ *
+ * @param beanMap The bean map
+ */
public void setBeanMap(BeanMap beanMap)
{
this.beanMap.set(beanMap);
}
-
+
+ /**
+ * Helper method for accessing context
+ *
+ * @return The session context
+ */
public static SessionContext instance()
{
return (SessionContext) ManagerImpl.instance().getBuiltInContext(SessionScoped.class);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -43,7 +43,6 @@
/**
* Creates a new deferred event notifier.
*
- * @param manager The Web Beans manager
* @param observer The observer to be notified
* @param event The event being fired
*/
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -53,7 +53,6 @@
/**
* Constructor
*
- * @param manager The Web Beans manager
* @param bindingTypes The binding types
*/
public EventImpl(Annotation... bindingTypes)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -139,8 +139,6 @@
/**
* Initializes a new instance of the EventManager.
- *
- * @param manager The Web Beans manager
*/
public EventManager()
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedConstructor.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -51,7 +51,6 @@
/**
* Creates a new instance of the class, using this constructor
*
- * @param manager The Web Beans manager
* @return The created instance
*/
public T newInstance();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -40,7 +40,6 @@
* Injects an instance
*
* @param instance The instance to inject
- * @param manager The Web Beans manager
*/
public void inject(Object instance);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -51,7 +51,6 @@
/**
* Invokes the method
*
- * @param manager The Web Beans manager
* @param instance The instance to invoke
* @return A reference to the instance
*/
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedParameter.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -31,7 +31,6 @@
/**
* Gets the actual value of the parameter from the manager
*
- * @param manager The Web Beans Manager
* @return The value
*/
public T getValue();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -200,7 +200,6 @@
* of annotated parameters.
*
* @param parameters The list of annotated parameter to look up
- * @param manager The Web Beans manager
* @return The object array of looked up values
*
*/
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -132,7 +132,6 @@
/**
* Gets the current value of the member
*
- * @param manager The Web Beans manager
* @return The current value
*/
public T getValue()
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -194,7 +194,6 @@
/**
* Creates a new instance
*
- * @param manager The Web Beans manager
* @return An instance
*
* @see org.jboss.webbeans.introspector.AnnotatedConstructor#newInstance(ManagerImpl)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -116,7 +116,6 @@
* Gets the current value and injects this instance into an instance
*
* @param instance The instance to inject into
- * @param manager The Web Beans manager
*
* @see org.jboss.webbeans.introspector.AnnotatedField#inject(Object,
* ManagerImpl)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -125,7 +125,6 @@
/**
* Gets the current value
*
- * @param manager The Web Beans manager
* @return the value
*
* @see org.jboss.webbeans.introspector.AnnotatedParameter
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanMap.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -29,13 +29,20 @@
{
private LogProvider log = Logging.getLogProvider(ApplicationBeanMap.class);
+ // The current servlet context
private ServletContext servletContext;
+ /**
+ * Constructor
+ *
+ * @param servletContext The servlet context
+ */
public ApplicationBeanMap(ServletContext servletContext)
{
this.servletContext = servletContext;
}
+
public void clear()
{
throw new UnsupportedOperationException();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/SessionBeanMap.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -48,7 +48,6 @@
/**
* Constructor
*
- * @param manager The Web Beans manager
* @param keyPrefix The storage names prefix
*/
public SessionBeanMap(HttpSession httpSession)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanFactory.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanFactory.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/BeanFactory.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -41,7 +41,6 @@
*
* @param <T> The type
* @param clazz The class
- * @param manager The Web Beans manager
* @return A Web Bean
*/
public static <T> SimpleBean<T> createSimpleBean(Class<T> clazz)
@@ -54,7 +53,6 @@
*
* @param <T> The type
* @param clazz The class
- * @param manager The Web Beans manager
* @return A Web Bean
*/
public static <T> XmlSimpleBean<T> createXmlSimpleBean(Class<T> clazz)
@@ -67,7 +65,6 @@
*
* @param <T> The type
* @param clazz The class
- * @param manager The Web Beans manager
* @return An Enterprise Web Bean
*/
public static <T> EnterpriseBean<T> createEnterpriseBean(Class<T> clazz)
@@ -80,7 +77,6 @@
*
* @param <T> The type
* @param clazz The class
- * @param manager The Web Beans manager
* @return An Enterprise Web Bean
*/
public static <T> XmlEnterpriseBean<T> createXmlEnterpriseBean(Class<T> clazz)
@@ -94,7 +90,6 @@
* @param <T> The type
* @param type The class
* @param method The underlying method
- * @param manager The Web Beans manager
* @param declaringBean The declaring bean abstraction
* @return A producer Web Bean
*/
@@ -108,7 +103,6 @@
*
* @param type The type
* @param method The underlying method abstraction
- * @param manager The Web Beans manager
* @param declaringBean The declaring bean abstraction
* @return A producer Web Bean
*/
@@ -123,7 +117,6 @@
* @param <T>
* @param type The type
* @param field The observer field abstraction
- * @param manager The Web Beans manager
* @param declaringBean The declaring bean abstraction
* @return An event Web Bean
*/
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-05 12:38:13 UTC (rev 417)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-12-05 14:17:46 UTC (rev 418)
@@ -11,12 +11,6 @@
public class MockManagerImpl extends ManagerImpl
{
-
- public static void setInstance(ManagerImpl manager)
- {
- ManagerImpl.instance = manager;
- }
-
private Object event = null;
private Class<? extends Object> eventType = null;
private Annotation[] eventBindings = null;
@@ -70,5 +64,10 @@
{
initContexts(contexts);
}
+
+ public static void setInstance(ManagerImpl manager)
+ {
+ ManagerImpl.instance = manager;
+ }
}
More information about the weld-commits
mailing list