svn commit: r1103655 - in /openwebbeans/trunk: webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/ webbeans-impl/src/main/java/org/apache/webbeans/config/ webbeans-impl/src/main/java/org/apache/webbeans/portable/events/

[st...@apache.org]

Author: struberg
Date: Mon May 16 08:59:06 2011
New Revision: 1103655

URL: http://svn.apache.org/viewvc?rev=1103655&view=rev
Log:
OWB-569 add better JavaDoc and use a better name for the 'set' variable

Modified:
    openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java

Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java?rev=1103655&r1=1103654&r2=1103655&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java Mon May 16 08:59:06 2011
@@ -79,7 +79,7 @@ public final class EjbUtility
             return;
         }
         
-        if(processAnnotatedEvent.isSet())
+        if(processAnnotatedEvent.isModifiedAnnotatedType())
         {
             ejbBeanCreator.setMetaDataProvider(MetaDataProvider.THIRDPARTY);
         }
@@ -233,4 +233,4 @@ public final class EjbUtility
         
         return false;
     }
-}
\ No newline at end of file
+}

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=1103655&r1=1103654&r2=1103655&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 Mon May 16 08:59:06 2011
@@ -794,7 +794,7 @@ public class BeansDeployer
             ManagedBeanCreatorImpl<T> managedBeanCreator = new ManagedBeanCreatorImpl<T>(managedBean);
 
             boolean annotationTypeSet = false;
-            if(processAnnotatedEvent.isSet())
+            if(processAnnotatedEvent.isModifiedAnnotatedType())
             {
                 annotationTypeSet = true;
                 managedBean.setAnnotatedType(annotatedType);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java?rev=1103655&r1=1103654&r2=1103655&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java Mon May 16 08:59:06 2011
@@ -36,8 +36,12 @@ public class ProcessAnnotatedTypeImpl<X>
     /**veto or not*/
     private boolean veto = false;
     
-    /**set or not*/
-    private boolean set = false;
+    /**
+     * This field gets set to <code>true</code> when a custom AnnotatedType
+     * got set in an Extension. In this case we must now take this modified
+     * AnnotatedType for our further processing!
+     */
+    private boolean modifiedAnnotatedType = false;
 
     /**
      * Creates a new instance with the given annotated type.
@@ -65,7 +69,7 @@ public class ProcessAnnotatedTypeImpl<X>
     public void setAnnotatedType(AnnotatedType<X> type)
     {
         this.annotatedType = type;
-        this.set = true;
+        this.modifiedAnnotatedType = true;
     }
     
     /**
@@ -73,9 +77,9 @@ public class ProcessAnnotatedTypeImpl<X>
      * 
      * @return set or not
      */
-    public boolean isSet()
+    public boolean isModifiedAnnotatedType()
     {
-        return this.set;
+        return this.modifiedAnnotatedType;
     }
 
     /**
@@ -97,4 +101,4 @@ public class ProcessAnnotatedTypeImpl<X>
         return this.veto;
     }
 
-}
\ No newline at end of file
+}