openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1429129 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/creation/ManagedBeanCreatorImpl.java config/BeansDeployer.java intercept/InterceptorsManager.java util/WebBeansUtil.java
Date Fri, 04 Jan 2013 21:12:00 GMT
Author: struberg
Date: Fri Jan  4 21:11:59 2013
New Revision: 1429129

URL: http://svn.apache.org/viewvc?rev=1429129&view=rev
Log:
OWB-344 fix JavaDoc and add comments

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java?rev=1429129&r1=1429128&r2=1429129&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
Fri Jan  4 21:11:59 2013
@@ -321,8 +321,6 @@ public class ManagedBeanCreatorImpl<T> e
 
     /**
      * Define decorator bean.
-     * @param <T> type info
-     * @param creator bean creator
      * @param processInjectionTargetEvent
      */
     public void defineDecorator(ProcessInjectionTarget<T> processInjectionTargetEvent)

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1429129&r1=1429128&r2=1429129&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Fri Jan  4 21:11:59 2013
@@ -398,8 +398,8 @@ public class BeansDeployer
                 {
                     //Decorators not applied to interceptors/decorators/@NewBean
                     if(!(bean instanceof Decorator) && 
-                            !(bean instanceof javax.enterprise.inject.spi.Interceptor) &&
-                            !(bean instanceof NewBean))
+                       !(bean instanceof javax.enterprise.inject.spi.Interceptor) &&
+                       !(bean instanceof NewBean))
                     {
                         webBeansContext.getDefinitionUtil().defineDecoratorStack((AbstractInjectionTargetBean<Object>)bean);
                     }
@@ -849,8 +849,7 @@ public class BeansDeployer
             }
 
 
-            //Decorator
-            if(WebBeansUtil.isAnnotatedTypeDecorator(annotatedType))
+            if(WebBeansUtil.isDecorator(annotatedType))
             {
                 if (logger.isLoggable(Level.FINE))
                 {
@@ -865,8 +864,7 @@ public class BeansDeployer
                     managedBeanCreator.defineDecorator(processInjectionTargetEvent);
                 }
             }
-            //Interceptor
-            else if(WebBeansUtil.isAnnotatedTypeInterceptor(annotatedType))
+            else if(WebBeansUtil.isInterceptor(annotatedType))
             {
                 if (logger.isLoggable(Level.FINE))
                 {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1429129&r1=1429128&r2=1429129&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
Fri Jan  4 21:11:59 2013
@@ -30,7 +30,7 @@ import org.apache.webbeans.exception.Web
 import org.apache.webbeans.util.Asserts;
 
 /**
- * This class keeps all the enabled interceptor classes of a certain BeanManager.
+ * This class keeps all the enabled interceptor classes information of a certain BeanManager.
  */
 public class InterceptorsManager
 {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1429129&r1=1429128&r2=1429129&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Fri Jan  4 21:11:59 2013
@@ -1043,7 +1043,6 @@ public final class WebBeansUtil
     /**
      * Configures the interceptor stack of the web beans component.
      *
-     * @param interceptorClass interceptor class
      * @param annotation annotation type
      * @param definedInInterceptorClass check if annotation is defined in
      *            interceptor class (as opposed to bean class)
@@ -2558,18 +2557,11 @@ public final class WebBeansUtil
     }
 
     /**
-     * Return true if this annotated type represents a decorator.
-     * @param annotatedType annotated type
-     * @return true if decorator
+     * @return <code>true</code> if this annotated type represents a decorator.
      */
-    public static boolean isAnnotatedTypeDecorator(AnnotatedType<?> annotatedType)
+    public static boolean isDecorator(AnnotatedType<?> annotatedType)
     {
-        if(annotatedType.isAnnotationPresent(Decorator.class))
-        {
-            return true;
-        }
-
-        return false;
+        return annotatedType.isAnnotationPresent(Decorator.class);
     }
 
     /**
@@ -2579,8 +2571,8 @@ public final class WebBeansUtil
      */
     public boolean isAnnotatedTypeDecoratorOrInterceptor(AnnotatedType<?> annotatedType)
     {
-        if(isAnnotatedTypeDecorator(annotatedType) ||
-                isAnnotatedTypeInterceptor(annotatedType))
+        if(isDecorator(annotatedType) ||
+           isInterceptor(annotatedType))
         {
             return true;
         }
@@ -2598,18 +2590,11 @@ public final class WebBeansUtil
     }
 
     /**
-     * Return true if this annotated type represents a decorator.
-     * @param annotatedType annotated type
-     * @return true if decorator
+     * @return <code>true</code> if this AnnotatedType represents an Interceptor
      */
-    public static boolean isAnnotatedTypeInterceptor(AnnotatedType<?> annotatedType)
+    public static boolean isInterceptor(AnnotatedType<?> annotatedType)
     {
-        if(annotatedType.isAnnotationPresent(javax.interceptor.Interceptor.class))
-        {
-            return true;
-        }
-
-        return false;
+        return annotatedType.isAnnotationPresent(javax.interceptor.Interceptor.class);
     }
 
     public <T> ManagedBean<T> defineManagedBean(AnnotatedType<T> type)



Mime
View raw message