Attachment #58263 for bug #172743

Lines 9-15 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/AbstractAnnotationProcessorManager.java (-1 / +1 lines)
9	public abstract class AbstractAnnotationProcessorManager {	9	public abstract class AbstractAnnotationProcessorManager {
10	public abstract void configure(Main batchCompiler, String[] options);	10	public abstract void configure(Main batchCompiler, String[] options);
11		11
12	public abstract void configureFromPlatform(Compiler compiler, Object javaProject);	12	public abstract void configureFromPlatform(Compiler compiler, Object compilationUnitLocator, Object javaProject);
13		13
14	public abstract void setOut(PrintWriter out);	14	public abstract void setOut(PrintWriter out);
15		15




import org.eclipse.jdt.internal.compiler.*;
import org.eclipse.jdt.internal.compiler.Compiler;
import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jdt.internal.compiler.problem.*;
import org.eclipse.jdt.internal.compiler.util.SimpleSet;

 * Provides the building and compilation mechanism
 * in common with the batch and incremental builders.
 */
public abstract class AbstractImageBuilder implements ICompilerRequestor, ICompilationUnitLocator {

protected JavaBuilder javaBuilder;
protected State newState;

	return folder;
}



/* (non-Javadoc)
 * @see org.eclipse.jdt.internal.core.builder.ICompilationUnitLocator#fromIFile(org.eclipse.core.resources.IFile)
 */
public ICompilationUnit fromIFile(IFile file) {
	return findSourceFile(file);
}

protected void initializeAnnotationProcessorManager(Compiler newCompiler) {
	AbstractAnnotationProcessorManager annotationManager = JavaModelManager.getJavaModelManager().createAnnotationProcessorManager();
	if (annotationManager != null) {
		annotationManager.configureFromPlatform(newCompiler, this, javaBuilder.javaProject);
		annotationManager.setErr(new PrintWriter(System.err));
		annotationManager.setOut(new PrintWriter(System.out));
	}




/*******************************************************************************
 * Copyright (c) 2007 BEA Systems, Inc. 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    wharley@bea.com - initial API and implementation
 *    
 *******************************************************************************/

package org.eclipse.jdt.internal.core.builder;

import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;

/**
 * Used to convert an IFile into an ICompilationUnit,
 * for clients outside of this package.
 * @since 3.3
 */
public interface ICompilationUnitLocator {
	public ICompilationUnit fromIFile(IFile file);
}

Return to bug 172743

Lines 18-23 Link Here

(-)model/org/eclipse/jdt/internal/core/builder/AbstractImageBuilder.java (-2 / +12 lines)
18	import org.eclipse.jdt.internal.compiler.*;	18	import org.eclipse.jdt.internal.compiler.*;
19	import org.eclipse.jdt.internal.compiler.Compiler;	19	import org.eclipse.jdt.internal.compiler.Compiler;
20	import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;	20	import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
		21	import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
21	import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;	22	import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
22	import org.eclipse.jdt.internal.compiler.problem.*;	23	import org.eclipse.jdt.internal.compiler.problem.*;
23	import org.eclipse.jdt.internal.compiler.util.SimpleSet;	24	import org.eclipse.jdt.internal.compiler.util.SimpleSet;
Lines 34-40 Link Here
34	* Provides the building and compilation mechanism	35	* Provides the building and compilation mechanism
35	* in common with the batch and incremental builders.	36	* in common with the batch and incremental builders.
36	*/	37	*/
37	public abstract class AbstractImageBuilder implements ICompilerRequestor {	38	public abstract class AbstractImageBuilder implements ICompilerRequestor, ICompilationUnitLocator {
38		39
39	protected JavaBuilder javaBuilder;	40	protected JavaBuilder javaBuilder;
40	protected State newState;	41	protected State newState;
Lines 436-445 Link Here
436	return folder;	437	return folder;
437	}	438	}
438		439
		440
		441
		442	/* (non-Javadoc)
		443	* @see org.eclipse.jdt.internal.core.builder.ICompilationUnitLocator#fromIFile(org.eclipse.core.resources.IFile)
		444	*/
		445	public ICompilationUnit fromIFile(IFile file) {
		446	return findSourceFile(file);
		447	}
		448
439	protected void initializeAnnotationProcessorManager(Compiler newCompiler) {	449	protected void initializeAnnotationProcessorManager(Compiler newCompiler) {
440	AbstractAnnotationProcessorManager annotationManager = JavaModelManager.getJavaModelManager().createAnnotationProcessorManager();	450	AbstractAnnotationProcessorManager annotationManager = JavaModelManager.getJavaModelManager().createAnnotationProcessorManager();
441	if (annotationManager != null) {	451	if (annotationManager != null) {
442	annotationManager.configureFromPlatform(newCompiler, javaBuilder.javaProject);	452	annotationManager.configureFromPlatform(newCompiler, this, javaBuilder.javaProject);
443	annotationManager.setErr(new PrintWriter(System.err));	453	annotationManager.setErr(new PrintWriter(System.err));
444	annotationManager.setOut(new PrintWriter(System.out));	454	annotationManager.setOut(new PrintWriter(System.out));
445	}	455	}

Added Link Here

(-)model/org/eclipse/jdt/internal/core/builder/ICompilationUnitLocator.java (+25 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 BEA Systems, Inc.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* wharley@bea.com - initial API and implementation
10	*
11	*******************************************************************************/
12
13	package org.eclipse.jdt.internal.core.builder;
14
15	import org.eclipse.core.resources.IFile;
16	import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
17
18	/**
19	* Used to convert an IFile into an ICompilationUnit,
20	* for clients outside of this package.
21	* @since 3.3
22	*/
23	public interface ICompilationUnitLocator {
24	public ICompilationUnit fromIFile(IFile file);
25	}