diff options
| author | Andy Clement <aclement@gopivotal.com> | 2014-03-18 21:46:27 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2014-03-18 21:46:27 -0700 |
| commit | bedb85ee870c2c0dad34d68662c83ff7033dd746 (patch) | |
| tree | 543d944b19d25edabfc567b047c4d0c74a7335e2 /org.aspectj.ajdt.core | |
| parent | f68fad1168cb96b6dd5402b4778a25e8b4d0acab (diff) | |
| download | aspectj-bedb85ee870c2c0dad34d68662c83ff7033dd746.tar.gz aspectj-bedb85ee870c2c0dad34d68662c83ff7033dd746.zip | |
Upgrade to JDT 1.8.0 compiler
Diffstat (limited to 'org.aspectj.ajdt.core')
2 files changed, 9 insertions, 2 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java index 1692a6679..31d9d149a 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java @@ -737,12 +737,12 @@ public class AjProblemReporter extends ProblemReporter { } } - public void duplicateMethodInType(SourceTypeBinding type, AbstractMethodDeclaration methodDecl, boolean equalParameters, int severity) { + public void duplicateMethodInType(AbstractMethodDeclaration methodDecl, boolean equalParameters, int severity) { if (new String(methodDecl.selector).startsWith("ajc$interMethod")) { // this is an ITD clash and will be reported in another way by AspectJ (173602) return; } - super.duplicateMethodInType(type, methodDecl, equalParameters, severity); + super.duplicateMethodInType(methodDecl, equalParameters, severity); } // pr246393 - if we are going to complain about privileged, we clearly don't know what is going on, so don't diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java index 3d8a4627a..6770b647a 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/CompactTypeStructureRepresentation.java @@ -18,6 +18,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryField; import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryMethod; import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryNestedType; import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryType; +import org.aspectj.org.eclipse.jdt.internal.compiler.env.IBinaryTypeAnnotation; /** * Used to determine if a type has structurally changed during incremental compilation. At the end of compilation we create one of @@ -54,6 +55,7 @@ public class CompactTypeStructureRepresentation implements IBinaryType { IBinaryMethod[] binMethods; IBinaryNestedType[] memberTypes; IBinaryAnnotation[] annotations; + IBinaryTypeAnnotation[] typeAnnotations; public CompactTypeStructureRepresentation(ClassFileReader cfr, boolean isAspect) { @@ -82,6 +84,7 @@ public class CompactTypeStructureRepresentation implements IBinaryType { // references and which were real declarations this.memberTypes = cfr.getMemberTypes(isAspect); this.annotations = cfr.getAnnotations(); + this.typeAnnotations = cfr.getTypeAnnotations(); this.sourceName = cfr.getSourceName(); this.className = cfr.getName(); // slashes... this.modifiers = cfr.getModifiers(); @@ -174,4 +177,8 @@ public class CompactTypeStructureRepresentation implements IBinaryType { return sourceName; } + public IBinaryTypeAnnotation[] getTypeAnnotations() { + return typeAnnotations; + } + }
\ No newline at end of file |