Attachment #153947 for bug #296998




 *******************************************************************************/
package org.eclipse.jdt.internal.compiler.ast;

import org.eclipse.jdt.core.compiler.CategorizedProblem;
import org.eclipse.jdt.internal.compiler.ASTVisitor;
import org.eclipse.jdt.internal.compiler.CompilationResult;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.impl.ReferenceContext;
import org.eclipse.jdt.internal.compiler.lookup.*;

public class ImportReference extends ASTNode implements ReferenceContext {

	public char[][] tokens;
	public long[] sourcePositions; //each entry is using the code : (start<<32) + end

	public int declarationSourceEnd;
	public int modifiers; // 1.5 addition for static imports
	public Annotation[] annotations;
	public boolean ignoreFurtherInvestigation;
	public CompilationUnitDeclaration declaringCompilationUnit;

	public ImportReference(
			char[][] tokens,
			long[] sourcePositions,
			boolean onDemand,
			int modifiers) {
		this(tokens, sourcePositions, onDemand, modifiers, null);
	}
	
	public ImportReference(
			char[][] tokens,
			long[] sourcePositions,
			boolean onDemand,
			int modifiers,
			CompilationUnitDeclaration compilationUnit) {

		this.tokens = tokens;
		this.sourcePositions = sourcePositions;

		this.sourceEnd = (int) (sourcePositions[sourcePositions.length-1] & 0x00000000FFFFFFFF);
		this.sourceStart = (int) (sourcePositions[0] >>> 32);
		this.modifiers = modifiers;
		this.declaringCompilationUnit = compilationUnit;
	}

	public boolean isStatic() {

		visitor.visit(this, scope);
		visitor.endVisit(this, scope);
	}

	public void abort(int abortLevel, CategorizedProblem problem) {
		// note: must only be called on true import references which indeed have a non-null declaringCompilationUnit
		this.declaringCompilationUnit.abort(abortLevel, problem);
	}

	public CompilationResult compilationResult() {
		// note: must only be called on true import references which indeed have a non-null declaringCompilationUnit
		return this.declaringCompilationUnit.compilationResult();
	}

	public boolean hasErrors() {
		return !this.ignoreFurtherInvestigation;
	}

	public void tagAsHavingErrors() {
		this.ignoreFurtherInvestigation = true;		
	}
}




	long[] positions = new long[length];
	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
	pushOnAstStack(impt = new ImportReference(tokens, positions, false, ClassFileConstants.AccStatic, this.compilationUnit));

	this.modifiers = ClassFileConstants.AccDefault;
	this.modifiersSourceStart = -1; // <-- see comment into modifiersFlag(int)

	long[] positions = new long[length];
	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
	pushOnAstStack(impt = new ImportReference(tokens, positions, false, ClassFileConstants.AccDefault, this.compilationUnit));

	if (this.currentToken == TokenNameSEMICOLON){
		impt.declarationSourceEnd = this.scanner.currentPosition - 1;

	long[] positions = new long[length];
	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccStatic, this.compilationUnit));

	this.modifiers = ClassFileConstants.AccDefault;
	this.modifiersSourceStart = -1; // <-- see comment into modifiersFlag(int)

	long[] positions = new long[length];
	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccDefault, this.compilationUnit));

	if (this.currentToken == TokenNameSEMICOLON){
		impt.declarationSourceEnd = this.scanner.currentPosition - 1;

Lines 7089-7094 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java (+2 lines)
7089	}	7089	}
7090	}	7090	}
7091	public void unusedImport(ImportReference importRef) {	7091	public void unusedImport(ImportReference importRef) {
		7092	if (importRef.declaringCompilationUnit != null)
		7093	this.referenceContext = importRef;
7092	int severity = computeSeverity(IProblem.UnusedImport);	7094	int severity = computeSeverity(IProblem.UnusedImport);
7093	if (severity == ProblemSeverities.Ignore) return;	7095	if (severity == ProblemSeverities.Ignore) return;
7094	String[] arguments = new String[] { CharOperation.toString(importRef.tokens) };	7096	String[] arguments = new String[] { CharOperation.toString(importRef.tokens) };




	long[] positions = new long[length];
	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccStatic, this.compilationUnit));

	this.modifiers = ClassFileConstants.AccDefault;
	this.modifiersSourceStart = -1; // <-- see comment into modifiersFlag(int)

	long[] positions = new long[length];
	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccDefault, this.compilationUnit));

	if (this.currentToken == TokenNameSEMICOLON){
		impt.declarationSourceEnd = this.scanner.currentPosition - 1;

	return ref;
}
protected ImportReference newImportReference(char[][] tokens, long[] positions, boolean onDemand, int mod) {
	return new ImportReference(tokens, positions, onDemand, mod, this.compilationUnit);
}
protected QualifiedNameReference newQualifiedNameReference(char[][] tokens, long[] positions, int sourceStart, int sourceEnd) {
	return new QualifiedNameReference(tokens, positions, sourceStart, sourceEnd);

Lines 129-135 Link Here

(-)model/org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter.java (-2 / +3 lines)
129	if (packageName.length > 0)	129	if (packageName.length > 0)
130	// if its null then it is defined in the default package	130	// if its null then it is defined in the default package
131	this.unit.currentPackage =	131	this.unit.currentPackage =
132	createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);	132	createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault, null);
133	IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();	133	IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();
134	int importCount = importDeclarations.length;	134	int importCount = importDeclarations.length;
135	this.unit.imports = new ImportReference[importCount];	135	this.unit.imports = new ImportReference[importCount];
Lines 142-148 Link Here
142	sourceImport.getDeclarationSourceStart(),	142	sourceImport.getDeclarationSourceStart(),
143	sourceImport.getDeclarationSourceEnd(),	143	sourceImport.getDeclarationSourceEnd(),
144	importDeclaration.isOnDemand(),	144	importDeclaration.isOnDemand(),
145	sourceImport.getModifiers());	145	sourceImport.getModifiers(),
		146	this.unit);
