[ecj] 76/145: Fixed the compilation errors caused by @Override annotations

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit 9c7a319394a6831f505555d414b14b1a4c7a749e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 26 16:51:36 2014 +0200

    Fixed the compilation errors caused by @Override annotations
---
 debian/changelog                     |  1 +
 debian/patches/remove-overrides.diff | 55 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9490607..f156d71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ecj (3.10.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release (built from the R4_4 tag, identifies itself as 3.10.0)
     - Refreshed gcc-changes.diff
+    - Added a patch fixing compilation errors caused by @Override annotations
     - Updated the version of the Maven pom
   * debian/control:
     - Removed the recommended dependency on a JRE for libecj-java
diff --git a/debian/patches/remove-overrides.diff b/debian/patches/remove-overrides.diff
new file mode 100644
index 0000000..77db15d
--- /dev/null
+++ b/debian/patches/remove-overrides.diff
@@ -0,0 +1,55 @@
+Description: Fixes compilation errors caused by @Override annotations (bug?)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java
+@@ -196,15 +196,12 @@
+ 				final CaptureBinding18 newCapture = (CaptureBinding18) clone(enclosingType());
+ 				newCapture.tagBits = this.tagBits;
+ 				Substitution substitution = new Substitution() {
+-					@Override
+ 					public TypeBinding substitute(TypeVariableBinding typeVariable) {
+ 						return  (typeVariable == CaptureBinding18.this) ? newCapture : typeVariable; //$IDENTITY-COMPARISON$
+ 					}
+-					@Override
+ 					public boolean isRawSubstitution() {
+ 						return false;
+ 					}
+-					@Override
+ 					public LookupEnvironment environment() {
+ 						return CaptureBinding18.this.environment;
+ 					}
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
+@@ -64,11 +64,9 @@
+ 						'L', CharOperation.concatWith(environment.getNonNullAnnotationName(), '/'), ';');
+ 		// create the synthetic annotation:
+ 		return new IBinaryAnnotation() {
+-			@Override
+ 			public char[] getTypeName() {
+ 				return nonNullAnnotationName;
+ 			}
+-			@Override
+ 			public IBinaryElementValuePair[] getElementValuePairs() {
+ 				return null;
+ 			}
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Sorting.java
+@@ -112,7 +112,6 @@
+ 	/** Sort inference variables by rank. */
+ 	public static void sortInferenceVariables(InferenceVariable[] variables) {
+ 		Arrays.sort(variables, new Comparator<InferenceVariable>() {
+-			@Override
+ 			public int compare(InferenceVariable iv1, InferenceVariable iv2) {
+ 				return iv1.rank - iv2.rank;
+ 			}
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MemberValuePair.java
+@@ -106,7 +106,6 @@
+ 		// the next check may need deferring:
+ 		final boolean[] shouldExit = new boolean[1];
+ 		Runnable check = new Runnable() {
+-			@Override
+ 			public void run() {
+ 				if (!(MemberValuePair.this.value.isConstantValueOfTypeAssignableToType(valueType, requiredType)
+ 						|| valueType.isCompatibleWith(requiredType))) {
diff --git a/debian/patches/series b/debian/patches/series
index fdc5ff4..590acf3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 gcc-changes.diff
+remove-overrides.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git