generics

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java b/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
index 98eec9e262d11467a7ce19a0181b687e53abe8fe..7d3105963ccc4ef4722c96aff230bf03f7b72d60 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
@@ -17,8 +17,8 @@ import java.util.List;
 
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.util.GenericSignature;
-import org.aspectj.util.GenericSignatureParser;
 import org.aspectj.util.GenericSignature.ClassSignature;
+import org.aspectj.util.GenericSignatureParser;
 import org.aspectj.weaver.AjAttribute.WeaverVersionInfo;
 
 public abstract class AbstractReferenceTypeDelegate implements ReferenceTypeDelegate {
@@ -104,7 +104,7 @@ public abstract class AbstractReferenceTypeDelegate implements ReferenceTypeDele
        }
 
        protected GenericSignature.FormalTypeParameter[] getFormalTypeParametersFromOuterClass() {
-               List typeParameters = new ArrayList();
+               List<GenericSignature.FormalTypeParameter> typeParameters = new ArrayList<GenericSignature.FormalTypeParameter>();
                ResolvedType outerClassType = getOuterClass();
                if (!(outerClassType instanceof ReferenceType)) {
                        throw new BCException("Whilst processing type '" + this.resolvedTypeX.getSignature()

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java b/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java
index 18a1229a0edeea48ab124fd32911f298dcf3b834..311b12e1fba7783964e881a1546bf30e227f1b1a 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java
@@ -55,7 +55,7 @@ public interface AnnotationAJ {
         * @return for the @target annotation, this will return a set of the element-types it can be applied to. For other annotations ,
         *         it returns the empty set.
         */
-       public Set getTargets();
+       public Set<String> getTargets();
 
        /**
         * @param name the name of the value

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IClassFileProvider.java b/org.aspectj.matcher/src/org/aspectj/weaver/IClassFileProvider.java
deleted file mode 100644 (file)
index e4bc7d9..0000000
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IClassFileProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.aspectj.weaver;
-
-import java.util.Iterator;
-
-/**
- * @author colyer
- * 
- *         Clients implementing the IClassFileProvider can have a set of class files under their control woven by a weaver, by
- *         calling the weave(IClassFileProvider source) method. The contract is that a call to getRequestor().acceptResult() is
- *         providing a result for the class file most recently returned from the getClassFileIterator().
- */
-public interface IClassFileProvider {
-
-       /**
-        * Answer an iterator that can be used to iterate over a set of UnwovenClassFiles to be woven. During a weave, this method may
-        * be called multiple times.
-        * 
-        * @return iterator over UnwovenClassFiles.
-        */
-       Iterator getClassFileIterator();
-
-       /**
-        * The client to which the woven results should be returned.
-        */
-       IWeaveRequestor getRequestor();
-
-       /**
-        * @return true if weaver should only do some internal munging as the one needed for @AspectJ aspectOf methods creation
-        */
-       boolean isApplyAtAspectJMungersOnly();
-
-}