146	}	147	}
147	/* convert type(s) */	148	/* convert type(s) */
148	try {	149	try {




import org.eclipse.jdt.internal.compiler.ast.ASTNode;
import org.eclipse.jdt.internal.compiler.ast.ArrayQualifiedTypeReference;
import org.eclipse.jdt.internal.compiler.ast.ArrayTypeReference;
import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
import org.eclipse.jdt.internal.compiler.ast.ImportReference;
import org.eclipse.jdt.internal.compiler.ast.ParameterizedQualifiedTypeReference;
import org.eclipse.jdt.internal.compiler.ast.ParameterizedSingleTypeReference;

		int start,
		int end,
		boolean onDemand,
		int modifiers,
		CompilationUnitDeclaration compilationUnit) {

		int length = importName.length;
		long[] positions = new long[length];

			qImportName,
			positions,
			onDemand,
			modifiers,
			compilationUnit);
	}

	protected TypeParameter createTypeParameter(char[] typeParameterName, char[][] typeParameterBounds, int start, int end) {

Lines 10-15 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/StaticImportTest.java (-4 / +35 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.core.tests.compiler.regression;	11	package org.eclipse.jdt.core.tests.compiler.regression;
12		12
		13	import java.util.Map;
		14
		15	import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
		16
13	import junit.framework.Test;	17	import junit.framework.Test;
14		18
15	public class StaticImportTest extends AbstractComparableTest {	19	public class StaticImportTest extends AbstractComparableTest {
Lines 17-23 Link Here
17	// Static initializer to specify tests subset using TESTS_* static variables	21	// Static initializer to specify tests subset using TESTS_* static variables
18	// All specified tests which do not belong to the class are skipped...	22	// All specified tests which do not belong to the class are skipped...
19	static {	23	static {
20	// TESTS_NAMES = new String[] { "test036" };	24	// TESTS_NAMES = new String[] { "test075" };
21	// TESTS_NUMBERS = new int[] { 46 };	25	// TESTS_NUMBERS = new int[] { 46 };
22	// TESTS_RANGE = new int[] { 169, 180 };	26	// TESTS_RANGE = new int[] { 169, 180 };
23	}	27	}
Lines 2490-2496 Link Here
2490	"----------\n");	2494	"----------\n");
2491	}	2495	}
2492	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=256375	2496	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=256375
2493	public void testONLY_073() {	2497	public void test073() {
2494	this.runNegativeTest(	2498	this.runNegativeTest(
2495	new String[] {	2499	new String[] {
2496	"test/Outer.java",	2500	"test/Outer.java",
Lines 2532-2537 Link Here
2532	"}\n",	2536	"}\n",
2533	},	2537	},
2534	"");	2538	"");
2535	}	2539	}
		2540
		2541	public void test075() {
		2542	Map options = getCompilerOptions();
		2543	options.put(CompilerOptions.OPTION_ReportUnusedImport, CompilerOptions.ERROR);
		2544	this.runNegativeTest(
		2545	true /* flush output directory */,
		2546	new String[] {
		2547	"test/ImportBug.java",
		2548	"package test;\n" +
		2549	"import java.util.List;\n" +
		2550	"public class ImportBug {\n" +
		2551	" public static void main(String[] args) {\n" +
		2552	" System.out.print(\"SUCCESS\");\n" +
		2553	" }\n" +
		2554	"}"
		2555	},
		2556	null /* no class libraries */,
		2557	options,
		2558	"----------\n" +
		2559	"1. ERROR in test\\ImportBug.java (at line 2)\n" +
		2560	" import java.util.List;\n" +
		2561	" ^^^^^^^^^^^^^^\n" +
		2562	"The import java.util.List is never used\n" +
		2563	"----------\n",
		2564	"SUCCESS",
		2565	null,
		2566	JavacTestOptions.DEFAULT /* default javac test options */);
		2567	}
