diff options
| author | Andy Clement <aclement@gopivotal.com> | 2014-05-16 08:45:33 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2014-05-16 08:45:33 -0700 |
| commit | 2334f629a16a1623a222bc12de10a85ff9abaa04 (patch) | |
| tree | aabf2694c815d4de0104b31bda0789689a6f4c69 /org.aspectj.ajdt.core | |
| parent | 70f2e6d63556b1ca0158021045348fca2ea4fc86 (diff) | |
| download | aspectj-2334f629a16a1623a222bc12de10a85ff9abaa04.tar.gz aspectj-2334f629a16a1623a222bc12de10a85ff9abaa04.zip | |
Update to new eclipse compiler version
Diffstat (limited to 'org.aspectj.ajdt.core')
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties | 4 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties index 64ca22c7f..51bbc925d 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties @@ -4,8 +4,8 @@ The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. ### AspectJ-specific messages -compiler.name = AspectJ Compiler 1.8.0 -compiler.version = Eclipse Compiler BETA_JAVA8_8661797, 3.9 +compiler.name = AspectJ Compiler 1.8.1 +compiler.version = Eclipse Compiler BETA_JAVA8_3f60ba6, 3.10 compiler.copyright = ## this next one superceded by above... 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 4f0dc27e0..81741a8f8 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 @@ -631,7 +631,7 @@ public class AjProblemReporter extends ProblemReporter { * implementation if the target type doesn't supply one. This test may not be complete - it is possible that it should read if * *either* is an ITD...but I dont have a testcase that shows that is required. yet. (pr115788) */ - public void duplicateInheritedMethods(SourceTypeBinding type, MethodBinding inheritedMethod1, MethodBinding inheritedMethod2) { + public void duplicateInheritedMethods(SourceTypeBinding type, MethodBinding inheritedMethod1, MethodBinding inheritedMethod2, boolean isJava8) { if (inheritedMethod1 instanceof InterTypeMethodBinding || inheritedMethod2 instanceof InterTypeMethodBinding) return; if ((inheritedMethod1 instanceof ParameterizedMethodBinding) @@ -640,7 +640,7 @@ public class AjProblemReporter extends ProblemReporter { if ((inheritedMethod2 instanceof ParameterizedMethodBinding) && ((ParameterizedMethodBinding) inheritedMethod2).original() instanceof InterTypeMethodBinding) return; - super.duplicateInheritedMethods(type, inheritedMethod1, inheritedMethod2); + super.duplicateInheritedMethods(type, inheritedMethod1, inheritedMethod2, isJava8); } /** |