[pkg-java] r19063 - in trunk/ecj/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 18 16:05:25 UTC 2016
Author: ebourg-guest
Date: 2016-05-18 16:05:25 +0000 (Wed, 18 May 2016)
New Revision: 19063
Added:
trunk/ecj/debian/patches/remove-javacore.diff
trunk/ecj/debian/patches/replace-diamond-operators.diff
Modified:
trunk/ecj/debian/changelog
trunk/ecj/debian/patches/gcc-changes.diff
trunk/ecj/debian/patches/remove-overrides.diff
trunk/ecj/debian/patches/series
trunk/ecj/debian/rules
trunk/ecj/debian/watch
Log:
New upstream release (JDT version 4.5)
Modified: trunk/ecj/debian/changelog
===================================================================
--- trunk/ecj/debian/changelog 2016-05-17 13:41:09 UTC (rev 19062)
+++ trunk/ecj/debian/changelog 2016-05-18 16:05:25 UTC (rev 19063)
@@ -1,7 +1,7 @@
-ecj (3.10.2-1) UNRELEASED; urgency=medium
+ecj (3.11.0-1) UNRELEASED; urgency=medium
* Team upload.
- * New upstream release (JDT version 4.4.2)
+ * New upstream release (built from the R4_5 tag, identifies itself as 3.11.0)
- Refreshed the patches
* Standards-Version updated to 3.9.7 (no changes)
* Use a secure Vcs-Browser URL
Modified: trunk/ecj/debian/patches/gcc-changes.diff
===================================================================
--- trunk/ecj/debian/patches/gcc-changes.diff 2016-05-17 13:41:09 UTC (rev 19062)
+++ trunk/ecj/debian/patches/gcc-changes.diff 2016-05-18 16:05:25 UTC (rev 19063)
@@ -23,7 +23,7 @@
+</project>
--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
+++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
-@@ -1219,9 +1219,9 @@
+@@ -1233,9 +1233,9 @@
// by default only lines and source attributes are generated.
this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES;
Added: trunk/ecj/debian/patches/remove-javacore.diff
===================================================================
--- trunk/ecj/debian/patches/remove-javacore.diff (rev 0)
+++ trunk/ecj/debian/patches/remove-javacore.diff 2016-05-18 16:05:25 UTC (rev 19063)
@@ -0,0 +1,19 @@
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+@@ -18,7 +18,6 @@
+ import java.util.Hashtable;
+ import java.util.List;
+
+-import org.eclipse.jdt.core.JavaCore;
+ import org.eclipse.jdt.core.compiler.CharOperation;
+ import org.eclipse.jdt.internal.compiler.CompilationResult;
+ import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;
+@@ -188,7 +187,7 @@
+ ProblemReporter problemReporter =
+ new ProblemReporter(
+ DefaultErrorHandlingPolicies.proceedWithAllProblems(),
+- new CompilerOptions(JavaCore.getOptions()),
++ new CompilerOptions(),
+ new DefaultProblemFactory());
+ Parser parser = new Parser(problemReporter, false);
+
Modified: trunk/ecj/debian/patches/remove-overrides.diff
===================================================================
--- trunk/ecj/debian/patches/remove-overrides.diff 2016-05-17 13:41:09 UTC (rev 19062)
+++ trunk/ecj/debian/patches/remove-overrides.diff 2016-05-18 16:05:25 UTC (rev 19063)
@@ -3,7 +3,7 @@
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 @@
+@@ -241,15 +241,12 @@
final CaptureBinding18 newCapture = (CaptureBinding18) clone(enclosingType());
newCapture.tagBits = this.tagBits;
Substitution substitution = new Substitution() {
@@ -21,7 +21,7 @@
}
--- 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
-@@ -75,11 +75,9 @@
+@@ -76,11 +76,9 @@
'L', CharOperation.concatWith(environment.getNonNullAnnotationName(), '/'), ';');
// create the synthetic annotation:
return new IBinaryAnnotation() {
@@ -53,3 +53,456 @@
public void run() {
if (!(MemberValuePair.this.value.isConstantValueOfTypeAssignableToType(valueType, requiredType)
|| valueType.isCompatibleWith(requiredType))) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/TypeAnnotationWalker.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/TypeAnnotationWalker.java
+@@ -44,17 +44,14 @@
+
+ // ==== filter by top-level targetType: ====
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ return toTarget(AnnotationTargetTypeConstants.FIELD);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ return toTarget(AnnotationTargetTypeConstants.METHOD_RETURN);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toReceiver() {
+ return toTarget(AnnotationTargetTypeConstants.METHOD_RECEIVER);
+ }
+@@ -75,7 +72,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -92,7 +88,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -110,7 +105,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeBound(short boundIndex) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -131,7 +125,6 @@
+ * {@inheritDoc}
+ * <p>(superTypesSignature is ignored in this implementation).</p>
+ */
+- @Override
+ public ITypeAnnotationWalker toSupertype(short index, char[] superTypeSignature) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -147,7 +140,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -163,7 +155,6 @@
+ return restrict(newMatches, 0);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -181,7 +172,6 @@
+
+ // ==== descending into details: ====
+
+- @Override
+ public ITypeAnnotationWalker toTypeArgument(int rank) {
+ // like toNextDetail() but also checking byte 2 against rank
+ long newMatches = this.matches;
+@@ -201,7 +191,6 @@
+ return restrict(newMatches, this.pathPtr+2);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toWildcardBound() {
+ long newMatches = this.matches;
+ if (newMatches == 0)
+@@ -219,12 +208,10 @@
+ return restrict(newMatches, this.pathPtr+2);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextArrayDimension() {
+ return toNextDetail(AnnotationTargetTypeConstants.NEXT_ARRAY_DIMENSION);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextNestedType() {
+ return toNextDetail(AnnotationTargetTypeConstants.NEXT_NESTED_TYPE);
+ }
+@@ -250,7 +237,6 @@
+
+ // ==== leaves: the actual annotations: ====
+
+- @Override
+ public IBinaryAnnotation[] getAnnotationsAtCursor(int currentTypeId) {
+ int length = this.typeAnnotations.length;
+ IBinaryAnnotation[] filtered = new IBinaryAnnotation[length];
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ExternalAnnotationProvider.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ExternalAnnotationProvider.java
+@@ -210,7 +210,6 @@
+ }
+
+ abstract class SingleMarkerAnnotation implements IBinaryAnnotation {
+- @Override
+ public IBinaryElementValuePair[] getElementValuePairs() {
+ return ElementValuePairInfo.NoMembers;
+ }
+@@ -224,12 +223,12 @@
+ void initAnnotations(final LookupEnvironment environment) {
+ if (this.NULLABLE_ANNOTATION == null) {
+ this.NULLABLE_ANNOTATION = new SingleMarkerAnnotation() {
+- @Override public char[] getTypeName() { return getBinaryTypeName(environment.getNullableAnnotationName()); }
++ public char[] getTypeName() { return getBinaryTypeName(environment.getNullableAnnotationName()); }
+ };
+ }
+ if (this.NONNULL_ANNOTATION == null) {
+ this.NONNULL_ANNOTATION = new SingleMarkerAnnotation() {
+- @Override public char[] getTypeName() { return getBinaryTypeName(environment.getNonNullAnnotationName()); }
++ public char[] getTypeName() { return getBinaryTypeName(environment.getNonNullAnnotationName()); }
+ };
+ }
+ }
+@@ -306,32 +305,26 @@
+ return this.wrapper;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toReceiver() {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeBound(short boundIndex) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toSupertype(short index, char[] superTypeSignature) {
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeArgument(int rank) {
+ if (rank == 0) {
+ int start = CharOperation.indexOf('<', this.source, this.pos) + 1;
+@@ -354,7 +347,6 @@
+ return new MethodAnnotationWalker(this.source, next, this.environment);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toWildcardBound() {
+ switch (this.source[this.pos]) {
+ case '-':
+@@ -365,7 +357,6 @@
+ }
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextArrayDimension() {
+ if (this.source[this.pos] == '[') {
+ int newPos = this.pos+1;
+@@ -377,12 +368,10 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toNextNestedType() {
+ return this; // FIXME(stephan)
+ }
+
+- @Override
+ public IBinaryAnnotation[] getAnnotationsAtCursor(int currentTypeId) {
+ if (this.pos != -1 && this.pos < this.source.length-2) {
+ switch (this.source[this.pos]) {
+@@ -451,7 +440,6 @@
+ }
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ if (rank == this.currentRank)
+ return this;
+@@ -460,12 +448,10 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ return new TypeParametersAnnotationWalker(this.source, this.rankStarts[parameterRank], parameterRank, this.rankStarts, this.environment);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeBound(short boundIndex) {
+ // assume we are positioned either at the start of the bounded type parameter
+ // or at the start of a previous type bound
+@@ -485,27 +471,22 @@
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ throw new UnsupportedOperationException("Cannot navigate to fields"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ throw new UnsupportedOperationException("Cannot navigate to method return"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ throw new UnsupportedOperationException("Cannot navigate to method parameter"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ throw new UnsupportedOperationException("Cannot navigate to throws"); //$NON-NLS-1$
+ }
+
+- @Override
+ public IBinaryAnnotation[] getAnnotationsAtCursor(int currentTypeId) {
+ if (this.pos != -1 && this.pos < this.source.length-1) {
+ switch (this.source[this.pos]) {
+@@ -528,22 +509,18 @@
+
+ // actual implementation is inherited, main entries: toTypeArgument & getAnnotationsAtCursor
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ throw new UnsupportedOperationException("Supertype has no field annotations"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ throw new UnsupportedOperationException("Supertype has no method return"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ throw new UnsupportedOperationException("Supertype has no method parameter"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ throw new UnsupportedOperationException("Supertype has no throws"); //$NON-NLS-1$
+ }
+@@ -572,7 +549,6 @@
+ return end;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameter(boolean isClassTypeParameter, int rank) {
+ if (this.source[0] == '<') {
+ if (this.typeParametersWalker == null)
+@@ -582,14 +558,12 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toTypeParameterBounds(boolean isClassTypeParameter, int parameterRank) {
+ if (this.typeParametersWalker != null)
+ return this.typeParametersWalker.toTypeParameterBounds(isClassTypeParameter, parameterRank);
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ int close = CharOperation.indexOf(')', this.source);
+ if (close != -1) {
+@@ -600,7 +574,6 @@
+ return ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ if (index == 0) {
+ int start = CharOperation.indexOf('(', this.source) + 1;
+@@ -618,17 +591,14 @@
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ throw new UnsupportedOperationException("Methods have no fields"); //$NON-NLS-1$
+ }
+
+- @Override
+ public int getParameterCount() {
+ int count = 0;
+ int start = CharOperation.indexOf('(', this.source) + 1;
+@@ -645,22 +615,18 @@
+ super(source, pos, environment);
+ }
+
+- @Override
+ public ITypeAnnotationWalker toField() {
+ return this;
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodReturn() {
+ throw new UnsupportedOperationException("Field has no method return"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toMethodParameter(short index) {
+ throw new UnsupportedOperationException("Field has no method parameter"); //$NON-NLS-1$
+ }
+
+- @Override
+ public ITypeAnnotationWalker toThrows(int index) {
+ throw new UnsupportedOperationException("Field has no throws"); //$NON-NLS-1$
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java
+@@ -125,7 +125,6 @@
+ }
+ return null;
+ }
+- at Override
+ public boolean hasAnnotationFileFor(String qualifiedTypeName) {
+ return this.zipFile.getEntry(qualifiedTypeName+'.'+ExternalAnnotationProvider.ANNOTION_FILE_EXTENSION) != null;
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+@@ -153,7 +153,6 @@
+ return sourceExists ? null : findSourceSecondaryType(typeName, qualifiedPackageName, qualifiedBinaryFileName); /* only secondary types */
+ }
+
+- at Override
+ public boolean hasAnnotationFileFor(String qualifiedTypeName) {
+ int pos = qualifiedTypeName.lastIndexOf('/');
+ if (pos != -1 && (pos + 1 < qualifiedTypeName.length())) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
+@@ -781,7 +781,6 @@
+ this.atExit = atExit;
+ setUpForStage(Stage.OuterLess);
+ }
+- @Override
+ public boolean hasNext() {
+ FakedTrackingVariable trackingVar;
+ switch (this.stage) {
+@@ -834,11 +833,9 @@
+ this.iterator = this.varSet.iterator();
+ this.stage = nextStage;
+ }
+- @Override
+ public FakedTrackingVariable next() {
+ return this.next;
+ }
+- @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/ClassFileReader.java
+@@ -456,7 +456,6 @@
+ * If 'member' is given it must be either of IBinaryField or IBinaryMethod, in which case we're seeking annotations for that member.
+ * Otherwise we're seeking annotations for top-level elements of a type (type parameters & super types).
+ */
+- at Override
+ public ITypeAnnotationWalker enrichWithExternalAnnotationsFor(ITypeAnnotationWalker walker, Object member, LookupEnvironment environment) {
+ if (walker == ITypeAnnotationWalker.EMPTY_ANNOTATION_WALKER && this.annotationProvider != null) {
+ if (member == null) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/BatchCompilerRequestor.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/BatchCompilerRequestor.java
+@@ -22,7 +22,6 @@
+ this.compiler = compiler;
+ }
+
+- @Override
+ public void acceptResult(CompilationResult compilationResult) {
+ if (compilationResult.lineSeparatorPositions != null) {
+ int unitLineCount = compilationResult.lineSeparatorPositions.length;
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
+@@ -499,7 +499,6 @@
+ // Nothing to do.
+ }
+
+- @Override
+ public void registerResult(TypeBinding targetType, MethodBinding method) {
+ // Nothing to do.
+ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
+@@ -716,7 +716,6 @@
+ this.inferenceContexts.put(method, infCtx18);
+ }
+
+- at Override
+ public void registerResult(TypeBinding targetType, MethodBinding method) {
+ if (method != null && method.isConstructor()) { // ignore the factory.
+ if (this.solutionsPerTargetType == null)
+@@ -737,4 +736,4 @@
+ public InferenceContext18 freshInferenceContext(Scope scope) {
+ return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/lookup/InvocationSite.java
+@@ -57,7 +57,6 @@
+ public boolean receiverIsImplicitThis() { return false; }
+ public InferenceContext18 freshInferenceContext(Scope scope) { return null; }
+ public ExpressionContext getExpressionContext() { return ExpressionContext.VANILLA_CONTEXT; }
+- @Override
+ public boolean isQualifiedSuper() { return false; }
+ public boolean checkingPotentialCompatibility() { return false; }
+ public void acceptPotentiallyCompatibleMethods(MethodBinding[] methods) { /* ignore */ }
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
+@@ -1053,7 +1053,6 @@
+ this.inferenceContexts.put(method, infCtx18);
+ }
+
+- at Override
+ public void registerResult(TypeBinding targetType, MethodBinding method) {
+ if (this.solutionsPerTargetType == null)
+ this.solutionsPerTargetType = new HashMap<TypeBinding, MethodBinding>();
+@@ -1075,7 +1074,6 @@
+ public InferenceContext18 freshInferenceContext(Scope scope) {
+ return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);
+ }
+- at Override
+ public boolean isQualifiedSuper() {
+ return this.receiver.isQualifiedSuper();
+ }
Added: trunk/ecj/debian/patches/replace-diamond-operators.diff
===================================================================
--- trunk/ecj/debian/patches/replace-diamond-operators.diff (rev 0)
+++ trunk/ecj/debian/patches/replace-diamond-operators.diff 2016-05-18 16:05:25 UTC (rev 19063)
@@ -0,0 +1,40 @@
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/Compiler.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/Compiler.java
+@@ -489,7 +489,7 @@
+ for (CategorizedProblem problem : errors) {
+ if (problem.getCategoryID() == CategorizedProblem.CAT_UNSPECIFIED) {
+ if (this.aptProblems == null) {
+- this.aptProblems = new HashMap<>();
++ this.aptProblems = new HashMap<String, APTProblem[]>();
+ }
+ APTProblem[] problems = this.aptProblems.get(new String(unitDecl.getFileName()));
+ if (problems == null) {
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/FakedTrackingVariable.java
+@@ -776,7 +776,7 @@
+ }
+
+ public IteratorForReporting(List<FakedTrackingVariable> variables, Scope scope, boolean atExit) {
+- this.varSet = new HashSet<>(variables);
++ this.varSet = new HashSet<FakedTrackingVariable>(variables);
+ this.scope = scope;
+ this.atExit = atExit;
+ setUpForStage(Stage.OuterLess);
+--- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Util.java
++++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/util/Util.java
+@@ -1125,7 +1125,7 @@
+ bootclasspathProperty = System.getProperty("org.apache.harmony.boot.class.path"); //$NON-NLS-1$
+ }
+ }
+- List<String> filePaths = new ArrayList<>();
++ List<String> filePaths = new ArrayList<String>();
+ if ((bootclasspathProperty != null) && (bootclasspathProperty.length() != 0)) {
+ StringTokenizer tokenizer = new StringTokenizer(bootclasspathProperty, File.pathSeparator);
+ while (tokenizer.hasMoreTokens()) {
+@@ -1630,4 +1630,4 @@
+ }
+ }
+
+-}
+\ No newline at end of file
++}
Modified: trunk/ecj/debian/patches/series
===================================================================
--- trunk/ecj/debian/patches/series 2016-05-17 13:41:09 UTC (rev 19062)
+++ trunk/ecj/debian/patches/series 2016-05-18 16:05:25 UTC (rev 19063)
@@ -1,2 +1,4 @@
gcc-changes.diff
remove-overrides.diff
+replace-diamond-operators.diff
+remove-javacore.diff
Modified: trunk/ecj/debian/rules
===================================================================
--- trunk/ecj/debian/rules 2016-05-17 13:41:09 UTC (rev 19062)
+++ trunk/ecj/debian/rules 2016-05-18 16:05:25 UTC (rev 19063)
@@ -234,7 +234,7 @@
rm -f debian/*.pyc ecj1
rm -rf debian/.mh
-TAG = R4_4_2
+TAG = R4_5
DIR = ecj-$(DEB_UPSTREAM_VERSION)
MAVEN_REPO := http://repo1.maven.org/maven2
Modified: trunk/ecj/debian/watch
===================================================================
--- trunk/ecj/debian/watch 2016-05-17 13:41:09 UTC (rev 19062)
+++ trunk/ecj/debian/watch 2016-05-18 16:05:25 UTC (rev 19063)
@@ -5,5 +5,5 @@
# The package caries the version of the compiler and the version of the platform
# has to be hardcoded here to detect the new releases.
#
-opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.4.2/" \
+opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.5/" \
http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/tags .*/R([\d_]+).tar.gz
More information about the pkg-java-commits
mailing list