aboutsummaryrefslogtreecommitdiffstats
path: root/org.aspectj.matcher/src
diff options
context:
space:
mode:
authorAndy Clement <aclement@vmware.com>2012-03-02 09:19:25 -0800
committerAndy Clement <aclement@vmware.com>2012-03-02 09:19:25 -0800
commitd4a8cc90482cb538a88f74a9aae99a323e547c84 (patch)
tree3f0d3c0d1881fc9d1cb35482d048c161096bd5bd /org.aspectj.matcher/src
parentf37c56e02982a1043e7821bf033b58495f8a6b74 (diff)
downloadaspectj-d4a8cc90482cb538a88f74a9aae99a323e547c84.tar.gz
aspectj-d4a8cc90482cb538a88f74a9aae99a323e547c84.zip
generics
Diffstat (limited to 'org.aspectj.matcher/src')
-rw-r--r--org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java
index efe5bb997..9081c5c02 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java
@@ -109,23 +109,23 @@ public class WildTypePattern extends TypePattern {
setLocation(namePatterns[0].getSourceContext(), namePatterns[0].getStart(), namePatterns[namePatterns.length - 1].getEnd());
}
- public WildTypePattern(List names, boolean includeSubtypes, int dim) {
+ public WildTypePattern(List<NamePattern> names, boolean includeSubtypes, int dim) {
this((NamePattern[]) names.toArray(new NamePattern[names.size()]), includeSubtypes, dim, false, TypePatternList.EMPTY);
}
- public WildTypePattern(List names, boolean includeSubtypes, int dim, int endPos) {
+ public WildTypePattern(List<NamePattern> names, boolean includeSubtypes, int dim, int endPos) {
this(names, includeSubtypes, dim);
this.end = endPos;
}
- public WildTypePattern(List names, boolean includeSubtypes, int dim, int endPos, boolean isVarArg) {
+ public WildTypePattern(List<NamePattern> names, boolean includeSubtypes, int dim, int endPos, boolean isVarArg) {
this(names, includeSubtypes, dim);
this.end = endPos;
this.isVarArgs = isVarArg;
}
- public WildTypePattern(List names, boolean includeSubtypes, int dim, int endPos, boolean isVarArg, TypePatternList typeParams,
+ public WildTypePattern(List<NamePattern> names, boolean includeSubtypes, int dim, int endPos, boolean isVarArg, TypePatternList typeParams,
TypePattern upperBound, TypePattern[] additionalInterfaceBounds, TypePattern lowerBound) {
this((NamePattern[]) names.toArray(new NamePattern[names.size()]), includeSubtypes, dim, isVarArg, typeParams);
this.end = endPos;
@@ -134,7 +134,7 @@ public class WildTypePattern extends TypePattern {
this.additionalInterfaceBounds = additionalInterfaceBounds;
}
- public WildTypePattern(List names, boolean includeSubtypes, int dim, int endPos, boolean isVarArg, TypePatternList typeParams) {
+ public WildTypePattern(List<NamePattern> names, boolean includeSubtypes, int dim, int endPos, boolean isVarArg, TypePatternList typeParams) {
this((NamePattern[]) names.toArray(new NamePattern[names.size()]), includeSubtypes, dim, isVarArg, typeParams);
this.end = endPos;
}
@@ -588,7 +588,7 @@ public class WildTypePattern extends TypePattern {
}
@Override
- public TypePattern parameterizeWith(Map typeVariableMap, World w) {
+ public TypePattern parameterizeWith(Map<String,UnresolvedType> typeVariableMap, World w) {
NamePattern[] newNamePatterns = new NamePattern[namePatterns.length];
for (int i = 0; i < namePatterns.length; i++) {
newNamePatterns[i] = namePatterns[i];