2536	}	2568	}
2537

Return to bug 296998

Lines 6871-6877 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/parser/Parser.java (-4 / +4 lines)
6871	long[] positions = new long[length];	6871	long[] positions = new long[length];
6872	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);	6872	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
6873	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);	6873	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
6874	pushOnAstStack(impt = new ImportReference(tokens, positions, false, ClassFileConstants.AccStatic));	6874	pushOnAstStack(impt = new ImportReference(tokens, positions, false, ClassFileConstants.AccStatic, this.compilationUnit));
6875		6875
6876	this.modifiers = ClassFileConstants.AccDefault;	6876	this.modifiers = ClassFileConstants.AccDefault;
6877	this.modifiersSourceStart = -1; // <-- see comment into modifiersFlag(int)	6877	this.modifiersSourceStart = -1; // <-- see comment into modifiersFlag(int)
Lines 6912-6918 Link Here
6912	long[] positions = new long[length];	6912	long[] positions = new long[length];
6913	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);	6913	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
6914	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);	6914	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
6915	pushOnAstStack(impt = new ImportReference(tokens, positions, false, ClassFileConstants.AccDefault));	6915	pushOnAstStack(impt = new ImportReference(tokens, positions, false, ClassFileConstants.AccDefault, this.compilationUnit));
6916		6916
6917	if (this.currentToken == TokenNameSEMICOLON){	6917	if (this.currentToken == TokenNameSEMICOLON){
6918	impt.declarationSourceEnd = this.scanner.currentPosition - 1;	6918	impt.declarationSourceEnd = this.scanner.currentPosition - 1;
Lines 7254-7260 Link Here
7254	long[] positions = new long[length];	7254	long[] positions = new long[length];
7255	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);	7255	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
7256	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);	7256	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
7257	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccStatic));	7257	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccStatic, this.compilationUnit));
7258		7258
7259	this.modifiers = ClassFileConstants.AccDefault;	7259	this.modifiers = ClassFileConstants.AccDefault;
7260	this.modifiersSourceStart = -1; // <-- see comment into modifiersFlag(int)	7260	this.modifiersSourceStart = -1; // <-- see comment into modifiersFlag(int)
Lines 7757-7763 Link Here
7757	long[] positions = new long[length];	7757	long[] positions = new long[length];
7758	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);	7758	System.arraycopy(this.identifierStack, this.identifierPtr + 1, tokens, 0, length);
7759	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);	7759	System.arraycopy(this.identifierPositionStack, this.identifierPtr + 1, positions, 0, length);
7760	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccDefault));	7760	pushOnAstStack(impt = new ImportReference(tokens, positions, true, ClassFileConstants.AccDefault, this.compilationUnit));
7761		7761
7762	if (this.currentToken == TokenNameSEMICOLON){	7762	if (this.currentToken == TokenNameSEMICOLON){
7763	impt.declarationSourceEnd = this.scanner.currentPosition - 1;	7763	impt.declarationSourceEnd = this.scanner.currentPosition - 1;