[webbeans-commits] Webbeans SVN: r3561 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2009-08-19 11:01:33 -0400 (Wed, 19 Aug 2009)
New Revision: 3561

Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/TestAnnotatedType.java
Log:
Minor tidying up of process annotated type events.

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java	2009-08-19 13:34:22 UTC (rev 3560)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/ProcessAnnotatedTypeImpl.java	2009-08-19 15:01:33 UTC (rev 3561)
@@ -32,7 +32,6 @@
    
    private AnnotatedType<X> annotatedType;
    private boolean veto;
-   private boolean annotatedTypeReplaced = false;
 
    public ProcessAnnotatedTypeImpl(AnnotatedType<X> annotatedType)
    {
@@ -51,7 +50,6 @@
          throw new IllegalArgumentException("Cannot set the type to null (if you want to stop the type being used, call veto()) " + this);
       }
       this.annotatedType = type;
-      this.annotatedTypeReplaced = true;
    }
 
    public void veto()
@@ -63,10 +61,5 @@
    {
       return veto;
    }
-   
-   public boolean isAnnotatedTypeReplaced()
-   {
-      return annotatedTypeReplaced;
-   }
 
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java	2009-08-19 13:34:22 UTC (rev 3560)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java	2009-08-19 15:01:33 UTC (rev 3561)
@@ -69,6 +69,8 @@
    public void testSetAnnotatedType()
    {
       assert TestAnnotatedType.isGetConstructorsUsed();
+      assert TestAnnotatedType.isGetFieldsUsed();
+      assert TestAnnotatedType.isGetMethodsUsed();
    }
    
    @Test

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/TestAnnotatedType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/TestAnnotatedType.java	2009-08-19 13:34:22 UTC (rev 3560)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/TestAnnotatedType.java	2009-08-19 15:01:33 UTC (rev 3561)
@@ -13,6 +13,8 @@
 {
    private AnnotatedType<X> delegate;
    private static boolean getConstructorsUsed = false;
+   private static boolean getFieldsUsed = false;
+   private static boolean getMethodsUsed = false;
    
    public TestAnnotatedType(AnnotatedType<X> delegate)
    {
@@ -27,6 +29,7 @@
 
    public Set<AnnotatedField<? super X>> getFields()
    {
+      getFieldsUsed = true;
       return delegate.getFields();
    }
 
@@ -37,6 +40,7 @@
 
    public Set<AnnotatedMethod<? super X>> getMethods()
    {
+      getMethodsUsed = true;
       return delegate.getMethods();
    }
 
@@ -70,4 +74,14 @@
       return getConstructorsUsed;
    }
 
+   public static boolean isGetFieldsUsed()
+   {
+      return getFieldsUsed;
+   }
+
+   public static boolean isGetMethodsUsed()
+   {
+      return getMethodsUsed;
+   }
+
 }