[jboss-cvs] JBossAS SVN: r70843 - in projects/aop/trunk/aop/src/test/org/jboss/test/aop: instanceofannotated and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-03-13 16:34:45 -0400 (Thu, 13 Mar 2008)
New Revision: 70843

Modified:
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InstanceOfAnnotatedTester.java
   projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java
Log:
Tidyup, add generics and get rid of warnings

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java	2008-03-13 20:32:36 UTC (rev 70842)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/inforesolve/ResolveAnnotationAspect.java	2008-03-13 20:34:45 UTC (rev 70843)
@@ -52,7 +52,7 @@
          return;
       }
          
-      classAnnotation = (TestAnnotation)joinPoint.resolveClassAnnotation(TestAnnotation.class);
-      joinpointAnnotation = (TestAnnotation)joinPoint.resolveAnnotation(TestAnnotation.class);
+      classAnnotation = joinPoint.resolveClassAnnotation(TestAnnotation.class);
+      joinpointAnnotation = joinPoint.resolveAnnotation(TestAnnotation.class);
    }
 }

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InstanceOfAnnotatedTester.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InstanceOfAnnotatedTester.java	2008-03-13 20:32:36 UTC (rev 70842)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/instanceofannotated/InstanceOfAnnotatedTester.java	2008-03-13 20:34:45 UTC (rev 70843)
@@ -177,29 +177,29 @@
      Class introducedPOJO = IntroducedPOJO.class;
      ClassAdvisor advisor = AspectManager.instance().getAdvisor(introducedPOJO);
 
-     Introduced introduced = (Introduced) advisor.resolveAnnotation(Introduced.class);
+     Introduced introduced = advisor.resolveAnnotation(Introduced.class);
      assertNotNull("Class did not have the @Introduced annotation", introduced);
      
      Constructor con = introducedPOJO.getConstructors()[0];
-     introduced = (Introduced) advisor.resolveAnnotation(con, Introduced.class);
+     introduced = advisor.resolveAnnotation(con, Introduced.class);
      assertNotNull("Constructor did not have the @Introduced annotation", introduced);
-     Introduced2 introduced2 = (Introduced2) advisor.resolveAnnotation(con, Introduced2.class);
+     Introduced2 introduced2 = advisor.resolveAnnotation(con, Introduced2.class);
      assertNotNull("Constructor did not have the @Introduced2 annotation", introduced2);
-     Introduced3 introduced3 = (Introduced3) advisor.resolveAnnotation(con, Introduced3.class);
+     Introduced3 introduced3 = advisor.resolveAnnotation(con, Introduced3.class);
      assertNull("Constructor has the @Introduced3 annotation", introduced3);
      
      Field field = introducedPOJO.getField("field");
-     introduced = (Introduced) advisor.resolveAnnotation(field, Introduced.class);
+     introduced = advisor.resolveAnnotation(field, Introduced.class);
      assertNotNull("Field did not have the @Introduced annotation", introduced);
-     introduced2 = (Introduced2) advisor.resolveAnnotation(field, Introduced2.class);
+     introduced2 = advisor.resolveAnnotation(field, Introduced2.class);
      assertNotNull("Field did not have the @Introduced2 annotation", introduced2);
      
      Method method = introducedPOJO.getMethod("someMethod", new Class[]{Type.class, Type.class});
-     introduced = (Introduced) advisor.resolveAnnotation(method, Introduced.class);
+     introduced = advisor.resolveAnnotation(method, Introduced.class);
      assertNotNull("Method did not have the @Introduced annotation", introduced);
-     introduced2 = (Introduced2) advisor.resolveAnnotation(method, Introduced2.class);
+     introduced2 = advisor.resolveAnnotation(method, Introduced2.class);
      assertNotNull("Method did not have the @Introduced2 annotation", introduced2);
-     introduced3 = (Introduced3) advisor.resolveAnnotation(method, Introduced3.class);
+     introduced3 = advisor.resolveAnnotation(method, Introduced3.class);
      assertNull("Method has the @Introduced3 annotation", introduced3);
  }
  

Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java	2008-03-13 20:32:36 UTC (rev 70842)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/jdk15base/AOPTester.java	2008-03-13 20:34:45 UTC (rev 70843)
@@ -94,7 +94,7 @@
       AnnotatedPOJO pojo = new AnnotatedPOJO();
       if (!SimpleInterceptor.intercepted) throw new RuntimeException("failed to intercept tagged constructor");
 
-      complex c = (complex)AnnotationElement.getVisibleAnnotation(AnnotatedPOJO.class, complex.class);
+      complex c = AnnotationElement.getVisibleAnnotation(AnnotatedPOJO.class, complex.class);
       printComplex(c);
 
       SimpleInterceptor.intercepted = false;