[jboss-cvs] JBossAS SVN: r70842 - in projects/aop/trunk/aop/src/main/org/jboss/aop: annotation/compiler and 9 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Mar 13 16:32:37 EDT 2008


Author: kabir.khan at jboss.com
Date: 2008-03-13 16:32:36 -0400 (Thu, 13 Mar 2008)
New Revision: 70842

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/util/FindAnnotations.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AopC.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayBinding.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistry.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistryEntry.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayReplacement.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/array/ElementArrayRegistryEntry.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/array/FieldArrayRegistryEntry.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/contrib/IDEClassPoolFactory.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/eclipsesupport/EclipseTestTransformer.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/InterfaceIntroduction.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/microcontainer/lifecycle/LifecycleCallbackBinding.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AdvisorMatcherStrategy.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AnnotationMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlow.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlowStack.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CallMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructionMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorCallMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareDef.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareTypeMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MethodMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Pointcut.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutExpression.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutMethodMatch.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ProxyMatcherStrategy.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SecurityActions.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SoftClassMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypeMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Typedef.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypedefExpression.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Util.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/WithinMatcher.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java
Log:
Tidyup, add generics and get rid of warnings

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByMethodInfo.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -27,7 +27,6 @@
 import org.jboss.aop.joinpoint.MethodCallByMethod;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.aop.joinpoint.MethodCalledByMethodJoinpoint;
-import org.jboss.aop.util.MethodHashing;
 
 /**
  * 
@@ -39,7 +38,7 @@
    private final long callingMethodHash;
    private final Method callingMethod;
    
-   public MethodByMethodInfo(Advisor advisor, Class calledClass, Method m, Method callingMethod, long callingMethodHash, long calledMethodHash, Interceptor[] in)
+   public MethodByMethodInfo(Advisor advisor, Class<?> calledClass, Method m, Method callingMethod, long callingMethodHash, long calledMethodHash, Interceptor[] in)
    {
       super(advisor, calledClass, m, calledMethodHash, in, callingMethod.getDeclaringClass());
       this.callingMethodHash = callingMethodHash;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationDocletTag.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -107,6 +107,7 @@
       return null;
    }
 
+   @SuppressWarnings("unchecked")
    public Map getNamedParameterMap()
    {
       return null;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/AnnotationInfoCreator.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -86,8 +86,8 @@
    {
       if (base.getMemberNames().size() > 1) throw new RuntimeException("single value expected from annotation: " + base.getTypeName());
 
-      Set set = base.getMemberNames();
-      MemberValue mv = base.getMemberValue((String) set.iterator().next());
+      Set<String> set = base.getMemberNames();
+      MemberValue mv = base.getMemberValue(set.iterator().next());
       node.getValue().jjtAccept(this, mv);
       return data;
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/compiler/ByteCodeAnnotationCompiler.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -110,7 +110,7 @@
    private CtMethod getJavassistMethod(JavaMethod method, CtClass clazz) throws Exception
    {
       CtMethod methods[] = clazz.getDeclaredMethods();
-      ArrayList possible = new ArrayList();
+      ArrayList<CtMethod> possible = new ArrayList<CtMethod>();
       for (int i = 0; i < methods.length; i++)
       {
          if (methods[i].getName().equals(method.getName()))
@@ -122,11 +122,11 @@
          }
       }
       if (possible.size() == 0) throw new RuntimeException("cannot resolve method" + method.toString());
-      if (possible.size() == 1) return (CtMethod) possible.get(0);
+      if (possible.size() == 1) return possible.get(0);
 
       for (int i = 0; i < possible.size(); i++)
       {
-         CtMethod ctMethod = (CtMethod) possible.get(i);
+         CtMethod ctMethod = possible.get(i);
          CtClass[] params = ctMethod.getParameterTypes();
          boolean bad = false;
          for (int k = 0; k < params.length; k++)
@@ -145,7 +145,7 @@
    private CtConstructor getJavassistConstructor(JavaMethod method, CtClass clazz, boolean isInnerClass) throws Exception
    {
       CtConstructor cons[] = clazz.getDeclaredConstructors();
-      ArrayList possible = new ArrayList();
+      ArrayList<CtConstructor> possible = new ArrayList<CtConstructor>();
       for (int i = 0; i < cons.length; i++)
       {
          //non-static inner classes get wrapping class as an "invisible" constructor param 
@@ -166,11 +166,11 @@
       }
       
       if (possible.size() == 0) throw new RuntimeException("cannot resolve constructor" + method.toString());
-      if (possible.size() == 1) return (CtConstructor) possible.get(0);
+      if (possible.size() == 1) return possible.get(0);
 
       for (int i = 0; i < possible.size(); i++)
       {
-         CtConstructor ctCon = (CtConstructor) possible.get(i);
+         CtConstructor ctCon = possible.get(i);
          CtClass[] params = ctCon.getParameterTypes();
          boolean bad = false;
          for (int k = 0; k < params.length; k++)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/util/FindAnnotations.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/util/FindAnnotations.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/annotation/util/FindAnnotations.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -75,10 +75,10 @@
       }
 
       System.out.println("**** method annotations ****");
-      List methods = cf.getMethods();
+      List<MethodInfo> methods = cf.getMethods();
       for (int i = 0; i < methods.size(); i++)
       {
-         MethodInfo mi = (MethodInfo) methods.get(i);
+         MethodInfo mi = methods.get(i);
          System.out.println("method: " + mi.getName());
          System.out.println("CONST POOL: ");
          mi.getConstPool().print();
@@ -103,10 +103,10 @@
       }
 
       System.out.println("**** field annotations ****");
-      List fields = cf.getFields();
+      List<FieldInfo> fields = cf.getFields();
       for (int i = 0; i < fields.size(); i++)
       {
-         FieldInfo mi = (FieldInfo) fields.get(i);
+         FieldInfo mi = fields.get(i);
          System.out.println("field: " + mi.getName());
          System.out.println("CONST POOL: ");
          mi.getConstPool().print();
@@ -134,14 +134,14 @@
    public static void printAnnotation(Annotation info)
    {
       System.out.print("@" + info.getTypeName());
-      Set members = info.getMemberNames();
+      Set<String> members = info.getMemberNames();
       if (members != null)
       {
          System.out.print("(");
-         Iterator mit = members.iterator();
+         Iterator<String> mit = members.iterator();
          while (mit.hasNext())
          {
-            String name = (String) mit.next();
+            String name = mit.next();
             System.out.print(name + "=" + info.getMemberValue(name).toString());
             if (mit.hasNext()) System.out.print(", ");
          }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AnnotationC.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -299,7 +299,7 @@
       // compile lists
       String[] list = compileSourcepath.list();
       
-      ArrayList compilingFiles = new ArrayList();
+      ArrayList<String> compilingFiles = new ArrayList<String>();
       for (int i = 0; i < list.length; i++)
       {
          File srcDir = getProject().resolveFile(list[i]);
@@ -326,7 +326,7 @@
       StringBuffer niceSourceList = new StringBuffer("File");
       for (int i = 0; i < compilingFiles.size(); i++)
       {
-         String file = (String) compilingFiles.get(i);
+         String file = compilingFiles.get(i);
          cmd.createArgument().setValue(file);
          niceSourceList.append("    " + file + lSep);
       }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AopC.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AopC.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ant/AopC.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -27,7 +27,6 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -65,7 +64,7 @@
    private boolean report = false;
    private boolean optimized = true;
    private String maxmemory = null;
-   ArrayList sysproperties = new ArrayList();
+   ArrayList<Environment.Variable> sysproperties = new ArrayList<Environment.Variable>();
 
    File sourceFiles;
    /**
@@ -372,9 +371,8 @@
          optimize.setValue(String.valueOf(optimized));
          java.addSysproperty(optimize);
 
-         for (Iterator it = sysproperties.iterator() ; it.hasNext() ; )
+         for (Environment.Variable var : sysproperties)
          {
-            Environment.Variable var = (Environment.Variable)it.next();
             java.addSysproperty(var);
          }
          
@@ -411,7 +409,7 @@
       // scan source directories and dest directory to build up
       // compile lists
       String[] list = compileSourcepath.list();
-      ArrayList compilingFiles = new ArrayList();
+      ArrayList<String> compilingFiles = new ArrayList<String>();
       for (int i = 0; i < list.length; i++)
       {
          File srcDir = getProject().resolveFile(list[i]);
@@ -438,7 +436,7 @@
       for (int i = 0; i < compilingFiles.size(); i++)
       {
          //Add 1 to allow for the spaces between args
-         length += ((String) compilingFiles.get(i)).length() + 1;
+         length += compilingFiles.get(i).length() + 1;
 
          if (length > maxSrc)
          {
@@ -451,16 +449,15 @@
          StringBuffer niceSourceList = new StringBuffer("Files\n");
          for (int i = 0; i < compilingFiles.size(); i++)
          {
-            String file = (String) compilingFiles.get(i);
+            String file = compilingFiles.get(i);
             cmd.createArgument().setValue(file);
             niceSourceList.append("    " + file + lSep);
          }
       }
       else
       {
-         for (Iterator it = sysproperties.iterator() ; it.hasNext() ; )
+         for (Environment.Variable var : sysproperties)
          {
-            Environment.Variable var = (Environment.Variable)it.next();
             if (var.getKey().equals("java.io.tmpdir"))
             {
                System.setProperty("java.io.tmpdir", var.getValue());
@@ -481,7 +478,7 @@
 
             for (int i = 0; i < compilingFiles.size(); i++)
             {
-               writer.write((String) compilingFiles.get(i));
+               writer.write(compilingFiles.get(i));
                writer.newLine();
             }
             writer.flush();

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayBinding.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayBinding.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayBinding.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -26,8 +26,6 @@
 import java.util.List;
 
 import org.jboss.aop.advice.InterceptorFactory;
-import org.jboss.aop.pointcut.Pointcut;
-import org.jboss.aop.pointcut.ast.ParseException;
 
 /**
  * 
@@ -50,10 +48,10 @@
 
    public void addInterceptorFactory(InterceptorFactory factory)
    {
-      List list = Arrays.asList(interceptorFactories);
-      list = new ArrayList(list);
+      List<InterceptorFactory> list = Arrays.asList(interceptorFactories);
+      list = new ArrayList<InterceptorFactory>(list);
       list.add(factory);
-      interceptorFactories = (InterceptorFactory[]) list.toArray(new InterceptorFactory[list.size()]);
+      interceptorFactories = list.toArray(new InterceptorFactory[list.size()]);
    }
 
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistry.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistry.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistry.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -267,10 +267,10 @@
    
    private ArrayType isArray(Object arrayCandidate)
    {
-      Class candidateClass = arrayCandidate.getClass();
+      Class<?> candidateClass = arrayCandidate.getClass();
       if (candidateClass.isArray())
       {
-         Class componentType = candidateClass.getComponentType();
+         Class<?> componentType = candidateClass.getComponentType();
          if (componentType.isArray())
          {
             return ArrayType.MULTIDIM_ARRAY;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistryEntry.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistryEntry.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayRegistryEntry.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -31,18 +31,18 @@
 public abstract class ArrayRegistryEntry
 {
    /** WeakReference to the object or array containing the reference */
