View | Details | Raw Unified | Return to bug 334306 | Differences between
and this patch

Collapse All | Expand All

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier15.java (-2 / +6 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2010 IBM Corporation and others.
2
 * Copyright (c) 2000, 2011 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 235-241 Link Here
235
	//		class A implements I<Integer> { public void test(Integer i) {} }
235
	//		class A implements I<Integer> { public void test(Integer i) {} }
236
	//		class B extends A { public void test(Comparable i) {} }
236
	//		class B extends A { public void test(Comparable i) {} }
237
237
238
	if (currentMethod.declaringClass.isInterface() || inheritedMethod.isStatic()) return;
238
	if (currentMethod.declaringClass.isInterface() || inheritedMethod.isStatic()) {
239
		if (this.environment.globalOptions.complianceLevel <= ClassFileConstants.JDK1_6) {
240
			return;
241
		}
242
	}
239
243
240
	if (!detectNameClash(currentMethod, inheritedMethod, false)) { // check up the hierarchy for skipped inherited methods
244
	if (!detectNameClash(currentMethod, inheritedMethod, false)) { // check up the hierarchy for skipped inherited methods
241
		TypeBinding[] currentParams = currentMethod.parameters;
245
		TypeBinding[] currentParams = currentMethod.parameters;

Return to bug 334306