svn commit: r825955 - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/AbstractInjectionTargetBean.java config/DefinitionUtil.java intercept/InterceptorHandler.java

[ge...@apache.org]

Author: gerdogdu
Date: Fri Oct 16 15:42:11 2009
New Revision: 825955

URL: http://svn.apache.org/viewvc?rev=825955&view=rev
Log:
Using more correct method names.

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=825955&r1=825954&r2=825955&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Fri Oct 16 15:42:11 2009
@@ -179,8 +179,8 @@
         // Interceptor and decorator stack
         if (getWebBeansType().equals(WebBeansType.MANAGED))
         {
-            DefinitionUtil.defineSimpleWebBeanInterceptorStack(this);
-            DefinitionUtil.defineWebBeanDecoratorStack(this, instance);
+            DefinitionUtil.defineBeanInterceptorStack(this);
+            DefinitionUtil.defineBeanDecoratorStack(this, instance);
         }
 
         postConstruct(instance);

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=825955&r1=825954&r2=825955&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Fri Oct 16 15:42:11 2009
@@ -1013,21 +1013,32 @@
         Annotation[] anns = method.getDeclaredAnnotations();
         WebBeansUtil.checkForValidResources(parameterTypes[0], clazz, method.getName(), anns);
     }
-
-    public static void defineSimpleWebBeanInterceptorStack(AbstractBean<?> component)
+    
+    /**
+     * Configure bean instance interceptor stack.
+     * @param bean bean instance
+     */
+    public static void defineBeanInterceptorStack(AbstractBean<?> bean)
     {
-        Asserts.assertNotNull(component, "component parameter can no be null");
+        Asserts.assertNotNull(bean, "bean parameter can no be null");
 
         // @javax.interceptor.Interceptors
-        EJBInterceptorConfig.configure(component.getReturnType(), component.getInterceptorStack());
+        EJBInterceptorConfig.configure(bean.getReturnType(), bean.getInterceptorStack());
 
         // @javax.webbeans.Interceptor
-        WebBeansInterceptorConfig.configure(component, component.getInterceptorStack());
+        WebBeansInterceptorConfig.configure(bean, bean.getInterceptorStack());
     }
 
-    public static void defineWebBeanDecoratorStack(AbstractBean<?> component, Object object)
+    /**
+     * Configure bean instance decorator stack.
+     * @param bean bean
+     * @param object actual instantiated bean instance
+     */
+    public static void defineBeanDecoratorStack(AbstractBean<?> bean, Object object)
     {
-        WebBeansDecoratorConfig.configureDecarotors(component, object);
+        Asserts.assertNotNull(bean, "bean parameter can no be null");
+        
+        WebBeansDecoratorConfig.configureDecarotors(bean, object);
     }
 
     public static <T> void defineObserverMethods(InjectionTargetBean<T> component, Class<T> clazz)

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=825955&r1=825954&r2=825955&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Fri Oct 16 15:42:11 2009
@@ -86,7 +86,7 @@
  * instantiated by the container first time. This method can be found in the
  * AbstractInjectionTargetBean" class "afterConstructor()" method. Actual
  * configuration is done by the
- * {@link DefinitionUtil#defineSimpleWebBeanInterceptorStack(AbstractBean)} and
+ * {@link DefinitionUtil#defineBeanInterceptorStack(AbstractBean)} and
  * {@link DefinitionUtil#defineWebBeanDecoratorStack}. In
  * "DefinitionUtil.defineSimpleWebBeanInterceptorStack", firstly it configures
  * "EJB spec. interceptors" after that configures "JSR-299 spec. interceptors."