-   WeakReference owner;
+   WeakReference<Object> owner;
    
    /** WeakReference to the referenced array */
-   WeakReference array;
+   WeakReference<Object> array;
    
    /** True if the object referencing the array is a "normal" object, false if it ia an array */
    boolean ownerIsRoot;
    
    ArrayRegistryEntry(Object owner, boolean ownerIsRoot, Object array)
    {
-      this.owner = new WeakReference(owner);
-      this.array = new WeakReference(array);
+      this.owner = new WeakReference<Object>(owner);
+      this.array = new WeakReference<Object>(array);
       this.ownerIsRoot = ownerIsRoot;
       if (ownerIsRoot && owner.getClass().isArray()) {
          throw new RuntimeException("Owner is root and an array was passed in");

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayReplacement.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayReplacement.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/array/ArrayReplacement.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -91,7 +91,7 @@
       }
    }
 
-   public boolean matches(Advisor advisor, Class clazz)
+   public boolean matches(Advisor advisor, Class<?> clazz)
    {
       if (classExpr != null)
          return Util.matchesClassExpr(classExpr, clazz, advisor);

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/array/ElementArrayRegistryEntry.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/array/ElementArrayRegistryEntry.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/array/ElementArrayRegistryEntry.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -21,8 +21,6 @@
 */ 
 package org.jboss.aop.array;
 
-import java.util.HashSet;
-
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/array/FieldArrayRegistryEntry.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/array/FieldArrayRegistryEntry.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/array/FieldArrayRegistryEntry.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -21,8 +21,6 @@
 */ 
 package org.jboss.aop.array;
 
-import java.util.HashSet;
-
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/contrib/IDEClassPoolFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/contrib/IDEClassPoolFactory.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/contrib/IDEClassPoolFactory.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -46,11 +46,11 @@
 public class IDEClassPoolFactory implements ScopedClassPoolFactory
 {
 
-   private ArrayList classPaths;
+   private ArrayList<URL> classPaths;
 
    public IDEClassPoolFactory()
    {
-      classPaths = new ArrayList();
+      classPaths = new ArrayList<URL>();
    }
 
    public ScopedClassPool create(ClassLoader loader, ClassPool pool, ScopedClassPoolRepository repository)
@@ -102,7 +102,7 @@
          {
             public Object run()
             {
-               URL urlPaths[] = (URL[]) classPaths.toArray(new URL[classPaths.size()]);
+               URL urlPaths[] = classPaths.toArray(new URL[classPaths.size()]);
                loader = new Loader(urlPaths, Thread.currentThread().getContextClassLoader());
                setClassLoader(loader);
 
@@ -115,7 +115,7 @@
          insertClassPath(classPath);
       }
 
-      public Class toClass(CtClass cc)
+      public Class<?> toClass(CtClass cc)
               throws CannotCompileException
       {
          try
@@ -143,10 +143,10 @@
          super(urls, src);
       }
 
-      public Class loadClass(String name, byte[] classfile)
+      public Class<?> loadClass(String name, byte[] classfile)
               throws ClassFormatError
       {
-         Class c = defineClass(name, classfile, 0, classfile.length);
+         Class<?> c = defineClass(name, classfile, 0, classfile.length);
 
          resolveClass(c);
          return c;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/eclipsesupport/EclipseTestTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/eclipsesupport/EclipseTestTransformer.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/eclipsesupport/EclipseTestTransformer.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -118,7 +118,7 @@
       {
           if(args[i].toLowerCase().equals("-classnames") || args[i].toLowerCase().equals("-classname"))
           {
-              Vector list = new Vector();
+              Vector<String> list = new Vector<String>();
               for(int j = i + 1; j < args.length; j++)
               {
                   if(args[j].startsWith("-"))
@@ -128,7 +128,7 @@
                   list.add(args[j]);
               }
 
-              fTestClassNames = (String[])list.toArray(new String[list.size()]);
+              fTestClassNames = list.toArray(new String[list.size()]);
           } 
       }
       

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/AnnotationIntroduction.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -132,7 +132,7 @@
       return ((Boolean) target.jjtAccept(matcher, null)).booleanValue();
    }
 
-   public boolean matches(Advisor advisor, Class clazz)
+   public boolean matches(Advisor advisor, Class<?> clazz)
    {
       AnnotationMatcher matcher = new AnnotationMatcher(advisor, clazz);
       return ((Boolean) target.jjtAccept(matcher, null)).booleanValue();
@@ -144,7 +144,7 @@
       return ((Boolean) target.jjtAccept(matcher, null)).booleanValue();
    }
 
-   public boolean matches(Advisor advisor, Constructor con)
+   public boolean matches(Advisor advisor, Constructor<?> con)
    {
       AnnotationMatcher matcher = new AnnotationMatcher(advisor, con);
       return ((Boolean) target.jjtAccept(matcher, null)).booleanValue();

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/InterfaceIntroduction.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/InterfaceIntroduction.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/introduction/InterfaceIntroduction.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -264,7 +264,7 @@
       }
    }
 
-   public boolean matches(Advisor advisor, Class clazz)
+   public boolean matches(Advisor advisor, Class<?> clazz)
    {
       if (classExpr != null)
          return Util.matchesClassExpr(classExpr, clazz, advisor);

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/microcontainer/lifecycle/LifecycleCallbackBinding.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/microcontainer/lifecycle/LifecycleCallbackBinding.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/microcontainer/lifecycle/LifecycleCallbackBinding.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -118,7 +118,7 @@
       return name.hashCode();
    }
 
-   public boolean matches(Advisor advisor, Class clazz)
+   public boolean matches(Advisor advisor, Class<?> clazz)
    {
       if (classes != null)
       {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AdvisorMatcherStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AdvisorMatcherStrategy.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AdvisorMatcherStrategy.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -39,12 +39,12 @@
    {
    }
 
-   protected boolean checkIntroductions(Class clazz, ClassExpression instanceOf, Advisor advisor)
+   protected boolean checkIntroductions(Class<?> clazz, ClassExpression instanceOf, Advisor advisor)
    {
       return false;
    }
   
-   public Class getDeclaringClass(Advisor advisor, Method m)
+   public Class<?> getDeclaringClass(Advisor advisor, Method m)
    {
       return m.getDeclaringClass();
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AnnotationMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AnnotationMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/AnnotationMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -131,12 +131,12 @@
       return null;
    }
 
-   public Class getJavaDeclaringClass()
+   public Class<?> getJavaDeclaringClass()
    {
-      if (element instanceof Class) return (Class) element;
+      if (element instanceof Class) return (Class<?>) element;
       if (element instanceof Method) return ((Method) element).getDeclaringClass();
       if (element instanceof Field) return ((Field) element).getDeclaringClass();
-      if (element instanceof Constructor) return ((Constructor) element).getDeclaringClass();
+      if (element instanceof Constructor) return ((Constructor<?>) element).getDeclaringClass();
       return null;
    }
 
@@ -157,7 +157,7 @@
       }
       else
       {
-         Class clazz = getJavaDeclaringClass();
+         Class<?> clazz = getJavaDeclaringClass();
          if (n instanceof ASTMethod)
          {
             return new Boolean(Util.has(clazz, (ASTMethod) n, advisor));
@@ -180,7 +180,7 @@
       }
       else
       {
-         Class clazz = getJavaDeclaringClass();
+         Class<?> clazz = getJavaDeclaringClass();
          ASTField f = (ASTField) node.jjtGetChild(0);
          return new Boolean(Util.has(clazz, f, advisor));
       }
@@ -196,7 +196,7 @@
       }
       else
       {
-         Class clazz = (Class) element;
+         Class<?> clazz = (Class<?>) element;
          return new Boolean(Util.matchesClassExpr(node.getClazz(), clazz, advisor));
       }
 
@@ -238,7 +238,7 @@
       else
       {
          ConstructorMatcher conMatcher = null;
-         conMatcher = new ConstructorMatcher(advisor, (Constructor) element, null);
+         conMatcher = new ConstructorMatcher(advisor, (Constructor<?>) element, null);
          return conMatcher.matches(node);
       }
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlow.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlow.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlow.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -122,7 +122,7 @@
       else
       {
          // FIXME ClassLoader - why should the class be visible from the context classloader?
-         Class clazz = loadClass(element.getClassName());
+         Class<?> clazz = loadClass(element.getClassName());
          
          if (Untransformable.class.isAssignableFrom(clazz))
          {
@@ -138,7 +138,7 @@
       return true;
    }
    
-   private Class loadClass(String name)
+   private Class<?> loadClass(String name)
    {
       return SecurityActions.loadClass(name);
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlowStack.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlowStack.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CFlowStack.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -33,7 +33,7 @@
 public class CFlowStack
 {
    private String name;
-   private ArrayList cflows = new ArrayList();
+   private ArrayList<CFlow> cflows = new ArrayList<CFlow>();
 
    public CFlowStack(String name)
    {
@@ -45,7 +45,7 @@
       return name;
    }
 
-   public void addCFlow(org.jboss.aop.pointcut.CFlow cflow)
+   public void addCFlow(CFlow cflow)
    {
       cflows.add(cflow);
    }
@@ -55,7 +55,7 @@
       int stackIndex = stack.length - 1;
       for (int i = 0; i < cflows.size(); i++)
       {
-         org.jboss.aop.pointcut.CFlow cflow = (org.jboss.aop.pointcut.CFlow)cflows.get(i);
+         CFlow cflow = cflows.get(i);
          stackIndex = cflow.matches(stack, stackIndex);
          if (stackIndex == org.jboss.aop.pointcut.CFlow.NOT_FOUND)
          {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CallMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CallMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/CallMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -47,10 +47,10 @@
 {
    Advisor advisor;
    AccessibleObject within;
-   Class calledClass;
+   Class<?> calledClass;
    Method calledMethod;
 
-   public CallMatcher(Advisor advisor, AccessibleObject within, Class calledClass, Method calledMethod, ASTStart start)
+   public CallMatcher(Advisor advisor, AccessibleObject within, Class<?> calledClass, Method calledMethod, ASTStart start)
    {
       super(start, advisor.getManager());
       this.advisor = advisor;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructionMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructionMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructionMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -47,7 +47,7 @@
       super(advisor, con, start);
    }
 
-   public ConstructionMatcher(Advisor advisor, Constructor con, ASTStart start)
+   public ConstructionMatcher(Advisor advisor, Constructor<?> con, ASTStart start)
    {
       super(advisor, con, start);
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorCallMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorCallMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorCallMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -47,10 +47,10 @@
 {
    Advisor advisor;
    AccessibleObject within;
-   Class calledClass;
-   Constructor calledConstructor;
+   Class<?> calledClass;
+   Constructor<?> calledConstructor;
 
-   public ConstructorCallMatcher(Advisor advisor, AccessibleObject within, Class calledClass, Constructor calledCon, ASTStart start)
+   public ConstructorCallMatcher(Advisor advisor, AccessibleObject within, Class<?> calledClass, Constructor<?> calledCon, ASTStart start)
    {
       super(start, advisor.getManager());
       this.advisor = advisor;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ConstructorMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -27,6 +27,7 @@
 import org.jboss.aop.pointcut.ast.ASTAll;
 import org.jboss.aop.pointcut.ast.ASTAttribute;
 import org.jboss.aop.pointcut.ast.ASTConstructor;
+import org.jboss.aop.pointcut.ast.ASTException;
 import org.jboss.aop.pointcut.ast.ASTStart;
 
 import javassist.CtConstructor;
@@ -42,7 +43,7 @@
 {
    protected Advisor advisor;
    protected CtConstructor ctCon;
-   protected Constructor refCon;
+   protected Constructor<?> refCon;
    protected int conModifiers;
    protected String classname;
 
@@ -56,7 +57,7 @@
       this.ctCon = con;
    }
 
-   public ConstructorMatcher(Advisor advisor, Constructor con, ASTStart start)
+   public ConstructorMatcher(Advisor advisor, Constructor<?> con, ASTStart start)
    {
       super(start, advisor.getManager());
       this.advisor = advisor;
@@ -130,7 +131,7 @@
       }
       
       //Match exceptions
-      ArrayList nodeExceptions = node.getExceptions();
+      ArrayList<ASTException> nodeExceptions = node.getExceptions();
       if (nodeExceptions.size() > 0)
       {
          if (ctCon != null)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareDef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareDef.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareDef.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -120,7 +120,7 @@
       return ((Boolean) ast.jjtAccept(matcher, null)).booleanValue();
    }
 
-   public boolean matches(Advisor advisor, Class clazz)
+   public boolean matches(Advisor advisor, Class<?> clazz)
    {
       if (pointcut)return false;
       DeclareTypeMatcher matcher = new DeclareTypeMatcher(advisor, clazz);

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareTypeMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareTypeMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/DeclareTypeMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -41,7 +41,7 @@
  */
 public class DeclareTypeMatcher extends TypeMatcher
 {
-   public DeclareTypeMatcher(Advisor advisor, Class clazz)
+   public DeclareTypeMatcher(Advisor advisor, Class<?> clazz)
    {
       super(advisor, clazz);
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ExecutionConstructorMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -48,7 +48,7 @@
       super(advisor, con, start);
    }
 
-   public ExecutionConstructorMatcher(Advisor advisor, Constructor con, ASTStart start)
+   public ExecutionConstructorMatcher(Advisor advisor, Constructor<?> con, ASTStart start)
    {
       super(advisor, con, start);
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MatcherStrategy.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -21,6 +21,7 @@
 */ 
 package org.jboss.aop.pointcut;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
 import org.jboss.aop.Advisor;
@@ -54,7 +55,7 @@
       return ADVISOR_MATCHER_STRATEGY;
    }
 
-   public boolean subtypeOf(Class clazz, ClassExpression instanceOf, Advisor advisor)
+   public boolean subtypeOf(Class<?> clazz, ClassExpression instanceOf, Advisor advisor)
    {
       
       if (clazz == null) return false;
@@ -64,10 +65,13 @@
          try
          {
             // FIXME ClassLoader - why should the class be visible from the context classloader? 
-            Class annotation = SecurityActions.getContextClassLoader().loadClass(sub);
-            if (AnnotationElement.getAnyAnnotation(clazz, annotation) != null)
+            Class<?> annotation = SecurityActions.getContextClassLoader().loadClass(sub);
+            if (Annotation.class.isAssignableFrom(annotation))
             {
-               return true;
+               if (AnnotationElement.getAnyAnnotation(clazz, (Class<? extends Annotation>)annotation) != null)
+               {
+                  return true;
+               }
             }
          }
          catch (ClassNotFoundException e)
@@ -84,7 +88,7 @@
          return true;
       }
 
-      Class[] interfaces = clazz.getInterfaces();
+      Class<?>[] interfaces = clazz.getInterfaces();
       for (int i = 0; i < interfaces.length; i++)
       {
          if (subtypeOf(interfaces[i], instanceOf, advisor)) return true;
@@ -99,7 +103,7 @@
       return subtypeOf(clazz.getSuperclass(), instanceOf, advisor);
    }
 
-   protected abstract boolean checkIntroductions(Class clazz, ClassExpression instanceOf, Advisor advisor);
+   protected abstract boolean checkIntroductions(Class<?> clazz, ClassExpression instanceOf, Advisor advisor);
    
-   public abstract Class getDeclaringClass(Advisor advisor, Method m);
+   public abstract Class<?> getDeclaringClass(Advisor advisor, Method m);
 }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MethodMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MethodMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/MethodMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -27,6 +27,7 @@
 import org.jboss.aop.Advisor;
 import org.jboss.aop.pointcut.ast.ASTAll;
 import org.jboss.aop.pointcut.ast.ASTAttribute;
+import org.jboss.aop.pointcut.ast.ASTException;
 import org.jboss.aop.pointcut.ast.ASTMethod;
 import org.jboss.aop.pointcut.ast.ASTStart;
 import org.jboss.aop.pointcut.ast.ClassExpression;
@@ -48,7 +49,7 @@
    protected int methodModifiers;
    protected String classname;
    protected String methodName;
-   protected Class matchedClass;
+   protected Class<?> matchedClass;
    protected int matchLevel;//0 if matches the exact class, 1 if the direct superclass etc.
    protected boolean isInstanceof;
 
@@ -74,7 +75,7 @@
       this.methodName = refMethod.getName();
    }
 
-   public Class getMatchedClass()
+   public Class<?> getMatchedClass()
    {
       return matchedClass;
    }
@@ -122,14 +123,14 @@
       }
       else
       {
-         Class declaringClass = MatcherStrategy.getMatcher(advisor).getDeclaringClass(advisor, refMethod);
+         Class<?> declaringClass = MatcherStrategy.getMatcher(advisor).getDeclaringClass(advisor, refMethod);
          if (!advisor.chainOverridingForInheritedMethods())
          {
             matches = classMatchesAll(expr);
          }
          else
          {
-            Class advisedClass = advisor.getClazz();
+            Class<?> advisedClass = advisor.getClazz();
             matchedClass = advisedClass;
             while (matchedClass != null)
             {
@@ -240,7 +241,7 @@
       }
       else
       {
-         Class declaringClass = MatcherStrategy.getMatcher(advisor).getDeclaringClass(advisor, refMethod);
+         Class<?> declaringClass = MatcherStrategy.getMatcher(advisor).getDeclaringClass(advisor, refMethod);
          if (!advisor.chainOverridingForInheritedMethods())
          {
             if (Util.matchesClassExpr(node.getClazz(), declaringClass, advisor))
@@ -252,7 +253,7 @@
          }
          else
          {
-            Class advisedClass = advisor.getClazz();
+            Class<?> advisedClass = advisor.getClazz();
             if (advisor.getClazz() == null)
             {
                throw new RuntimeException("Advisor is null");
@@ -353,7 +354,7 @@
    protected boolean matchesExceptions(ASTMethod node)
    {
       //Match exceptions
-      ArrayList nodeExceptions = node.getExceptions();
+      ArrayList<ASTException> nodeExceptions = node.getExceptions();
       if (nodeExceptions.size() > 0)
       {
          if (ctMethod != null)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Pointcut.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Pointcut.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Pointcut.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -54,12 +54,12 @@
    boolean matchesCall(Advisor callingAdvisor, NewExpr methodCall) throws NotFoundException;
 
    PointcutMethodMatch matchesExecution(Advisor advisor, Method m);
-   boolean matchesExecution(Advisor advisor, Constructor c);
-   boolean matchesConstruction(Advisor advisor, Constructor c);
+   boolean matchesExecution(Advisor advisor, Constructor<?> c);
+   boolean matchesConstruction(Advisor advisor, Constructor<?> c);
    boolean matchesGet(Advisor advisor, Field f);
    boolean matchesSet(Advisor advisor, Field f);
-   boolean matchesCall(Advisor advisor, AccessibleObject within, Class calledClass, Method calledMethod);
-   boolean matchesCall(Advisor advisor, AccessibleObject within, Class calledClass, Constructor calledCon);
+   boolean matchesCall(Advisor advisor, AccessibleObject within, Class<?> calledClass, Method calledMethod);
+   boolean matchesCall(Advisor advisor, AccessibleObject within, Class<?> calledClass, Constructor<?> calledCon);
 
    String getExpr();
 

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutExpression.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutExpression.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutExpression.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -126,7 +126,7 @@
       return null;
    }
 
-   public boolean matchesExecution(Advisor advisor, Constructor c)
+   public boolean matchesExecution(Advisor advisor, Constructor<?> c)
    {
       if (stats == null || stats.isExecution())
       {
@@ -136,7 +136,7 @@
       return false;
    }
 
-   public boolean matchesConstruction(Advisor advisor, Constructor c)
+   public boolean matchesConstruction(Advisor advisor, Constructor<?> c)
    {
       if (stats == null || stats.isConstruction())
       {
@@ -224,7 +224,7 @@
       return false;
    }
 
-   public boolean matchesCall(Advisor advisor, AccessibleObject within, Class calledClass, Method calledMethod)
+   public boolean matchesCall(Advisor advisor, AccessibleObject within, Class<?> calledClass, Method calledMethod)
    {
       if (stats == null || stats.isWithin() || stats.isWithincode() || stats.isCall())
       {
@@ -235,7 +235,7 @@
    }
 
 
-   public boolean matchesCall(Advisor advisor, AccessibleObject within, Class calledClass, Constructor calledCon)
+   public boolean matchesCall(Advisor advisor, AccessibleObject within, Class<?> calledClass, Constructor<?> calledCon)
    {
       if (stats == null || stats.isWithin() || stats.isWithincode() || stats.isCall())
       {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutMethodMatch.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutMethodMatch.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/PointcutMethodMatch.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -30,10 +30,10 @@
 {
    private boolean matches;
    private int matchLevel;
-   private Class matchedClass;
+   private Class<?> matchedClass;
    private boolean isInstanceOf;
 
-   public PointcutMethodMatch(boolean matches, Class matchedClass, int matchLevel, boolean isInstanceOf)
+   public PointcutMethodMatch(boolean matches, Class<?> matchedClass, int matchLevel, boolean isInstanceOf)
    {
       this.matches = matches;
       this.matchLevel = matchLevel;
@@ -41,7 +41,7 @@
       this.isInstanceOf = isInstanceOf;
    }
 
-   public Class getMatchedClass()
+   public Class<?> getMatchedClass()
    {
       return matchedClass;
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ProxyMatcherStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ProxyMatcherStrategy.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/ProxyMatcherStrategy.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -23,7 +23,6 @@
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import org.jboss.aop.Advisor;
 import org.jboss.aop.introduction.InterfaceIntroduction;
@@ -45,7 +44,7 @@
    {
    }
    
-   protected boolean checkIntroductions(Class clazz, ClassExpression instanceOf, Advisor advisor)
+   protected boolean checkIntroductions(Class<?> clazz, ClassExpression instanceOf, Advisor advisor)
    {
       try
       {
@@ -53,33 +52,31 @@
          {
             // FIXME ClassLoader - why should the class be visible from the context classloader?
             ClassLoader cl = SecurityActions.getContextClassLoader();
-            ArrayList intros = advisor.getInterfaceIntroductions();
+            ArrayList<InterfaceIntroduction> intros = advisor.getInterfaceIntroductions();
             if (intros.size() > 0)
             {
-               for (Iterator itIntro = intros.iterator() ; itIntro.hasNext() ; )
+               for (InterfaceIntroduction intro :intros)
                {
-                  InterfaceIntroduction intro = (InterfaceIntroduction)itIntro.next();
                   String[] introductions = intro.getInterfaces();
                   if (introductions != null)
                   {
                      for (int i = 0 ; i < introductions.length ; i++)
                      {
-                        Class iface = cl.loadClass(introductions[i]);
+                        Class<?> iface = cl.loadClass(introductions[i]);
                         if (subtypeOf(iface, instanceOf, advisor)) return true;
                      }
                   }
-                  ArrayList mixins = intro.getMixins();
+                  ArrayList<InterfaceIntroduction.Mixin> mixins = intro.getMixins();
                   if (mixins.size() > 0)
                   {
-                     for (Iterator itMixin = mixins.iterator() ; itMixin.hasNext() ; )
+                     for (InterfaceIntroduction.Mixin mixin : mixins)
                      {
-                        InterfaceIntroduction.Mixin mixin = (InterfaceIntroduction.Mixin)itMixin.next();
                         String[] mixinInterfaces = mixin.getInterfaces();
                         if (mixinInterfaces != null)
                         {
                            for (int i = 0 ; i < mixinInterfaces.length ; i++)
                            {
-                              Class iface = cl.loadClass(mixinInterfaces[i]);
+                              Class<?> iface = cl.loadClass(mixinInterfaces[i]);
                               if (subtypeOf(iface, instanceOf, advisor)) return true;                              
                            }
                         }
@@ -101,10 +98,10 @@
     * Interface Introduced methods on the proxy will have the wrong declaring class for the matcher,
     * use the advisor class if it is an interface
     */
-   public Class getDeclaringClass(Advisor advisor, Method m)
+   public Class<?> getDeclaringClass(Advisor advisor, Method m)
    {
-      final Class methodClass = m.getDeclaringClass();
-      final Class advisorClass = advisor.getClazz();
+      final Class<?> methodClass = m.getDeclaringClass();
+      final Class<?> advisorClass = advisor.getClazz();
       
       if (advisorClass != null && methodClass.isInterface())
       {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SecurityActions.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SecurityActions.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SecurityActions.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -21,7 +21,6 @@
 */ 
 package org.jboss.aop.pointcut;
 
-import java.lang.reflect.AccessibleObject;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
@@ -34,7 +33,7 @@
  */
 class SecurityActions
 {
-   static Class loadClass(String name)
+   static Class<?> loadClass(String name)
    {
       if (System.getSecurityManager() == null)
       {
@@ -48,17 +47,17 @@
 
    interface LoadClassAction
    {
-      Class loadClass(String name);
+      Class<?> loadClass(String name);
       
       LoadClassAction PRIVILEGED = new LoadClassAction()
       {
-         public Class loadClass(final String name)
+         public Class<?> loadClass(final String name)
          {
             try
             {
-               return AccessController.doPrivileged(new PrivilegedExceptionAction<Class>()
+               return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>()
                {
-                  public Class run() throws Exception
+                  public Class<?> run() throws Exception
                   {
                      return Thread.currentThread().getContextClassLoader().loadClass(name);
                   }
@@ -73,7 +72,7 @@
 
       LoadClassAction NON_PRIVILEGED = new LoadClassAction()
       {
-         public Class loadClass(String name)
+         public Class<?> loadClass(String name)
          {
             try
             {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SoftClassMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SoftClassMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/SoftClassMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -63,7 +63,7 @@
    protected Advisor advisor;
    protected String classname;
    protected boolean match = false;
-   protected Class clazz;
+   protected Class<?> clazz;
 
    public SoftClassMatcher(Advisor advisor, String classname, ASTStart start)
    {

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypeMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypeMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypeMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -54,9 +54,9 @@
 {
    protected Advisor advisor;
    protected CtClass ctClass;
-   protected Class clazz;
+   protected Class<?> clazz;
 
-   public TypeMatcher(Advisor advisor, Class clazz)
+   public TypeMatcher(Advisor advisor, Class<?> clazz)
    {
       this.advisor = advisor;
       this.clazz = clazz;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Typedef.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Typedef.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Typedef.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -32,5 +32,5 @@
    public abstract String getName();
    public abstract String getExpr();
 	public boolean matches(Advisor advisor, CtClass clazz);
-   public boolean matches(Advisor advisor, Class clazz);
+   public boolean matches(Advisor advisor, Class<?> clazz);
 }
\ No newline at end of file

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypedefExpression.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypedefExpression.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/TypedefExpression.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -62,7 +62,7 @@
       return ((Boolean) ast.jjtAccept(matcher, null)).booleanValue();
    }
 
-   public boolean matches(Advisor advisor, Class clazz)
+   public boolean matches(Advisor advisor, Class<?> clazz)
    {
       TypeMatcher matcher = new TypeMatcher(advisor, clazz);
       return ((Boolean) ast.jjtAccept(matcher, null)).booleanValue();

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Util.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Util.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/Util.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -97,12 +97,12 @@
 
    }
 
-   public static boolean matchesClassExpr(ClassExpression classExpr, Class clazz)
+   public static boolean matchesClassExpr(ClassExpression classExpr, Class<?> clazz)
    {
       return matchesClassExpr(classExpr, clazz, null);
    }
    
-   public static boolean matchesClassExpr(ClassExpression classExpr, Class clazz, Advisor advisor)
+   public static boolean matchesClassExpr(ClassExpression classExpr, Class<?> clazz, Advisor advisor)
    {
       try
       {
@@ -154,7 +154,7 @@
       return exists;
    }
    
-   private static boolean methodExistsInSuperClassOrInterface(long hash, ClassExpression expr, Class clazz, boolean exactSuper) throws Exception
+   private static boolean methodExistsInSuperClassOrInterface(long hash, ClassExpression expr, Class<?> clazz, boolean exactSuper) throws Exception
    {
       if (clazz == null) return false;
       
@@ -171,7 +171,7 @@
           if (classHasMethod(clazz, hash, exactSuper)) return true;
        }
 
-       Class[] interfaces = clazz.getInterfaces();
+       Class<?>[] interfaces = clazz.getInterfaces();
        for (int i = 0; i < interfaces.length; i++)
        {
           if (methodExistsInSuperClassOrInterface(hash, expr, interfaces[i], exactSuper)) return true;
@@ -190,15 +190,14 @@
    {
       if (advisor != null)
       {
-         ArrayList intros = advisor.getInterfaceIntroductions();
+         ArrayList<InterfaceIntroduction> intros = advisor.getInterfaceIntroductions();
          if (intros.size() > 0)
          {
             ClassLoader tcl = Thread.currentThread().getContextClassLoader();
             ClassPool pool = advisor.getManager().findClassPool(tcl);
-            HashSet doneClasses = new HashSet();
-            for (Iterator it = intros.iterator() ; it.hasNext() ; )
+            HashSet<String> doneClasses = new HashSet<String>();
+            for (InterfaceIntroduction intro : intros)
             {
-               InterfaceIntroduction intro = (InterfaceIntroduction)it.next();
                String[] ifs = intro.getInterfaces();
                for (int i = 0 ; ifs != null && i < ifs.length ; i++)
                {
@@ -209,12 +208,11 @@
                   }
                }
                
-               ArrayList mixins = intro.getMixins();
+               ArrayList<InterfaceIntroduction.Mixin> mixins = intro.getMixins();
                if (mixins != null && mixins.size() > 0)
                {
-                  for (Iterator mit = mixins.iterator() ; mit.hasNext() ; )
+                  for (InterfaceIntroduction.Mixin mixin : mixins)
                   {
-                     InterfaceIntroduction.Mixin mixin = (InterfaceIntroduction.Mixin)mit.next();
                      String[] mifs = mixin.getInterfaces();
                      for (int i = 0 ; mifs != null && i < mifs.length ; i++)
                      {
@@ -232,7 +230,7 @@
       return false;
    }
    
-   private static boolean classHasMethod(Class clazz, long hash, boolean exactSuper)throws Exception
+   private static boolean classHasMethod(Class<?> clazz, long hash, boolean exactSuper)throws Exception
    {
       Method m = MethodHashing.findMethodByHash(clazz, hash);
       if (m != null)
@@ -264,7 +262,6 @@
    private static boolean methodExistsInSuperClassOrInterface(ClassPool pool, long hash, ClassExpression expr, String className, boolean exactSuper) throws Exception
    {
       CtClass clazz = pool.get(className);
-      HashMap map = JavassistMethodHashing.getMethodMap(clazz);
       return methodExistsInSuperClassOrInterface(hash, expr, clazz, exactSuper);
    }
    
@@ -297,8 +294,8 @@
    
    private static boolean classHasMethod(CtClass clazz, long hash, boolean exactSuper)throws Exception
    {
-      HashMap methods = JavassistMethodHashing.getMethodMap(clazz);
-      CtMethod m = (CtMethod)methods.get(new Long(hash));
+      HashMap<Long, CtMethod> methods = JavassistMethodHashing.getMethodMap(clazz);
+      CtMethod m = methods.get(new Long(hash));
       if (m != null)
       {
          if (exactSuper)
@@ -366,33 +363,31 @@
          {
             // FIXME ClassLoader - why should the class be visible from the context classloader?
             ClassLoader cl = SecurityActions.getContextClassLoader();
-            ArrayList intros = advisor.getInterfaceIntroductions();
+            ArrayList<InterfaceIntroduction> intros = advisor.getInterfaceIntroductions();
             if (intros.size() > 0)
             {
-               for (Iterator itIntro = intros.iterator() ; itIntro.hasNext() ; )
+               for (InterfaceIntroduction intro : intros)
                {
-                  InterfaceIntroduction intro = (InterfaceIntroduction)itIntro.next();
                   String[] introductions = intro.getInterfaces();
                   if (introductions != null)
                   {
                      for (int i = 0 ; i < introductions.length ; i++)
                      {
-                        Class iface = cl.loadClass(introductions[i]);
+                        Class<?> iface = cl.loadClass(introductions[i]);
                         if (subtypeOf(iface, instanceOf, advisor)) return true;
                      }
                   }
-                  ArrayList mixins = intro.getMixins();
+                  ArrayList<InterfaceIntroduction.Mixin> mixins = intro.getMixins();
                   if (mixins.size() > 0)
                   {
-                     for (Iterator itMixin = mixins.iterator() ; itMixin.hasNext() ; )
+                     for (InterfaceIntroduction.Mixin mixin : mixins)
                      {
-                        InterfaceIntroduction.Mixin mixin = (InterfaceIntroduction.Mixin)itMixin.next();
                         String[] mixinInterfaces = mixin.getInterfaces();
                         if (mixinInterfaces != null)
                         {
                            for (int i = 0 ; i < mixinInterfaces.length ; i++)
                            {
-                              Class iface = cl.loadClass(mixinInterfaces[i]);
+                              Class<?> iface = cl.loadClass(mixinInterfaces[i]);
                               if (subtypeOf(iface, instanceOf, advisor)) return true;                              
                            }
                         }
@@ -410,7 +405,7 @@
       return false;
    }
    
-   public static boolean subtypeOf(Class clazz, ClassExpression instanceOf, Advisor advisor)
+   public static boolean subtypeOf(Class<?> clazz, ClassExpression instanceOf, Advisor advisor)
    {
       return MatcherStrategy.getMatcher(advisor).subtypeOf(clazz, instanceOf, advisor);
    }
@@ -491,12 +486,12 @@
       return false;
    }
 
-   public static boolean has(Class target, ASTMethod method, Advisor advisor)
+   public static boolean has(Class<?> target, ASTMethod method, Advisor advisor)
    {
       return has(target, method, advisor, true);
    }
    
-   public static boolean has(Class target, ASTMethod method, Advisor advisor, boolean checkSuper)
+   public static boolean has(Class<?> target, ASTMethod method, Advisor advisor, boolean checkSuper)
    {
       Method[] methods = advisor.getAllMethods();
       if (methods == null)
@@ -509,18 +504,18 @@
       
       if (checkSuper)
       {
-         Class superClass = target.getSuperclass();
+         Class<?> superClass = target.getSuperclass();
          if (superClass != null) return has(superClass, method, advisor, checkSuper);
       }
       return false;
    }
 
-   public static boolean has(Class target, ASTField field, Advisor advisor)
+   public static boolean has(Class<?> target, ASTField field, Advisor advisor)
    {
       return has(target, field, advisor, true);
    }
    
-   public static boolean has(Class target, ASTField field, Advisor advisor, boolean checkSuper)
+   public static boolean has(Class<?> target, ASTField field, Advisor advisor, boolean checkSuper)
    {
       Field[] fields = target.getDeclaredFields();
       for (int i = 0; i < fields.length; i++)
@@ -531,15 +526,15 @@
       
       if (checkSuper)
       {
-         Class superClass = target.getSuperclass();
+         Class<?> superClass = target.getSuperclass();
          if (superClass != null) return has(superClass, field, advisor, checkSuper);
       }
       return false;
    }
 
-   public static boolean has(Class target, ASTConstructor con, Advisor advisor)
+   public static boolean has(Class<?> target, ASTConstructor con, Advisor advisor)
    {
-      Constructor[] cons = target.getDeclaredConstructors();
+      Constructor<?>[] cons = target.getDeclaredConstructors();
       for (int i = 0; i < cons.length; i++)
       {
          ConstructorMatcher matcher = new ConstructorMatcher(advisor, cons[i], null);
@@ -558,7 +553,7 @@
       return typedef.matches(advisor, clazz);
    }
 
-   public static boolean matchesTypedef(Class clazz, ClassExpression classExpr, Advisor advisor)
+   public static boolean matchesTypedef(Class<?> clazz, ClassExpression classExpr, Advisor advisor)
    {
       String original = classExpr.getOriginal();
       String typedefName = original.substring("$typedef{".length(), original.lastIndexOf("}"));
@@ -605,23 +600,25 @@
     * @param nodeExceptions  ArrayList of ASTException entries for a given ASTMethod or ASTConstructor
     * @param foundExceptions Array of Exceptions found for a method/constructor
     */
-   public static boolean matchExceptions(ArrayList nodeExceptions, CtClass[] foundExceptions)
+   public static boolean matchExceptions(ArrayList<ASTException> nodeExceptions, CtClass[] foundExceptions)
    {
       if (nodeExceptions.size() > foundExceptions.length) return false;
-      for (Iterator it = nodeExceptions.iterator(); it.hasNext();)
+      if (nodeExceptions.size() > 0)
       {
-         boolean found = false;
-         ASTException ex = (ASTException) it.next();
-         for (int i = 0; i < foundExceptions.length; i++)
+         for (ASTException ex : nodeExceptions)
          {
-            if (ex.getType().matches(foundExceptions[i].getName()))
+            boolean found = false;
+            for (int i = 0; i < foundExceptions.length; i++)
             {
-               found = true;
-               break;
+               if (ex.getType().matches(foundExceptions[i].getName()))
+               {
+                  found = true;
+                  break;
+               }
             }
+   
+            if (!found) return false;
          }
-
-         if (!found) return false;
       }
 
       return true;
@@ -631,7 +628,7 @@
     * @param nodeExceptions  ArrayList of ASTException entries for a given ASTMethod or ASTConstructor
     * @param foundExceptions Array of Exceptions found for a method/constructor
     */
-   public static boolean matchExceptions(ArrayList<ASTException> nodeExceptions, Class[] foundExceptions)
+   public static boolean matchExceptions(ArrayList<ASTException> nodeExceptions, Class<?>[] foundExceptions)
    {
       if (nodeExceptions.size() > foundExceptions.length) return false;
       for (Iterator<ASTException> it = nodeExceptions.iterator(); it.hasNext();)
@@ -669,7 +666,6 @@
 
    public static boolean matchesParameters(Advisor advisor, ASTConstructor node, CtConstructor ctConstructor)
    {
-      int i = 0;
       if (node.isAnyParameters()) return true;
       try
       {
@@ -689,22 +685,20 @@
       return matchesParameters(advisor, node.hasAnyZeroOrMoreParameters(), node.getParameters(), method.getParameterTypes());
    }
 
-   public static boolean matchesParameters(Advisor advisor, ASTConstructor node, Constructor con) 
+   public static boolean matchesParameters(Advisor advisor, ASTConstructor node, Constructor<?> con) 
    {
       if (node.isAnyParameters()) return true;
-      
-      Class[] params = con.getParameterTypes();
-      
+
       return matchesParameters(advisor, node.hasAnyZeroOrMoreParameters(), node.getParameters(), con.getParameterTypes());
    }
 
-   private static boolean matchesParameters(Advisor advisor, boolean hasAnyZeroOrMoreParameters, ArrayList parameters, Class[] params)
+   private static boolean matchesParameters(Advisor advisor, boolean hasAnyZeroOrMoreParameters, ArrayList<ASTParameter> parameters, Class<?>[] params)
    {
       RefParameterMatcher matcher = new RefParameterMatcher(advisor, parameters, params);
       return matcher.matches();
    }
 
-   private static boolean matchesParameters(Advisor advisor, boolean hasAnyZeroOrMoreParameters, ArrayList parameters, CtClass[] params)
+   private static boolean matchesParameters(Advisor advisor, boolean hasAnyZeroOrMoreParameters, ArrayList<ASTParameter> parameters, CtClass[] params)
    {
       CtParameterMatcher matcher = new CtParameterMatcher(advisor, parameters, params);
       return matcher.matches();
@@ -713,12 +707,12 @@
    private static abstract class ParameterMatcher
    {
       Advisor advisor;
-      ArrayList astParameters;
+      ArrayList<ASTParameter> astParameters;
       final long paramsLength;
       private int asti;
       private int actuali;
       
-      ParameterMatcher(Advisor advisor, ArrayList parameters, Object[] params)
+      ParameterMatcher(Advisor advisor, ArrayList<ASTParameter> parameters, Object[] params)
       {
          this.advisor = advisor;
          this.astParameters = parameters;
@@ -760,7 +754,7 @@
       
       private boolean isAnyZeroOrMoreParameters(int index)
       {
-         return ((ASTParameter)astParameters.get(index)).isAnyZeroOrMoreParameters();
+         return astParameters.get(index).isAnyZeroOrMoreParameters();
       }
       
       abstract boolean doMatch(int astIndex, int actualIndex);
@@ -817,8 +811,8 @@
    
    private static class RefParameterMatcher extends ParameterMatcher
    {
-      Class[] params;
-      public RefParameterMatcher(Advisor advisor, ArrayList parameters, Class[] params)
+      Class<?>[] params;
+      public RefParameterMatcher(Advisor advisor, ArrayList<ASTParameter> parameters, Class<?>[] params)
       {
          super(advisor, parameters, params);
          this.params = params;
@@ -826,7 +820,7 @@
       
       boolean doMatch(int astIndex, int actualIndex)
       {
-         ASTParameter ast = (ASTParameter) astParameters.get(astIndex);
+         ASTParameter ast = astParameters.get(astIndex);
          ClassExpression exp = ast.getType();
 
          if (exp.isSimple())
@@ -846,7 +840,7 @@
    private static class CtParameterMatcher extends ParameterMatcher
    {
       CtClass[] params;
-      public CtParameterMatcher(Advisor advisor, ArrayList parameters, CtClass[] params)
+      public CtParameterMatcher(Advisor advisor, ArrayList<ASTParameter> parameters, CtClass[] params)
       {
          super(advisor, parameters, params);
          this.params = params;
@@ -854,7 +848,7 @@
       
       boolean doMatch(int astIndex, int actualIndex)
       {
-         ASTParameter ast = (ASTParameter) astParameters.get(astIndex);
+         ASTParameter ast = astParameters.get(astIndex);
          ClassExpression exp = ast.getType();
          if (!matchesClassExpr(exp, params[actualIndex], advisor)) return false;
          return true;

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/WithinMatcher.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/WithinMatcher.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/pointcut/WithinMatcher.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -67,10 +67,10 @@
       throw new RuntimeException("NOT REACHABLE");
    }
 
-   public Class getDeclaringClass()
+   public Class<?> getDeclaringClass()
    {
       if (accessible instanceof Constructor)
-         return ((Constructor) accessible).getDeclaringClass();
+         return ((Constructor<?>) accessible).getDeclaringClass();
       else if (accessible instanceof Method) return ((Method) accessible).getDeclaringClass();
       return null;
    }
@@ -123,7 +123,7 @@
          }
       }
       if (accessible instanceof Method) return Boolean.FALSE;
-      ConstructorMatcher matcher = new ConstructorMatcher(advisor, (Constructor) accessible, null);
+      ConstructorMatcher matcher = new ConstructorMatcher(advisor, (Constructor<?>) accessible, null);
       return matcher.matches(node);
 
    }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java	2008-03-13 20:30:34 UTC (rev 70841)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/JavassistMethodHashing.java	2008-03-13 20:32:36 UTC (rev 70842)
@@ -141,7 +141,7 @@
       }
    }
    
-   private static void addDeclaredMethods(HashMap advised, CtClass superclass) throws Exception
+   private static void addDeclaredMethods(HashMap<Long, CtMethod> advised, CtClass superclass) throws Exception
    {
       CtMethod[] declaredMethods = superclass.getDeclaredMethods();
       for (int i = 0; i < declaredMethods.length; i++)
@@ -160,7 +160,7 @@
          }
       }
    }
-   private static void populateMethodTables(HashMap advised, CtClass superclass)
+   private static void populateMethodTables(HashMap<Long, CtMethod> advised, CtClass superclass)
       throws Exception
    {
       if (superclass == null) return;
@@ -181,16 +181,16 @@
       }
    }
 
-   public static HashMap getMethodMap(CtClass clazz) throws Exception
+   public static HashMap<Long, CtMethod> getMethodMap(CtClass clazz) throws Exception
    {
-      HashMap map = new HashMap();
+      HashMap<Long, CtMethod> map = new HashMap<Long, CtMethod>();
       populateMethodTables(map, clazz);
       return map;
    }
 
-   public static HashMap getDeclaredMethodMap(CtClass clazz) throws Exception
+   public static HashMap<Long, CtMethod> getDeclaredMethodMap(CtClass clazz) throws Exception
    {
-      HashMap map = new HashMap();
+      HashMap<Long, CtMethod> map = new HashMap<Long, CtMethod>();
       addDeclaredMethods(map, clazz);
       return map;
    }




More information about the jboss-cvs-commits mailing list