Attachment #111895 for bug #245566




import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;

		}
	}

	/**
	 * Returns the IWorkspace this test suite is running on.
	 */
	public IWorkspace getWorkspace() {
		return ResourcesPlugin.getWorkspace();
	}
	
	public IWorkspaceRoot getWorkspaceRoot() {
		return getWorkspace().getRoot();
	}

	
	protected void waitForJobsToComplete(){
		SynchronizationUtils.joinBackgroudActivities();
	}

Lines 52-58 Link Here

(-)src/org/eclipse/ajdt/ui/tests/ErrorsTest.aj (-1 / +4 lines)
52	for (int i = 0; i < numAdded; i++) { // New entries are always added at the start	52	for (int i = 0; i < numAdded; i++) { // New entries are always added at the start
53	LogEntry entry = (LogEntry) logs[i];	53	LogEntry entry = (LogEntry) logs[i];
54	if(entry.getSeverity() == IStatus.ERROR \|\| entry.getSeverity() == IStatus.WARNING) {	54	if(entry.getSeverity() == IStatus.ERROR \|\| entry.getSeverity() == IStatus.WARNING) {
55	failureText += "The test added errors to the log: " + entry.getMessage() + "\n" + entry.getStack() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$	55	if (entry.getMessage().indexOf("org.eclipse.core.tests.UnknownProvider") == -1) {//$NON-NLS-1$
		56	// ignore warnings that are regarding a known missing class.
		57	failureText += "The test added errors to the log: " + entry.getMessage() + "\n" + entry.getStack() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		58	}
56	}	59	}
57	}	60	}
58	if (failureText.length() > 0) {	61	if (failureText.length() > 0) {

Lines 1-35 Link Here

(-)AllUITests_MaxPermSize.launch (-24 / +26 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">	2	<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
3	<stringAttribute key="product" value="org.eclipse.sdk.ide"/>	3	<booleanAttribute key="askclear" value="false"/>
		4	<booleanAttribute key="automaticAdd" value="true"/>
		5	<booleanAttribute key="automaticValidate" value="false"/>
4	<stringAttribute key="bootstrap" value=""/>	6	<stringAttribute key="bootstrap" value=""/>
5	<booleanAttribute key="useProduct" value="true"/>	7	<stringAttribute key="checked" value="[NONE]"/>
6	<booleanAttribute key="tracing" value="false"/>	8	<booleanAttribute key="clearConfig" value="true"/>
		9	<booleanAttribute key="clearws" value="true"/>
		10	<booleanAttribute key="clearwslog" value="false"/>
		11	<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
		12	<booleanAttribute key="default" value="true"/>
		13	<booleanAttribute key="includeOptional" value="true"/>
		14	<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
		15	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
		16	<listEntry value="/org.eclipse.ajdt.ui.tests/src/org/eclipse/ajdt/ui/tests/AllUITests.java"/>
		17	</listAttribute>
7	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">	18	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
8	<listEntry value="4"/>	19	<listEntry value="1"/>
9	</listAttribute>	20	</listAttribute>
		21	<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
10	<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>	22	<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
11	<booleanAttribute key="automaticValidate" value="false"/>
12	<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>	23	<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
13	<booleanAttribute key="automaticAdd" value="true"/>	24	<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
14	<stringAttribute key="checked" value="[NONE]"/>	25	<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
15	<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
16	<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
17	<booleanAttribute key="clearws" value="true"/>
18	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ajdt.ui.tests.AllUITests"/>	26	<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ajdt.ui.tests.AllUITests"/>
19	<stringAttribute key="pde.version" value="3.3"/>	27	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ajdt.ui.tests"/>
20	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128m"/>
21	<booleanAttribute key="default" value="true"/>
22	<booleanAttribute key="clearConfig" value="true"/>
23	<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
24	<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>	28	<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
25	<booleanAttribute key="useDefaultConfigArea" value="false"/>	29	<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=128m -Xmx1024m"/>
		30	<stringAttribute key="pde.version" value="3.3"/>
		31	<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
		32	<booleanAttribute key="show_selected_only" value="false"/>
		33	<booleanAttribute key="tracing" value="false"/>
26	<booleanAttribute key="useDefaultConfig" value="true"/>	34	<booleanAttribute key="useDefaultConfig" value="true"/>
27	<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>	35	<booleanAttribute key="useDefaultConfigArea" value="false"/>
28	<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ajdt.ui.tests"/>	36	<booleanAttribute key="useProduct" value="true"/>
29	<booleanAttribute key="askclear" value="false"/>
30	<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
31	<listEntry value="/org.eclipse.ajdt.ui.tests"/>
32	</listAttribute>
33	<booleanAttribute key="includeOptional" value="true"/>
34	<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
35	</launchConfiguration>	37	</launchConfiguration>




package org.eclipse.ajdt.ui.tests.builder;

import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.ajdt.core.AspectJCorePreferences;
import org.eclipse.ajdt.ui.AspectJUIPlugin;
import org.eclipse.ajdt.ui.tests.UITestCase;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.eclipse.jdt.core.IClasspathContainer;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;

public class BuildPathNavigationTests extends UITestCase {
	IClasspathContainer container;
    protected void setUp() throws Exception {
        super.setUp();
        final IProject containerProj = createPredefinedProject("PathTesting-ContainerOnAspectPath"); //$NON-NLS-1$
        createPredefinedProject("PathTesting-JarOnAspectPath"); //$NON-NLS-1$
        createPredefinedProject("PathTesting-ProjectOnAspectPath"); //$NON-NLS-1$
        IProject varProj = createPredefinedProject("PathTesting-VariableOnAspectPath"); //$NON-NLS-1$
        JavaCore.setClasspathVariable("Aspect_Path_Var", varProj.getFullPath(), null); //$NON-NLS-1$
		IClasspathAttribute[] attribute = new IClasspathAttribute[] {AspectJCorePreferences.ASPECTPATH_ATTRIBUTE };
		final IClasspathEntry entry = 
				JavaCore.newProjectEntry(
						containerProj.getFullPath(), 
						null, false, 
						attribute, 
						false);
		
		container = new IClasspathContainer() {
			public IClasspathEntry[] getClasspathEntries() {
				return new IClasspathEntry[] { entry };
			}
			public String getDescription() {
				return "org.eclipse.jdt.USER_LIBRARY/Aspect_Path_Lib"; //$NON-NLS-1$
			}
			public int getKind() {
			      return IClasspathContainer.K_APPLICATION;
			}
			public IPath getPath() {
				return new Path("org.eclipse.jdt.USER_LIBRARY/Aspect_Path_Lib"); //$NON-NLS-1$
			}
		};
    }

    
    /**
     * Test to see that the extra location attributes are associated with advice markers for inpaths
     * 
     * This attribute has the format FFFF:::NNNN:::NNNN:::NNNN
     * - The FFFF is the file which contains the source of the advice or ITD in affect
     * - The other three NNNN fields are integers indicating (in order) the
     *   start line number of the advice in that file, the end line number of the
     *   advice in that file and the column number for the advice.
     */
    public void testInpathMarkers() throws Exception {
        try {
            IProject inpathProj = createPredefinedProject("PathTesting-HasInpath"); //$NON-NLS-1$
    		JavaCore.setClasspathContainer(container.getPath(), new IJavaProject[] { JavaCore.create(inpathProj) }, 
    				new IClasspathContainer[] { container }, null);

            getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
            waitForJobsToComplete();
            IFile aspectFile = inpathProj.getFile("src/aspects/AdviseClassOnInpath.aj"); //$NON-NLS-1$
            
            IMarker[] markers = aspectFile.findMarkers(IMarker.MARKER, true, 2);
            
            // should have one marker for each advice (ie- 5)
            assertEquals("Invalid number of markers on file " + aspectFile, 5, markers.length); //$NON-NLS-1$
            
            // each marker should have extra information attached to it
            for (int i = 0; i < markers.length; i++) {
                IMarker marker = markers[i];
                String loc = (String) marker.getAttribute(AspectJUIPlugin.RELATED_LOCATIONS_ATTRIBUTE_PREFIX + 0);
                assertNotNull("No location attached to marker number " + i, loc); //$NON-NLS-1$
                
                String[] s = loc.split(":::"); //$NON-NLS-1$
                assertEquals("Invalid extra location attribute format\n    " + loc, 4, s.length); //$NON-NLS-1$
            }
        } catch (CoreException e) {
            fail();
        }
    }

    /**
     * Test to see that the extra location attributes are associated with advice markers for aspect paths
     * 
     * This attribute has the format FFFF:::NNNN:::NNNN:::NNNN
     * - The FFFF is the file which contains the source of the advice or ITD in affect
     * - The other three NNNN fields are integers indicating (in order) the
     *   start line number of the advice in that file, the end line number of the
     *   advice in that file and the column number for the advice.
     */
    public void testAspectPathMarkers() {
        try {
            IProject aspectPathProj = createPredefinedProject("PathTesting-HasAspectPath"); //$NON-NLS-1$
    		JavaCore.setClasspathContainer(container.getPath(), new IJavaProject[] { JavaCore.create(aspectPathProj) }, 
    				new IClasspathContainer[] { container }, null);

    		getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
            waitForJobsToComplete();
            IFile aspectFile = aspectPathProj.getFile("src/main/Main.java"); //$NON-NLS-1$
            
            IMarker[] markers = aspectFile.findMarkers(IMarker.MARKER, true, 2);
            
            System.out.println(getAllProblemViewMarkers()[0].getAttribute(IMarker.MESSAGE));
            // should have one marker for each advised method (ie- 4)
            assertEquals("Invalid number of markers on file " + aspectFile, 4, markers.length); //$NON-NLS-1$
            // each marker should have extra information attached to it
            for (int i = 0; i < markers.length; i++) {
                IMarker marker = markers[i];
                String loc = (String) marker.getAttribute(AspectJUIPlugin.RELATED_LOCATIONS_ATTRIBUTE_PREFIX + 0);
                assertNotNull("No location attached to marker number " + i, loc); //$NON-NLS-1$
                
                String[] s = loc.split(":::"); //$NON-NLS-1$
                assertEquals("Invalid extra location attribute format\n    " + loc, 4, s.length); //$NON-NLS-1$
            }
        } catch (CoreException e) {
            fail();
        }
    }
}

Lines 14-25 Link Here

(-)src/org/eclipse/ajdt/core/tests/AllCoreTests.java (-1 / +9 lines)
14	import junit.framework.Test;	14	import junit.framework.Test;
15	import junit.framework.TestSuite;	15	import junit.framework.TestSuite;
16		16
		17	import org.eclipse.ajdt.core.tests.ajde.CoreCompilerConfigurationTests;
		18	import org.eclipse.ajdt.core.tests.ajde.CoreCompilerConfigurationTests2;
		19	import org.eclipse.ajdt.core.tests.ajde.CoreCompilerFactoryTests;
17	import org.eclipse.ajdt.core.tests.builder.AJBuilderTest;	20	import org.eclipse.ajdt.core.tests.builder.AJBuilderTest;
18	import org.eclipse.ajdt.core.tests.builder.AJBuilderTest2;	21	import org.eclipse.ajdt.core.tests.builder.AJBuilderTest2;
19	import org.eclipse.ajdt.core.tests.builder.AspectPathTests;	22	import org.eclipse.ajdt.core.tests.builder.AspectPathTests;
20	import org.eclipse.ajdt.core.tests.builder.Bug159197Test;	23	import org.eclipse.ajdt.core.tests.builder.Bug159197Test;
21	import org.eclipse.ajdt.core.tests.builder.Bug99133Test;
22	import org.eclipse.ajdt.core.tests.builder.Bug43711Test;	24	import org.eclipse.ajdt.core.tests.builder.Bug43711Test;
		25	import org.eclipse.ajdt.core.tests.builder.Bug99133Test;
23	import org.eclipse.ajdt.core.tests.builder.CoreOutputLocationManagerTest;	26	import org.eclipse.ajdt.core.tests.builder.CoreOutputLocationManagerTest;
24	import org.eclipse.ajdt.core.tests.codeconversion.AspectsConvertingParserTest;	27	import org.eclipse.ajdt.core.tests.codeconversion.AspectsConvertingParserTest;
25	import org.eclipse.ajdt.core.tests.codeconversion.CodeCheckerTest;	28	import org.eclipse.ajdt.core.tests.codeconversion.CodeCheckerTest;
Lines 77-82 Link Here
77	suite.addTest(new TestSuite(AJRelationshipManagerTest.class));	80	suite.addTest(new TestSuite(AJRelationshipManagerTest.class));
78	suite.addTest(new TestSuite(BinaryWeavingSupportTest.class));	81	suite.addTest(new TestSuite(BinaryWeavingSupportTest.class));
79		82
		83	// core compiler configuration
		84	suite.addTest(new TestSuite(CoreCompilerConfigurationTests.class));
		85	suite.addTest(new TestSuite(CoreCompilerConfigurationTests2.class));
		86	suite.addTest(new TestSuite(CoreCompilerFactoryTests.class));
		87
80	// Java Element tests	88	// Java Element tests
81	suite.addTest(new TestSuite(AspectElementTests.class));	89	suite.addTest(new TestSuite(AspectElementTests.class));
82		90

Lines 133-143 Link Here

(-)src/org/eclipse/ajdt/core/tests/testutils/TestLogger.java (-2 / +4 lines)
133	* Clears the log	133	* Clears the log
134	*/	134	*/
135	public void clearLog() {	135	public void clearLog() {
136	log.clear();	136	if (log != null) {
		137	log.clear();
		138	}
137	}	139	}
138		140
139	public boolean isEmpty() {	141	public boolean isEmpty() {
140	return log.isEmpty();	142	return log != null && log.isEmpty();
141	}	143	}
142		144
143	/**	145	/**




		assertTrue(
				"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$
				listContainsString(buildLog, "build: Examined delta - no " + //$NON-NLS-1$
						"source file or classpath changes for project bug99133b")); //$NON-NLS-1$
		assertFalse("There should be no errors in the build log", //$NON-NLS-1$
				listContainsString(buildLog, "error")); //$NON-NLS-1$


		assertTrue(
				"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$
				listContainsString(buildLog, "build: Examined delta - no " + //$NON-NLS-1$
						"source file or classpath changes for project bug99133b")); //$NON-NLS-1$
		assertFalse("There should be no errors in the build log", //$NON-NLS-1$
				listContainsString(buildLog, "error")); //$NON-NLS-1$


		assertTrue(
				"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$
				listContainsString(buildLogB, "build: Examined delta - no " + //$NON-NLS-1$
						"source file or classpath changes for project bug99133b")); //$NON-NLS-1$

		// by checking that we don't have the following messages in the
		// log (and the previous checking for no errors) we know that




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>AspectProj2-On AspectPath</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.ajdt.core.ajbuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.ajdt.ui.ajnature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>AspectProj1</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.ajdt.core.ajbuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.ajdt.ui.ajnature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

Added Link Here

(-)workspace/AspectProj3-Has (+7 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
6	<classpathentry kind="output" path="bin"/>
7	</classpath>

Added Link Here

(-)workspace/AspectProj2-On (+7 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
6	<classpathentry kind="output" path="bin"/>
7	</classpath>




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>AspectProjWeCareAbout</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.ajdt.core.ajbuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.ajdt.ui.ajnature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

Added Link Here

(-)workspace/AspectProj2-On (+5 lines)
1	package b;
2
3	public class B {
4
5	}




<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
	<classpathentry kind="src" path="/JavaProj2-On Inpath">
		<attributes>
			<attribute name="org.eclipse.ajdt.inpath" value="org.eclipse.ajdt.aspectpath"/>
		</attributes>
	</classpathentry>
	<classpathentry kind="src" path="/AspectProj2-On AspectPath">
		<attributes>
			<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
		</attributes>
	</classpathentry>
	<classpathentry combineaccessrules="false" kind="src" path="/AspectProj1"/>
	<classpathentry combineaccessrules="false" kind="src" path="/JavaProj1"/>
	<classpathentry kind="lib" path="/JavaProj3-ClassFolder/bin"/>
	<classpathentry kind="lib" path="/AspectProj3-Has Outjar/output.jar"/>
	<classpathentry kind="output" path="bin"/>
</classpath>




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>JavaProj2-On Inpath</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

Added Link Here

(-)workspace/AspectProjWeCareAbout/src/a/B.java (+5 lines)
1	package a;
2
3	public class B {
4
5	}




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>AspectProj3-Has Outjar</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.ajdt.core.ajbuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.ajdt.ui.ajnature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

Added Link Here

(-)workspace/JavaProj3-ClassFolder/.classpath (+6 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="output" path="bin"/>
6	</classpath>

Added Link Here

(-)workspace/AspectProj1/.classpath (+7 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
6	<classpathentry kind="output" path="bin"/>
7	</classpath>

Added Link Here

(-)workspace/JavaProj1/bin/c/D.class (+7 lines)
1	Êþº¾1c/Djava/lang/Object<init>()VCode
2	LineNumberTableLocalVariableTablethisLc/D;x()I
3	SourceFileD.java!/*·±
4
5	- ¬
6
7

Added Link Here

(-)workspace/AspectProj3-Has (+5 lines)
1	package f;
2
3	public class OnOutJar {
4
5	}

Added Link Here

(-)workspace/JavaProj1/.classpath (+6 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="output" path="bin"/>
6	</classpath>

Added Link Here

(-)workspace/AspectProj3-Has (+3 lines)
1	#Thu Sep 04 11:34:44 PDT 2008
2	eclipse.preferences.version=1
3	org.eclipse.ajdt.ui.outJar=output.jar




package org.eclipse.ajdt.core.tests.ajde;

import java.io.StringReader;

import org.eclipse.ajdt.core.AspectJCorePreferences;
import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.ajdt.core.tests.AJDTCoreTestCase;
import org.eclipse.ajdt.core.tests.testutils.ReaderInputStream;
import org.eclipse.ajdt.core.tests.testutils.TestLogger;
import org.eclipse.ajdt.core.tests.testutils.Utils;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;


/**
 * This class tests Bug 245566. The use of ICompilerConfiguration's
 * api should reduce overhead in preparing for incremenental builds
 */
public class CoreCompilerConfigurationTests extends AJDTCoreTestCase {
    private TestLogger testLog;

    protected void setUp() throws Exception {
        super.setUp();
        Utils.setAutobuilding(false);
        testLog = new TestLogger();
        AspectJPlugin.getDefault().setAJLogger(testLog);
        AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(true);
    }

    protected void tearDown() throws Exception {
        super.tearDown();
        Utils.setAutobuilding(true);
        AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(false);
    }
    
    // test to ensure that when the switch is turned off, optimization does not occur
    public void testIncrementalCompilationOptimizationsEnabled() throws Exception {
        
        assertTrue(AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled());
        AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(false);
        assertFalse(AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled());
        
        // load project and full build
        IProject proj = createPredefinedProject("Bean Example");

        testLog.clearLog();
        
        proj.getFile("src/bean/Point.java").touch(null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        // ensure that the classpath entries list has not been set
        assertEquals(0, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
        assertEquals(1, testLog.numberOfEntriesForMessage("Optimizations turned off, so assuming all parts of configuration have changed"));
        assertEquals(1, testLog.numberOfEntriesForMessage("Configuration was []"));
        assertEquals(1, testLog.numberOfEntriesForMessage("Resetting list of modified source files.  Was [/Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java]"));
    }
    
    
    public void testChangeSourceFiles() throws Exception {

        // load project and full build
        IProject proj = createPredefinedProject("Bean Example");
        
        // touch source files (one Java and one AJ)
        proj.getFile("src/bean/Point.java").touch(null);
        proj.getFile("src/bean/BoundPoint.aj").touch(null);

        testLog.clearLog();
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // look at AJDT Event trace
        // when build is determining which source files have changed
        assertEquals(1, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java has changed."));
        assertEquals(1, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/BoundPoint.aj has changed."));
        
        // should not happen.  this line should only be logged when a file is added or deleted
        assertEquals(0, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCEFILES_CHANGED]"));

        // during a callback from ajc
        assertEquals(1, testLog.numberOfEntriesForMessage("build: Examined delta - 2 changed, 0 added, and 0 deleted source files in required project Bean Example"));
        
        // after compilation can reset configuration
        assertEquals(1, testLog.numberOfEntriesForMessage("Resetting list of modified source files.  Was [/Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/BoundPoint.aj, /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java]"));

        // when the configuration is being reset
        assertEquals(1, testLog.numberOfEntriesForMessage("Configuration was []"));
    }
    
    // also test creating and deleting source files and resources
    public void testAddDeleteSourceFiles() throws Exception {
        // load project and full build
        IProject proj = createPredefinedProject("Bean Example");
        
        testLog.clearLog();

        // create a Java file and an Aspect file
        proj.getFile("src/MyJavaFile.java").create(new ReaderInputStream(new StringReader("public class MyJavaFile { }")), 
                true, null);
        proj.getFile("src/MyAspectFile.aj").create(new ReaderInputStream(new StringReader("public aspect MyAspectFile { }")), 
                true, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        // now delete the files
        proj.getFile("src/MyJavaFile.java").delete(true, null);
        proj.getFile("src/MyAspectFile.aj").delete(true, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        // check log
        
        // should not have found any changes, only additions and deletions
        assertEquals(1, testLog.numberOfEntriesForMessage("build: Examined delta - 0 changed, 2 added, and 0 deleted source files in required project Bean Example"));
        assertEquals(1, testLog.numberOfEntriesForMessage("build: Examined delta - 0 changed, 0 added, and 2 deleted source files in required project Bean Example"));
        
        // all of these items should appear twice: once on creation and once on deletion
        assertEquals(2, testLog.numberOfEntriesForMessage("Compiler configuration for project Bean Example has been read by compiler.  Resetting."));
        assertEquals(2, testLog.numberOfEntriesForMessage("Configuration was [PROJECTSOURCEFILES_CHANGED]"));
        assertEquals(2, testLog.numberOfEntriesForMessage("Resetting list of modified source files.  Was []"));

        // occurs 4 times: twice on creation and twice on deletion
        assertEquals(4, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCEFILES_CHANGED]"));
        
        // this last entry occurs only once after the aspect is deleted
        assertEquals(1, testLog.numberOfEntriesForMessage("Preparing for build: not going to be incremental because an aspect was deleted"));
    }
    
    public void testClasspathChange() throws Exception {
        // load project and full build
        IProject proj = createPredefinedProject("Bean Example");
        
        // touch classpath
        proj.getFile(".classpath").touch(null);

        testLog.clearLog();
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // look at AJDT Event trace
        // the configuration should have registered a change:
        assertEquals(1, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [ASPECTPATH_CHANGED, CLASSPATH_CHANGED, INPATH_CHANGED]"));
        
        // classpath has been changed, so should not see this message
        assertEquals(0, testLog.numberOfEntriesForMessage("build: Examined delta - no source file or classpath changes for project Bean Example"));
    }

    /**
     * before the first build after a clean, any changes to the
     * configuration should not be recorded because the compiler has 
     * nothing to compare the changes to.
     * @throws Exception
     */
    public void testChangeBeforeBuild() throws Exception {
        // load project and full build
        IProject proj = createPredefinedProject("Bean Example");

        testLog.clearLog();
        
        // now do a clean so that the previous build is forgotten
        getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, null);
        
        proj.getFile("src/bean/Point.java").touch(null);
        proj.getFile("src/bean/BoundPoint.aj").touch(null);
        proj.getFile(".classpath").touch(null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        
        // since there was no state before and hence no ResourceDelta, 
        // we know that there must be certain entries missing from the log
        assertEquals(0, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java has changed."));
        assertEquals(0, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/BoundPoint.aj has changed."));
        assertEquals(0, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCEFILES_CHANGED]"));

        assertEquals(1, testLog.numberOfEntriesForMessage("Compiler configuration for project Bean Example doesn't know previous state, so assuming EVERYTHING has changed."));
        
        // and what should we be seeing about the classpath?
        
        // the previous set of config changes was *everything*, so
        // this was sent to the compiler
        assertEquals(1, testLog.numberOfEntriesForMessage("Configuration was [PROJECTSOURCEFILES_CHANGED, JAVAOPTIONS_CHANGED, ASPECTPATH_CHANGED, CLASSPATH_CHANGED, INPATH_CHANGED, NONSTANDARDOPTIONS_CHANGED, OUTJAR_CHANGED, PROJECTSOURCERESOURCES_CHANGED, OUTPUTDESTINATIONS_CHANGED, INJARS_CHANGED]"));
    }
    
    // also test creating and deleting source files and resources
    public void testAddDeleteChangeReources() throws Exception {
        // load project and full build
        IProject proj = createPredefinedProject("Bean Example");
        
        testLog.clearLog();

        // create a resource
        proj.getFile("src/nothing.txt").create(new ReaderInputStream(new StringReader("nothing interesting")), 
                true, null);

        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        // touch the resource
        proj.getFile("src/nothing.txt").touch(null);

        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // delete the resource
        proj.getFile("src/nothing.txt").delete(true, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        // 3 builds, but only 2 should have resource files changed in it
        // only occurs when resources are added or deleted.
        assertEquals(2, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCERESOURCES_CHANGED]"));
        
        // no source files have changed, though
        assertEquals(3, testLog.numberOfEntriesForMessage("build: Examined delta - no source file or classpath changes for project Bean Example"));
        
        // also make sure the file was copied and deleted properly
        assertEquals(1, testLog.numberOfEntriesForMessage("Copying added file nothing.txt"));
        assertEquals(1, testLog.numberOfEntriesForMessage("Deleting existing file nothing.txt"));
        assertEquals(1, testLog.numberOfEntriesForMessage("Copying changed file nothing.txt"));
        assertEquals(1, testLog.numberOfEntriesForMessage("Deleting removed file nothing.txt"));
    }
    
    // now test what happens when the build is broken
    // not really sure what the behavior should be.
    public void testBadBuild() throws Exception {
        // load project and full build
        IProject proj = createPredefinedProject("Bean Example");
        
        testLog.clearLog();

        // create a source file
        proj.getFile("src/MyAspectFile.aj").create(new ReaderInputStream(new StringReader("public aspect MyAspectFile { }")), 
                true, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        // add an error to the source file
        proj.getFile("src/MyAspectFile.aj").appendContents(new ReaderInputStream(new StringReader("XXX")), 
                true, false, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        
        // remove the error
        proj.getFile("src/MyAspectFile.aj").setContents(new ReaderInputStream(new StringReader("public aspect MyAspectFile { }")), 0, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        testLog.printLog();
    }
    
    

}

Added Link Here

(-)workspace/JavaProj1/src/c/B.java (+5 lines)
1	package c;
2
3	public class B {
4
5	}

Added Link Here

(-)workspace/JavaProj1/bin/c/B.class (+5 lines)
1	Êþº¾1c/Bjava/lang/Object<init>()VCode
2	LineNumberTableLocalVariableTablethisLc/B;
3	SourceFileB.java!/*·±
4
5

Added Link Here

(-)workspace/AspectProj3-Has (+3 lines)
1	PKÎ]$9META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
2	K-ÎÌÏ³R0Ô3àår.JM,IMÑuª´Rp,.HM.ñRpÎÏ-ÈÌI-âåâåPK²ÔW97PKÎ]$9f/OnOutJar.classENÁÁPÕj©¢ñn8hÄA=÷×zxRmRÿr8ø%¶Eì&³;»³}¾î#8&kçú±gÐ ÎQ\xïúÁQÁ¨XeSÖëoú,ÙJê6ª0mOÅr®EIBÇKBmDª
3	þêÙA ¶÷w³ÿ*ÉÓPÎU!iþÃâtÁ(8ÙÑdæ¨n¨]¹©Àb4Ê¡£ýpmçRÕ~PK}>¥ÀýPKÎ]$9²ÔW97META-INF/MANIFEST.MFþÊPKÎ]$9}>¥Àýf/OnOutJar.classPK}




package org.eclipse.ajdt.core.tests.ajde;

import java.io.StringReader;

import org.eclipse.ajdt.core.AspectJCorePreferences;
import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.ajdt.core.tests.AJDTCoreTestCase;
import org.eclipse.ajdt.core.tests.testutils.ReaderInputStream;
import org.eclipse.ajdt.core.tests.testutils.TestLogger;
import org.eclipse.ajdt.core.tests.testutils.Utils;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;

/**
 * this set of tests ensures that the CoreCompilerConfiguration.getClasspathElementsWithModifiedContents() method 
 * works properly
 * 
 * Actually, this test class tests the method AJBuilder.getChangedRequiredProjects
 */
public class CoreCompilerConfigurationTests2 extends AJDTCoreTestCase {

    private TestLogger testLog;

    private IProject jp1;
//    private IProject jp2;  // not used
    private IProject jp3;
    private IProject ap1;
    private IProject ap2;
    private IProject ap3;
    private IProject myProj;
    
    protected void setUp() throws Exception {
        super.setUp();
        Utils.setAutobuilding(false);
        testLog = new TestLogger();
        AspectJPlugin.getDefault().setAJLogger(testLog);
        
        jp1 = createPredefinedProject("JavaProj1");
        /* jp2 = */ createPredefinedProject("JavaProj2-On Inpath");
        jp3 = createPredefinedProject("JavaProj3-ClassFolder");
        ap1 = createPredefinedProject("AspectProj1");
        ap2 = createPredefinedProject("AspectProj2-On AspectPath");
        ap3 = createPredefinedProject("AspectProj3-Has Outjar");
        myProj = createPredefinedProject("AspectProjWeCareAbout");
        
        AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(true);
    }

    protected void tearDown() throws Exception {
        super.tearDown();
        Utils.setAutobuilding(true);
        AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(false);
    }
    
    /*
     * When there are no changes, only the
     * projects on the inpath should be listed as modified
     */
    public void testNoChange() throws Exception {
        testLog.clearLog();

        // change myProj
        myProj.getFile("src/a/B.java").touch(null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        // should see that the project on the inpath was considered changed.
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));
        
        // ensure that this is the only time the list has been set
        assertEquals(1, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
    }

    /*
     * the project as well as the in path project should appear
     */
    public void testChangeAspectProject() throws Exception {
        testLog.clearLog();

        // change the project
        ap1.getFile("src/AFile.java").create(new ReaderInputStream(new StringReader("class AFile {}")), false, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        // This first entry is from when project ap1 is built
        assertEquals(1, testLog.numberOfEntriesForMessage("   []"));
        // this message comes from the project we care about
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/AspectProj1/bin, /Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));

        // ensure that these are the only 2 times the list has been set
        assertEquals(2, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
    }
    
    public void testChangeAspectProjectOnAspectPath() throws Exception {
        testLog.clearLog();

        // change the project
        ap2.getFile("src/AFile.java").create(new ReaderInputStream(new StringReader("class AFile {}")), false, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        // This first entry is from when project ap2 is built
        assertEquals(1, testLog.numberOfEntriesForMessage("   []"));
        // this message comes from the project we care about
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/AspectProj2-On AspectPath/bin, /Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));

        // ensure that these are the only 2 times the list has been set
        assertEquals(2, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
    }
    
    public void testChangeJavaProject() throws Exception {
        testLog.clearLog();

        // change the project
        jp1.getFile("src/AFile.java").create(new ReaderInputStream(new StringReader("class AFile {}")), false, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        // this message comes from the project we care about
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj1/bin, /Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));

        // ensure that this is the only time the list has been set
        assertEquals(1, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
    }
    
    public void testChangeJavaProjectNonStructuralChange() throws Exception {
        testLog.clearLog();

        // change the project---non-structural change
        jp1.getFile("src/c/B.java").touch(null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        // this message comes from the project we care about
        // nothing other than the inpath should be on the list
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));

        // ensure that this is the only time the list has been set
        assertEquals(1, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
    }
    
    public void testChangeClassFolder() throws Exception {
        testLog.clearLog();

        // change the project
        jp3.getFile("src/AFile.java").create(new ReaderInputStream(new StringReader("class AFile {}")), false, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // incremental build...again
        // we have a situation where there is a double build because there 
        // is a binary folder dependency.  
        // In general, we don't recommend binary folder dependencies for
        // this reason (should use project dependencies instead)
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        
        // check log
        // this message comes from the project we care about on the first build
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));

        // this message comes from the project we care about on the second build
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj3-ClassFolder/bin, /Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));

        // ensure that this is the only time the list has been set
        assertEquals(2, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
    }
    
    public void testChangeJar() throws Exception {
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();

        testLog.clearLog();

        // change the project
        ap3.getFile("src/AFile.java").create(new ReaderInputStream(new StringReader("class AFile {}")), false, null);
        
        // incremental build
        getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
        waitForAutoBuild();
        
        // check log
        // This first entry is from when project ap3 is built
        assertEquals(1, testLog.numberOfEntriesForMessage("   []"));
        // this message comes from the project we care about
        assertEquals(1, testLog.numberOfEntriesForMessage("[/Users/andrew/Eclipse/Workspaces/junit-workspace/AspectProj3-Has Outjar/output.jar, /Users/andrew/Eclipse/Workspaces/junit-workspace/JavaProj2-On Inpath/bin]"));

        // ensure that this is the only time the list has been set
        assertEquals(2, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
    }
}

Added Link Here

(-)workspace/JavaProj2-On (+6 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="output" path="bin"/>
6	</classpath>

Added Link Here

(-)workspace/JavaProj1/src/c/D.java (+7 lines)
1	package c;
2
3	public class D {
4	int x() {
5	return 9;
6	}
7	}




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>JavaProj1</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>JavaProj3-ClassFolder</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *******************************************************************************/
package org.eclipse.ajdt.internal.core;

import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.CoreException;

public class ResourceChangeListener implements IResourceChangeListener {

	private ResourceDeltaVisitor myDeltaVisitor;

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public ResourceChangeListener() {
		myDeltaVisitor = new ResourceDeltaVisitor();
	}

	public void resourceChanged(IResourceChangeEvent event) {
		if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
			IResourceDelta delta = event.getDelta();
			// avoid processing deltas for non-AspectJ projects,
			if (delta != null) {
				IResourceDelta[] cd = delta.getAffectedChildren();
				if (cd == null) {
					try {
						delta.accept(myDeltaVisitor);
					} catch (CoreException e) {
					}
				} else {
					for (int i = 0; i < cd.length; i++) {
						try {
							IResource res = cd[i].getResource();
							if (res == null) {
								cd[i].accept(myDeltaVisitor);
							} else {
								IProject proj = res.getProject();
								// if we don't know the project, or it is
								// no longer accessible, we'd better process
								// the delta. Otherwise we only process it
								// if it is an AspectJ project.
								if ((proj == null) || !proj.isAccessible()
										|| AspectJPlugin.isAJProject(proj)) {
									cd[i].accept(myDeltaVisitor);
								}
							}
						} catch (CoreException e) {
						}
					}
				}
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *	   Matthew Ford - Bug 154339
 *     Helen Hawkins - updated for new ajde interface (bug 148190)
 *******************************************************************************/
package org.eclipse.ajdt.internal.core;

import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;

public class ResourceDeltaVisitor implements IResourceDeltaVisitor {

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public ResourceDeltaVisitor() {
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
	 */
	public boolean visit(IResourceDelta delta) {
		IResource myRes = delta.getResource();
		if (myRes.getType() == IResource.PROJECT) {
			switch (delta.getKind()) {
			case IResourceDelta.REMOVED:
				// remove the compiler associated with this project from the factory
				AspectJPlugin.getDefault().getCompilerFactory()
						.removeCompilerForProject(myRes.getProject());
				break;
			case IResourceDelta.CHANGED:
				if (!myRes.getProject().isOpen()) {
					// remove the compiler associated with this project from the 
					// factory - project could remain closed indefinitely, therefore, 
					// don't want to hang on to the compiler instance
					AspectJPlugin.getDefault().getCompilerFactory()
							.removeCompilerForProject(myRes.getProject());
				}
				break;
			}
		}
		return true;
	}
}





import org.aspectj.ajde.core.ICompilerConfiguration;
import org.aspectj.ajde.core.IOutputLocationManager;
import org.aspectj.ajdt.internal.core.builder.CompilerConfigurationChangeFlags;
import org.eclipse.ajdt.core.AJLog;
import org.eclipse.ajdt.core.AspectJCorePreferences;
import org.eclipse.ajdt.core.AspectJPlugin;

import org.eclipse.osgi.util.NLS;

/**
 * ICompilerConfiguration implementation which returns information for all 
 * methods except getNonStandardOptions().  This implementation is used
 * if ajdt.core plugin is not present in the platform
 */
public class CoreCompilerConfiguration implements ICompilerConfiguration {


	protected IProject project;
	private CoreOutputLocationManager locationManager;

	// fully qualified list of file names that have been touched since
    // last build
    // set to null originally since we don't know anything 
    // about build state when first created.  Assume everything 
    // has changed.
    private List/* File */ modifiedFiles = null;
    // set of flags describing what has changed since last
    // build
    // initially set to EVERYTHING since we don't know
    // build state when first created.
    private int configurationChanges;
    
    // list of classpath entries that have been rebuilt since last build
    private List /*String*/ classpathElementsWithModifiedContents = null;

    public CoreCompilerConfiguration(IProject project) {
		this.project = project;
		AJLog.log(AJLog.BUILDER, "Compiler configuration for project " + project.getName() + " doesn't know previous state, so assuming EVERYTHING has changed.");
		configurationChanges = EVERYTHING;
	}

	public Map getJavaOptionsMap() {

		return result;
	}

	public void addModifiedFile(File changedFile) {
	    AJLog.log(AJLog.BUILDER, "File: " + changedFile + " has changed.");
	    if (modifiedFiles != null) {
	        modifiedFiles.add(changedFile);
	    } else {
	        AJLog.log(AJLog.BUILDER, "    but, we don't have any state yet, so not recording the change.");
	    }
	}
	
	/**
	 * Flag this compiler configuration as having had a change.
	 * This is reset after a call to {@link #configurationRead()}
	 * @param changeFlag change flag from 
	 * {@link CompilerConfigurationChangeFlags}
	 */
	public void configurationChanged(int changeFlag) {
	    configurationChanges |= changeFlag;
	    logConfigurationChange(changeFlag);
	}

	private void logConfigurationChange(int changeFlag) {
	    List changeKind = new ArrayList();
        if ((changeFlag & PROJECTSOURCEFILES_CHANGED) != NO_CHANGES) {
            changeKind.add("PROJECTSOURCEFILES_CHANGED");
        }
        if ((changeFlag & JAVAOPTIONS_CHANGED) != NO_CHANGES) {
            changeKind.add("JAVAOPTIONS_CHANGED");
        }
        if ((changeFlag & ASPECTPATH_CHANGED) != NO_CHANGES) {
            changeKind.add("ASPECTPATH_CHANGED");
        }
        if ((changeFlag & CLASSPATH_CHANGED) != NO_CHANGES) {
            changeKind.add("CLASSPATH_CHANGED");
        }
        if ((changeFlag & INPATH_CHANGED) != NO_CHANGES) {
            changeKind.add("INPATH_CHANGED");
        }
        if ((changeFlag & NONSTANDARDOPTIONS_CHANGED) != NO_CHANGES) {
            changeKind.add("NONSTANDARDOPTIONS_CHANGED");
        }
        if ((changeFlag & OUTJAR_CHANGED) != NO_CHANGES) {
            changeKind.add("OUTJAR_CHANGED");
        }
        if ((changeFlag & PROJECTSOURCERESOURCES_CHANGED) != NO_CHANGES) {
            changeKind.add("PROJECTSOURCERESOURCES_CHANGED");
        }
        if ((changeFlag & OUTPUTDESTINATIONS_CHANGED) != NO_CHANGES) {
            changeKind.add("OUTPUTDESTINATIONS_CHANGED");
        }
        // deprecated
        if ((changeFlag & INJARS_CHANGED) != NO_CHANGES) {
            changeKind.add("INJARS_CHANGED");
        }
        AJLog.log(AJLog.BUILDER, "CoreCompilerConfiguration for project " + project.getName() + " registered a configuration change: " + changeKind);
	}
	
	/**
	 * converts the current configuration change list to a 
	 * human readable string
	 * @return human readable string denoting all configuration
	 * changes since last read.
	 */
	private String toConfigurationString() {
        List changeKind = new ArrayList();
        if ((configurationChanges & PROJECTSOURCEFILES_CHANGED) != NO_CHANGES) {
            changeKind.add("PROJECTSOURCEFILES_CHANGED");
        }
        if ((configurationChanges & JAVAOPTIONS_CHANGED) != NO_CHANGES) {
            changeKind.add("JAVAOPTIONS_CHANGED");
        }
        if ((configurationChanges & ASPECTPATH_CHANGED) != NO_CHANGES) {
            changeKind.add("ASPECTPATH_CHANGED");
        }
        if ((configurationChanges & CLASSPATH_CHANGED) != NO_CHANGES) {
            changeKind.add("CLASSPATH_CHANGED");
        }
        if ((configurationChanges & INPATH_CHANGED) != NO_CHANGES) {
            changeKind.add("INPATH_CHANGED");
        }
        if ((configurationChanges & NONSTANDARDOPTIONS_CHANGED) != NO_CHANGES) {
            changeKind.add("NONSTANDARDOPTIONS_CHANGED");
        }
        if ((configurationChanges & OUTJAR_CHANGED) != NO_CHANGES) {
            changeKind.add("OUTJAR_CHANGED");
        }
        if ((configurationChanges & PROJECTSOURCERESOURCES_CHANGED) != NO_CHANGES) {
            changeKind.add("PROJECTSOURCERESOURCES_CHANGED");
        }
        if ((configurationChanges & OUTPUTDESTINATIONS_CHANGED) != NO_CHANGES) {
            changeKind.add("OUTPUTDESTINATIONS_CHANGED");
        }
        // deprecated
        if ((configurationChanges & INJARS_CHANGED) != NO_CHANGES) {
            changeKind.add("INJARS_CHANGED");
        }
        return changeKind.toString();
	}

	/**

	 * build.
	 */
	public void configurationRead() {
	    // we now know nothing has changed
	    AJLog.log(AJLog.BUILDER, "Compiler configuration for project " + project.getName() + " has been read by compiler.  Resetting.");
	    AJLog.log(AJLog.BUILDER, "     Configuration was " + toConfigurationString());
	    
	    // we are still not keeping track of some changes:
	    // JAVAOPTIONS_CHANGED | NONSTANDARDOPTIONS_CHANGED | OUTJAR_CHANGED |
        // OUTPUTDESTINATIONS_CHANGED | INJARS_CHANGED
	    configurationChanges = NO_CHANGES;
	    resetModifiedList();
	}

	/**
	 * Need to tell AspectJ what has changed in the configuration since the last build was done - the lazy answer (which causes it
	 * to behave as it always used to) is EVERYTHING.
	 * 
	 * @see CompilerConfigurationChangeFlags
	 * @see AspectJCorePreferences#isIncrementalCompilationOptimizationsEnabled
	 */
	public int getConfigurationChanges() {
	    // if the optimization flag is turned off, then return EVERYTHING
	    if (!AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled()) {
            AJLog.log(AJLog.BUILDER, "Optimizations turned off, so assuming all parts of configuration have changed");
            return EVERYTHING;
	    } else {
	        AJLog.log(AJLog.BUILDER, "Sending the following configuration changes to the compiler: " + toConfigurationString());
	        return AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled() ? configurationChanges : EVERYTHING;
	    }
	}

	/**

	 * analysing delta changes. Returning null means we have no idea and will cause AspectJ to do the analysis to work it out.
	 */
	public List getProjectSourceFilesChanged() {
	    if (!AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled()) {
            AJLog.log(AJLog.BUILDER, "Optimizations turned off, so assuming all source files have changed");
            return null;
        } else if (modifiedFiles == null) {
            // null means we dont know
	        AJLog.log(AJLog.BUILDER, "We don't know what has changed since last build, so assuming all source files have changed");
	        return null;
	    } else {
	        AJLog.log(AJLog.BUILDER, modifiedFiles.size() + " source file changes since last build");
	        return modifiedFiles;
	    }
	}

	public void resetModifiedList() {
	    AJLog.log(AJLog.BUILDER, "Resetting list of modified source files.  Was " + 
	            (modifiedFiles == null ? "null" : modifiedFiles.toString()));
	    modifiedFiles = new ArrayList();
	}
	
    public void resetClasspathElementsWithModifiedContents() {
        classpathElementsWithModifiedContents = null;
    }
    public void setClasspathElementsWithModifiedContents(List /*String*/ modifiedContents) {
        AJLog.log(AJLog.BUILDER, "Setting list of classpath elements with modified contents:");
        AJLog.log(AJLog.BUILDER, "      " + modifiedContents.toString());
        classpathElementsWithModifiedContents = modifiedContents;
    }
	
	// must go through the classpath and look at projects we depend on that have been built before our
	// most recent last build
	public List getClasspathElementsWithModifiedContents() {
	    return classpathElementsWithModifiedContents;
	}

	
	/**
	 * helper method that grabs the compiler configuration for a particular project
	 * creates one if it does not exist
	 * @param project
	 * @return the project's compiler configuration
	 */
	public static CoreCompilerConfiguration getCompilerConfigurationForProject(IProject project) {
	    return (CoreCompilerConfiguration) AspectJPlugin.getDefault().getCompilerFactory().getCompilerForProject(project).getCompilerConfiguration();
	}
}

Lines 19-24 Link Here

(-)src/org/eclipse/ajdt/internal/core/ajde/CoreCompilerFactory.java (-4 / +10 lines)
19	/**	19	/**
20	* ICompilerFactory implementation which returns AjCompilers with	20	* ICompilerFactory implementation which returns AjCompilers with
21	* core implementations of the required interfaces.	21	* core implementations of the required interfaces.
		22	*
		23	* This class is only used if ajdt.ui plugin is not available
		24	*
22	*/	25	*/
23	public class CoreCompilerFactory implements ICompilerFactory {	26	public class CoreCompilerFactory implements ICompilerFactory {
24		27
Lines 45-54 Link Here
45	* No longer record the AjCompiler for the given project.	48	* No longer record the AjCompiler for the given project.
46	*/	49	*/
47	public void removeCompilerForProject(IProject project) {	50	public void removeCompilerForProject(IProject project) {
48	// firstly clean up any state associated with the compiler	51	// firstly clean up any state associated with the compiler
49	getCompilerForProject(project).clearLastState();	52	AjCompiler compiler = (AjCompiler) compilerMap.get(project);
50	// remove compiler from the map	53	if (compiler != null) {
51	compilerMap.remove(project);	54	compiler.clearLastState();
		55	// remove compiler from the map
		56	compilerMap.remove(project);
		57	}
52	}	58	}
53		59
54	/**	60	/**




package org.eclipse.ajdt.core;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;

import org.eclipse.core.resources.IContainer;


public class BuildConfig {
	
	private static Map /*IProject, List<IFile>*/ projectsToIncludedSourceFiles = new WeakHashMap();
	
	/**
	 * Returns all of the currently included source files in a project

		projectsToIncludedSourceFiles.put(project, sourceFiles);
		return sourceFiles;
	}

	
	
	/**
	 * Experimental version of above that uses a set, not a list
	 * @param project
	 * @return
	 */
	public static Set /* IFile */getIncludedSourceFilesSet(IProject project) {
        if (projectsToIncludedSourceFiles.get(project) instanceof List) {
            return (Set) projectsToIncludedSourceFiles.get(project);
        }
        Set sourceFiles = new HashSet();
        try {
            IJavaProject jp = JavaCore.create(project);
            IClasspathEntry[] cpes = jp.getRawClasspath();
            for (int i = 0; i < cpes.length; i++) {
                if ((cpes[i] instanceof ClasspathEntry)
                        && (cpes[i].getEntryKind() == IClasspathEntry.CPE_SOURCE)) {
                    ClasspathEntry cp = (ClasspathEntry) cpes[i];
                    char[][] incl = cp.fullInclusionPatternChars();
                    char[][] excl = cp.fullExclusionPatternChars();
                    IPath path = cpes[i].getPath();
                    IResource res = project.findMember(path
                            .removeFirstSegments(1));
                    if ((res != null) && (res instanceof IContainer)) {
                        List l = allFiles((IContainer) res);
                        for (Iterator iter = l.iterator(); iter.hasNext();) {
                            IFile file = (IFile) iter.next();
                            if (!Util.isExcluded(file, incl, excl)) {
                                sourceFiles.add(file);
                            }
                        }
                    }
                }
            }
        } catch (JavaModelException e) {
        }
        projectsToIncludedSourceFiles.put(project, sourceFiles);
        return sourceFiles;
    }

	
	/**
	 * Invalidate the list of included source files for a project




public class AspectJCorePreferences {
			
    public static final String OPTION_AutobuildSuppressed = "org.eclipse.ajdt.ui.builder.autobuildSuppressed"; //$NON-NLS-1$
    public static final String OPTION_IncrementalCompilationOptimizations = "org.eclipse.ajdt.ui.builder.incrementalCompilationOptimizations"; //$NON-NLS-1$

    
	private static final String ASPECTPATH_ATTRIBUTE_NAME = "org.eclipse.ajdt.aspectpath"; //$NON-NLS-1$

                .getPluginPreferences();
        store.setValue(OPTION_AutobuildSuppressed, done);
    }
    
    /**
     * Checks to see if the compiler option for incremental build optimizations
     * is on or off
     * @return
     */
    public static boolean isIncrementalCompilationOptimizationsEnabled() {
        Preferences store = AspectJPlugin.getDefault()
                .getPluginPreferences();
        return store.getBoolean(OPTION_IncrementalCompilationOptimizations);
    }
    
    public static void setIncrementalCompilationOptimizationsEnabled(boolean value) {
        Preferences store = AspectJPlugin.getDefault()
                .getPluginPreferences();
        store.setValue(OPTION_IncrementalCompilationOptimizations, value);
    }

}

Lines 13-19 Link Here

(-)src/org/eclipse/ajdt/core/AspectJPlugin.java (-2 / +2 lines)
13	package org.eclipse.ajdt.core;	13	package org.eclipse.ajdt.core;
14		14
15	import org.eclipse.ajdt.core.model.AJModel;	15	import org.eclipse.ajdt.core.model.AJModel;
16	import org.eclipse.ajdt.internal.core.ResourceChangeListener;	16	import org.eclipse.ajdt.internal.core.CompilerConfigResourceChangeListener;
17	import org.eclipse.ajdt.internal.core.ajde.CoreCompilerFactory;	17	import org.eclipse.ajdt.internal.core.ajde.CoreCompilerFactory;
18	import org.eclipse.ajdt.internal.core.ajde.ICompilerFactory;	18	import org.eclipse.ajdt.internal.core.ajde.ICompilerFactory;
19	import org.eclipse.core.resources.IProject;	19	import org.eclipse.core.resources.IProject;
Lines 119-125 Link Here
119	super.start(context);	119	super.start(context);
120	checkForCUprovider();	120	checkForCUprovider();
121	getWorkspace().addResourceChangeListener(	121	getWorkspace().addResourceChangeListener(
122	new ResourceChangeListener(),	122	new CompilerConfigResourceChangeListener(),
123	IResourceChangeEvent.POST_CHANGE);	123	IResourceChangeEvent.POST_CHANGE);
124	setCompilerFactory(new CoreCompilerFactory());	124	setCompilerFactory(new CoreCompilerFactory());
125	}	125	}




package org.eclipse.ajdt.core.builder;

import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;

import java.util.Set;

import org.aspectj.ajde.core.AjCompiler;
import org.aspectj.ajde.core.ICompilerConfiguration;
import org.aspectj.ajdt.internal.core.builder.AjState;
import org.aspectj.ajdt.internal.core.builder.CompilerConfigurationChangeFlags;
import org.aspectj.ajdt.internal.core.builder.IStateListener;
import org.aspectj.ajdt.internal.core.builder.IncrementalStateManager;
import org.eclipse.ajdt.core.AJLog;

import org.eclipse.ajdt.core.text.CoreMessages;
import org.eclipse.ajdt.internal.core.AspectJRTInitializer;
import org.eclipse.ajdt.internal.core.ajde.CoreCompilerConfiguration;
import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.IResourceStatus;
import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.resources.IWorkspaceRoot;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IClasspathEntry;

import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.core.ClasspathEntry;
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.jdt.internal.core.builder.State;
import org.eclipse.jdt.internal.core.util.Util;
import org.eclipse.osgi.util.NLS;
import org.osgi.service.prefs.BackingStoreException;

		}

		if (kind != FULL_BUILD) {
		    if (!sourceFilesChanged(dta, project) && !classpathChanged(dta, project)){
				AJLog.log(AJLog.BUILDER,"build: Examined delta - no source file or classpath changes for project "  //$NON-NLS-1$
				AJLog.log(AJLog.BUILDER,"build: Examined delta - no source file changes for project "  //$NON-NLS-1$
								+ project.getName() );
				
				// if the source files of any projects which the current


		IAJCompilerMonitor compilerMonitor = (IAJCompilerMonitor) compiler.getBuildProgressMonitor();
		
		
		// Bug 43711 must do a clean and rebuild if we can't 
		// find a buildConfig file from a previous compilation
		if (kind == FULL_BUILD ||

			} else {
				AJLog.log(AJLog.BUILDER,"Unable to empty output folder on build all - why cant we find the IJavaProject?"); //$NON-NLS-1$
			}
		} else {
		    // doing an incremental build
		    if (AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled()) {
    		    // Bug 245566:
		        // facilitate incremental compilation by checking 
		        // classpath for projects that have changed since the last build
		        long timestamp = getLastBuildTimeStamp(compiler);
		        compilerConfig.setClasspathElementsWithModifiedContents(getChangedRequiredProjects(timestamp));
		    }
		}
		compilerMonitor.prepare(new SubProgressMonitor(progressMonitor,100));

		AJLog.log(AJLog.BUILDER_CLASSPATH,"Classpath = " + compilerConfig.getClasspath()); //$NON-NLS-1$
		
        // ----------------------------------------
		// Do the compilation

		
		doRefreshAfterBuild(project, dependingProjects, javaProject);
		
        // not needed now. This will be used to help create the relationship
		// map more efficiently
//        CoreOutputLocationManager outputLocManager = (CoreOutputLocationManager) 
//                compilerConfig.getOutputLocationManager();
//        Set/*File*/ touchedFiles = outputLocManager.getTouchedClassFiles();

	      // update the relationship map
		boolean inc = (kind == IncrementalProjectBuilder.INCREMENTAL_BUILD) || (kind == IncrementalProjectBuilder.AUTO_BUILD);
		AJModel.getInstance().createMap(project,true,inc);
		

		return requiredProjects;
	}

	// check to see if the .classpath has changed.
	// we know exactly where it is located, so no need for a visitor
    private boolean classpathChanged(IResourceDelta dta, IProject project) {
        IResourceDelta[] children = dta.getAffectedChildren();
        for (int i = 0; i < children.length; i++) {
            IResourceDelta child = children[i];
            if (child.getResource().getName().equals(".classpath")) {
                return true;
            }
        }
        return false;
    }

    private long getLastBuildTimeStamp(AjCompiler compiler) {
        AjState state = IncrementalStateManager.retrieveStateFor(compiler.getId());
        if (state != null) {
            return state.getLastBuildTime();
        } else {
            return 0;
        }
    }

    private String buildKindString(int kind) {
        switch(kind) {
            case IncrementalProjectBuilder.AUTO_BUILD:

        }
    }

    /**
     * returns a list of fully qualified names of entries on the classpath
     * that have been rebuilt since last build
     * @return
     */
    private List /*String*/ getChangedRequiredProjects(long lastBuildTimestamp) {
        try {
            // first find all the projects that have changed since last build
            IProject[] projectsOnClasspath = getRequiredProjects(getProject(), true);
            List /*IProject*/ changedProjects = new ArrayList();
            for (int i = 0; i < projectsOnClasspath.length; i++) {
                IProject project = projectsOnClasspath[i];
    
                // get timestamp of last build for this project
                long otherTimestamp = -1;
                if (AspectJPlugin.isAJProject(project)) {
                    AjCompiler compiler = AspectJPlugin.getDefault().getCompilerFactory().getCompilerForProject(project);
                    otherTimestamp = getLastBuildTimeStamp(compiler);
                } else if (project.hasNature(JavaCore.NATURE_ID)) {
                    Object s = JavaModelManager.getJavaModelManager().getLastBuiltState(project, null);
                    if (s != null && s instanceof State) {
                        State state = (State) s;
                        // need to use reflection to get at the last build time
                        otherTimestamp = getLastBuildTime(state);
                    }
                } else {
                    otherTimestamp = -1;
                }
                if (lastBuildTimestamp <= otherTimestamp) {
                    changedProjects.add(project);
                }
            }
            List /*String*/ changedEntries = new ArrayList();
            
            // now that we have all the projects, need to find out what they contribute to
            // this project's path.  could be itself, a jar, or a class folder
            if (changedProjects.size() > 0) {
                IClasspathEntry[] thisClasspath = JavaCore.create(getProject()).getResolvedClasspath(true);
                for (Iterator projIter = changedProjects.iterator(); projIter
                        .hasNext();) {
                    IProject changedProject = (IProject) projIter.next();
                    for (int i = 0; i < thisClasspath.length; i++) {
                        IClasspathEntry classpathEntry = thisClasspath[i];
                        switch (classpathEntry.getEntryKind()) {
                        case IClasspathEntry.CPE_PROJECT:
                            if (changedProject.getFullPath().equals(classpathEntry.getPath())) {
                                // resolve project and add all entries
                                changedEntries.addAll(listOfClassPathEntriesToListOfString(AspectJCorePreferences.resolveDependentProjectClasspath(
                                        changedProject, classpathEntry)));
                            }
                            break;
                        case IClasspathEntry.CPE_LIBRARY:
                            if (changedProject.getFullPath().isPrefixOf(classpathEntry.getPath())) {
                                // only add if this path exists
                                IWorkspaceRoot root = getProject().getWorkspace().getRoot();
                                IFile onPath = root.getFile(classpathEntry.getPath());
                                if (onPath.exists() || 
                                        root.getFolder(onPath.getFullPath()).exists()) {  // may be a folder
                                    changedEntries.add(onPath.getLocation().toPortableString());
                                }
                            }
                        }
                    }
                }
            }            
            // if all else went well, also add the inpath the the list of changed projects.
            // Adding the inpath always is just a conservative estimate of what has changed.
            // 
            // For Java projects, we only know the last structural build time.  Usually this is 
            // fine, but if the Java project is on the inpath, then we care about the last 
            // build of any kind, which we can't be sure of.  
            // (Actually, we need to know this for Aspect path projects, but aspectj can give us
            // precise time of the last build.
            // 
            // So, as a conservative estimate, put all inpath entries onto the list.
            Set inPathFiles = CoreCompilerConfiguration.getCompilerConfigurationForProject(getProject()).getInpath();
            if (inPathFiles != null) {
                for (Iterator fileIter = inPathFiles.iterator(); fileIter.hasNext();) {
                    File inpathFile = (File) fileIter.next();
                    changedEntries.add(inpathFile.getAbsolutePath());
                }
            }            
            return changedEntries;
        } catch (Exception e) {
            // something went wrong.
            // return null to imply everything's changed
            AspectJPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, AspectJPlugin.PLUGIN_ID, 
                    "Error determining list of entries on classpath that have changed.", e));
            return null;
        }
    }
    
    private List/*String*/ listOfClassPathEntriesToListOfString(
            List/*IClassPathEntry*/ entries) {
        IWorkspaceRoot root = getProject().getWorkspace().getRoot();
        List strings = new ArrayList(entries.size());
        for (Iterator iterator = entries.iterator(); iterator
                .hasNext();) {
            IClasspathEntry entry = (IClasspathEntry) iterator.next();
            IFile onPath = root.getFile(entry.getPath());
            // only add if exists
            if (onPath.exists() || 
                    root.getFolder(onPath.getFullPath()).exists()) {  // may be a class folder

                strings.add(onPath.getLocation().toPortableString());
            }
        }
        return strings;
    }

    private static Field state_lastStructuralBuildTime = null;
	private static long getLastBuildTime(State state) throws Exception {
	    if (state_lastStructuralBuildTime == null) {
	        state_lastStructuralBuildTime = State.class.getDeclaredField("lastStructuralBuildTime");
	        state_lastStructuralBuildTime.setAccessible(true);
	    }
        return state_lastStructuralBuildTime.getLong(state);
    }

    /**
	 * Refreshes the project's out folders after a build
	 * try to be as precise as possible because this can be a time consuming task 
	 * 

	/**
	 * Copies non-src resources to the output directory (bug 78579). The main
	 * part of this method was taken from 
	 * {@link org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.findSourceFiles(IResourceDelta)}
	 * 
	 * @param IJavaProject - the project which is being built
	 * @param IResourceDelta - the projects delta

			IPath srcPath = srcEntry.getPath().removeFirstSegments(1);			
			IContainer srcContainer = getContainerForGivenPath(srcPath,project.getProject());

			// handle case where project root is a source folder
			if (srcContainer.equals(project.getProject())) {				
				int segmentCount = delta.getFullPath().segmentCount();
				IResourceDelta[] children = delta.getAffectedChildren();
				for (int j = 0, m = children.length; j < m; j++) {
					if (!isExcludedFromProject(project,children[j].getFullPath(),srcEntries)) {
						copyResources(project, children[j], srcEntry, segmentCount);
					}
				}
			} else {
				IPath projectRelativePath = srcEntry.getPath().removeFirstSegments(1);
				projectRelativePath.makeRelative();

					int segmentCount = sourceDelta.getFullPath().segmentCount();
					IResourceDelta[] children = sourceDelta.getAffectedChildren();
					try {
						for (int j = 0, m = children.length; j < m; j++) {
							copyResources(project, children[j], srcEntry, segmentCount);
						}
					} catch (ResourceException e) {
						// catch the case that a package has been renamed and collides on disk with an as-yet-to-be-deleted package
						if (e.getStatus().getCode() == IResourceStatus.CASE_VARIANT_EXISTS) {
							return false;

						// fall thru & collect all the resource files
					case IResourceDelta.CHANGED :
						IResourceDelta[] children = sourceDelta.getAffectedChildren();
						for (int i = 0, l = children.length; i < l; i++) {
							copyResources(javaProject, children[i],srcEntry, segmentCount);
						}
						return;
					case IResourceDelta.REMOVED :
						IPath removedPackagePath = resource.getFullPath().removeFirstSegments(segmentCount);

									// only a package fragment was removed, same as removing multiple source files
									createFolder(removedPackagePath, outputFolder); // ensure package exists in the output folder
									IResourceDelta[] removedChildren = sourceDelta.getAffectedChildren();
									for (int j = 0, m = removedChildren.length; j < m; j++) {
										copyResources(javaProject,removedChildren[j], srcEntry, segmentCount);
									}
									return;
								}
							}
						}
						IFolder removedPackageFolder = outputFolder.getFolder(removedPackagePath);
						if (removedPackageFolder.exists()) {
							removedPackageFolder.delete(IResource.FORCE, null);
						}
				}
				return;
			case IResource.FILE :

			        				|| resourcePath.getFileExtension().equals("java"))) { //$NON-NLS-1$
						return;
					}
			        
			        IResource outputFile = outputFolder.getFile(resourcePath);
					switch (sourceDelta.getKind()) {
						case IResourceDelta.ADDED :

							outputFile.setDerived(true);
							Util.setReadOnly(outputFile, false); // just in case the original was read only
							outputFile.refreshLocal(IResource.DEPTH_ZERO,null);
		                    // mark this change so compiler knows about it.
		                    CoreCompilerConfiguration.getCompilerConfigurationForProject(getProject())
		                            .configurationChanged(
		                                    CompilerConfigurationChangeFlags.PROJECTSOURCERESOURCES_CHANGED);
							return;
						case IResourceDelta.REMOVED :
							if (outputFile.exists()) {
								AJLog.log(AJLog.BUILDER,"Deleting removed file " + resourcePath);//$NON-NLS-1$
								outputFile.delete(IResource.FORCE, null);
							}
		                    // mark this change so compiler knows about it.
		                    CoreCompilerConfiguration.getCompilerConfigurationForProject(getProject())
		                            .configurationChanged(
		                                    CompilerConfigurationChangeFlags.PROJECTSOURCERESOURCES_CHANGED);
							return;
						case IResourceDelta.CHANGED :
							if ((sourceDelta.getFlags() & IResourceDelta.CONTENT) == 0
									&& (sourceDelta.getFlags() & IResourceDelta.ENCODING) == 0) {
								return; // skip it since it really isn't changed
							}
							if (outputFile.exists()) {
								AJLog.log(AJLog.BUILDER,"Deleting existing file " + resourcePath);//$NON-NLS-1$
								outputFile.delete(IResource.FORCE, null);

	    // clean the output folders and do a refresh if not
	    // automatically building (so that output dir reflects the
	    // changes)
		cleanOutputFolders(JavaCore.create(project),
		        !AspectJPlugin.getWorkspace().getDescription().isAutoBuilding());
        } else {
            cleanOutputFolders(JavaCore.create(project),true);
        }
	}
	
	private void removeProblemsAndTasksFor(IResource resource) {

			}
		} catch (CoreException e) {
		}
		if (resource != null) {
		    AJLog.log(AJLog.BUILDER,"Removed problems and tasks for project "+resource.getName()); //$NON-NLS-1$
		}
	}
	
	
	/**
	 * Determine if any source files have changed and if so	record it in the compiler configuration for the
	 * project
	 * @param delta
	 * @param project
	 * @return true if a source file has changed.  False otherwise
	 */
	public boolean sourceFilesChanged(IResourceDelta delta, IProject project) {
	    AJLog.logStart("SourceFilesChanged");
		if (delta != null && delta.getAffectedChildren().length != 0) {
		    
		    // XXX might be better if this were a Set.
		    // look into this
			List /*IFile*/ includedFileNames = BuildConfig.getIncludedSourceFiles(project);
//	          Set /*IFile*/ includedFileNames = BuildConfig.getIncludedSourceFilesSet(project);

			IJavaProject ijp = JavaCore.create(project);		
			if (ijp == null) {
				return true;
			}			
			try {
			    SourceFilesChangedVisitor visitor = new SourceFilesChangedVisitor(project, includedFileNames);
			    delta.accept(visitor);
				if (visitor.hasChanges()) {
					AJLog.log(AJLog.BUILDER,"build: Examined delta - " + visitor.getNumberChanged() + //$NON-NLS-1$ 
					        " changed, " + visitor.getNumberAdded() + " added, and " + //$NON-NLS-1$ //$NON-NLS-2$
					        visitor.getNumberRemoved() + " deleted source files in " //$NON-NLS-1$
							+ "required project " + project.getName() ); //$NON-NLS-1$
					return true;
				} else {
					return false;
				}
			} catch (CoreException e) {
			    AspectJPlugin.getDefault().getLog().log(
			            new Status(IStatus.ERROR, 
			                    AspectJPlugin.PLUGIN_ID, "Error finding source file changes", e));
			}
		}
        AJLog.logEnd(AJLog.BUILDER,"SourceFilesChanged");
		return true;
	}
	
	private class SourceFilesChangedVisitor implements IResourceDeltaVisitor {
	    private final List includedFileNames;
	    private final CoreCompilerConfiguration compilerConfiguration;
	    private final IProject affectedProject;
	    private int numberChanged;
	    private int numberAdded;
	    private int numberRemoved;
	    
	    private SourceFilesChangedVisitor(IProject affectedProject,
                List includedFileNames) {
            this.includedFileNames = includedFileNames;
            this.affectedProject = affectedProject;
            compilerConfiguration = CoreCompilerConfiguration.getCompilerConfigurationForProject(affectedProject);
            numberChanged = 0;
            numberAdded = 0;
            numberRemoved = 0;
        }

	    /**
	     * Look for changed resources that we care about.
	     */
        public boolean visit(IResourceDelta delta) throws CoreException {
            String resname = delta.getFullPath().toString();

            if (delta.getResource().getType() == IResource.FILE) {
                if (CoreUtils.ASPECTJ_SOURCE_FILTER.accept(resname)) {
                        
                    switch (delta.getKind()) {
                    case IResourceDelta.REMOVED:
                    case IResourceDelta.REMOVED_PHANTOM:
                        // don't check to see if these files are on the list of included 
                        // files because they have already been removed and we won't find
                        // them on the list.
                        // be conservative and set the flag regardless.
                        compilerConfiguration.configurationChanged(
                                CompilerConfigurationChangeFlags.PROJECTSOURCEFILES_CHANGED);
                        numberRemoved++;
                        break;

                    case IResourceDelta.ADDED:
                    case IResourceDelta.ADDED_PHANTOM:
                        if (includedFileNames.contains(delta.getResource())) {
                            compilerConfiguration.configurationChanged(
                                    CompilerConfigurationChangeFlags.PROJECTSOURCEFILES_CHANGED);
                            numberAdded++;
                            break;
                        }
                    case IResourceDelta.CHANGED:
                        if (includedFileNames.contains(delta.getResource())) {
                            compilerConfiguration.addModifiedFile(new File(delta.getResource()
                                    .getLocation().toPortableString()));
                            numberChanged++;
                        }
                    }
                } else if (resname.endsWith(".classpath")) { //$NON-NLS-1$
                    // also need to ensure that this is a project classpath
                    IContainer parent = delta.getResource().getParent();
                    if (parent.getFullPath().equals(affectedProject.getFullPath())) {
                        // we don't know what has changed exactly.  
                        // be conservative
                        compilerConfiguration.configurationChanged(
                                CompilerConfigurationChangeFlags.CLASSPATH_CHANGED |
                                CompilerConfigurationChangeFlags.ASPECTPATH_CHANGED |
                                CompilerConfigurationChangeFlags.INPATH_CHANGED);
                    }
                }
                return false;
            } else {
                
                // want to fully traverse this delta if not 
                // a leaf node
                return true;
            }
        }
        public int getNumberChanged() {
            return numberChanged;
        }
        public int getNumberAdded() {
            return numberAdded;
        }
        public int getNumberRemoved() {
            return numberRemoved;
        }
        
        public boolean hasChanges() {
            return numberAdded + numberChanged + numberRemoved > 0;
        }
	}
	
	public static void addStateListener() {

				public void pathChangeDetected() {
				}

				public void buildSuccessful(boolean wasFull) {
					AJLog.log(AJLog.COMPILER,"AspectJ reports build successful, build was: " + //$NON-NLS-1$ 
					        (wasFull ? "FULL" : "INCREMENTAL")); //$NON-NLS-1$ //$NON-NLS-2$ 
				}

				public void detectedAspectDeleted(File f) {




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *	   Matthew Ford - Bug 154339
 *     Helen Hawkins - updated for new ajde interface (bug 148190)
 *******************************************************************************/
package org.eclipse.ajdt.internal.core;

import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;

/**
 * Removes stored compiler info for projects when they are deleted or closed.
 *
 */
public class CompilerConfigResourceDeltaVisitor implements IResourceDeltaVisitor {

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public CompilerConfigResourceDeltaVisitor() {
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
	 */
	public boolean visit(IResourceDelta delta) {
		IResource myRes = delta.getResource();
		if (myRes.getType() == IResource.PROJECT) {
			switch (delta.getKind()) {
			case IResourceDelta.REMOVED:
				// remove the compiler associated with this project from the factory
				AspectJPlugin.getDefault().getCompilerFactory()
						.removeCompilerForProject(myRes.getProject());
				break;
			case IResourceDelta.CHANGED:
				if (!myRes.getProject().isOpen()) {
					// remove the compiler associated with this project from the 
					// factory - project could remain closed indefinitely, therefore, 
					// don't want to hang on to the compiler instance
					AspectJPlugin.getDefault().getCompilerFactory()
							.removeCompilerForProject(myRes.getProject());
				}
				break;
			}
		}
		return true;
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *******************************************************************************/
package org.eclipse.ajdt.internal.core;

import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.CoreException;

/**
 * This listener will add or remove compilers for projects when they are removed or closed
 *
 */
public class CompilerConfigResourceChangeListener implements IResourceChangeListener {

	private CompilerConfigResourceDeltaVisitor myDeltaVisitor;

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public CompilerConfigResourceChangeListener() {
		myDeltaVisitor = new CompilerConfigResourceDeltaVisitor();
	}

	public void resourceChanged(IResourceChangeEvent event) {
		if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
			IResourceDelta delta = event.getDelta();
			// avoid processing deltas for non-AspectJ projects,
			if (delta != null) {
				IResourceDelta[] cd = delta.getAffectedChildren();
				if (cd == null) {
					try {
						delta.accept(myDeltaVisitor);
					} catch (CoreException e) {
					}
				} else {
					for (int i = 0; i < cd.length; i++) {
						try {
							IResource res = cd[i].getResource();
							if (res == null) {
								cd[i].accept(myDeltaVisitor);
							} else {
								IProject proj = res.getProject();
								// if we don't know the project, or it is
								// no longer accessible, we'd better process
								// the delta. Otherwise we only process it
								// if it is an AspectJ project.
								if ((proj == null) || !proj.isAccessible()
										|| AspectJPlugin.isAJProject(proj)) {
									cd[i].accept(myDeltaVisitor);
								}
							}
						} catch (CoreException e) {
						}
					}
				}
			}
		}
	}
}

Lines 121-126 Link Here

(-)src/org/eclipse/ajdt/internal/ui/preferences/AJCompilerPreferencePage.java (+12 lines)
121	AspectJCorePreferences.OPTION_AutobuildSuppressed,	121	AspectJCorePreferences.OPTION_AutobuildSuppressed,
122	AspectJPreferences.VALUE_FALSE);	122	AspectJPreferences.VALUE_FALSE);
123	defaultValueMap.put(	123	defaultValueMap.put(
		124	AspectJCorePreferences.OPTION_IncrementalCompilationOptimizations,
		125	AspectJPreferences.VALUE_FALSE);
		126	defaultValueMap.put(
124	AspectJPreferences.OPTION_ReportInvalidAbsoluteTypeName,	127	AspectJPreferences.OPTION_ReportInvalidAbsoluteTypeName,
125	AspectJPreferences.VALUE_WARNING);	128	AspectJPreferences.VALUE_WARNING);
126	defaultValueMap.put(	129	defaultValueMap.put(
Lines 426-431 Link Here
426	excomposite.setClient(othersComposite);	429	excomposite.setClient(othersComposite);
427	othersComposite.setLayout(new GridLayout(nColumns, false));	430	othersComposite.setLayout(new GridLayout(nColumns, false));
428		431
		432	// suppress autobuild
429	label = UIMessages.CompilerConfigurationBlock_aj_suppressAutoBuild;	433	label = UIMessages.CompilerConfigurationBlock_aj_suppressAutoBuild;
430	Button b = addCheckBox(othersComposite, label, AspectJCorePreferences.OPTION_AutobuildSuppressed, enableDisableValues, 0, false);	434	Button b = addCheckBox(othersComposite, label, AspectJCorePreferences.OPTION_AutobuildSuppressed, enableDisableValues, 0, false);
431	useAspectJCorePreferences(b);	435	useAspectJCorePreferences(b);
Lines 433-438 Link Here
433	// ignoring the original value.	437	// ignoring the original value.
434	b.setSelection(getAspectJCorePLuginPreferences().getBoolean(AspectJCorePreferences.OPTION_AutobuildSuppressed));	438	b.setSelection(getAspectJCorePLuginPreferences().getBoolean(AspectJCorePreferences.OPTION_AutobuildSuppressed));
435		439
		440	// incremental compiler optimizations
		441	label = UIMessages.CompilerConfigurationBlock_aj_incrementalCompilerOptimizations;
		442	b = addCheckBox(othersComposite, label, AspectJCorePreferences.OPTION_IncrementalCompilationOptimizations, enableDisableValues, 0, false);
		443	useAspectJCorePreferences(b);
		444	// a little kludgy, but here we re-set the selection to be what is stored in AJ core preferences.
		445	// ignoring the original value.
		446	b.setSelection(getAspectJCorePLuginPreferences().getBoolean(AspectJCorePreferences.OPTION_IncrementalCompilationOptimizations));
		447
436	}	448	}
437		449
438	label = UIMessages.CompilerConfigurationBlock_aj_messages_matching;	450	label = UIMessages.CompilerConfigurationBlock_aj_messages_matching;

Lines 416-421 Link Here

(-)src/org/eclipse/ajdt/internal/ui/text/UIMessages.java (+1 lines)
416		416
417	public static String CompilerConfigurationBlock_aj_builder_settings;	417	public static String CompilerConfigurationBlock_aj_builder_settings;
418	public static String CompilerConfigurationBlock_aj_suppressAutoBuild;	418	public static String CompilerConfigurationBlock_aj_suppressAutoBuild;
		419	public static String CompilerConfigurationBlock_aj_incrementalCompilerOptimizations;
419		420
420	static {	421	static {
421	NLS.initializeMessages(BUNDLE_NAME, UIMessages.class);	422	NLS.initializeMessages(BUNDLE_NAME, UIMessages.class);

Lines 564-569 Link Here

(-)src/org/eclipse/ajdt/internal/ui/text/UIMessages.properties (+1 lines)
564	CompilerConfigurationBlock_aj_suppressAutoBuild=Suppress autobuild - Suppress automatic building of AspectJ projects \n\	564	CompilerConfigurationBlock_aj_suppressAutoBuild=Suppress autobuild - Suppress automatic building of AspectJ projects \n\
565	(select this option if incremental building of\n\	565	(select this option if incremental building of\n\
566	AspectJ projects is taking too long)	566	AspectJ projects is taking too long)
		567	CompilerConfigurationBlock_aj_incrementalCompilerOptimizations=Incremental Compiler Optimizations - Enable/disable experimental incremental compiler optimizations
567		568
568	BuildPathsBlock_ChooseOutputFolderDialog_title=	569	BuildPathsBlock_ChooseOutputFolderDialog_title=
569	BuildPathsBlock_ChooseOutputFolderDialog_description=	570	BuildPathsBlock_ChooseOutputFolderDialog_description=

Lines 14-19 Link Here

(-)src/org/eclipse/ajdt/internal/ui/ajde/UIComplierConfiguration.java (+5 lines)
14	import org.eclipse.ajdt.internal.ui.preferences.AspectJPreferences;	14	import org.eclipse.ajdt.internal.ui.preferences.AspectJPreferences;
15	import org.eclipse.core.resources.IProject;	15	import org.eclipse.core.resources.IProject;
16		16
		17	/**
		18	* A complete implementation of ICompilerConfiguration. If the ajdt.ui
		19	* plugin is not present in the platform, then CoreCompilerConfiguration
		20	* is used instead.
		21	*/
17	public class UIComplierConfiguration extends CoreCompilerConfiguration {	22	public class UIComplierConfiguration extends CoreCompilerConfiguration {
18		23
19	public UIComplierConfiguration(IProject project) {	24	public UIComplierConfiguration(IProject project) {

Lines 14-22 Link Here

(-)src/org/eclipse/ajdt/internal/ui/ajde/UICompilerFactory.java (-3 / +15 lines)
14	import java.util.Map;	14	import java.util.Map;
15		15
16	import org.aspectj.ajde.core.AjCompiler;	16	import org.aspectj.ajde.core.AjCompiler;
		17	import org.eclipse.ajdt.internal.core.ajde.CoreCompilerFactory;
17	import org.eclipse.ajdt.internal.core.ajde.ICompilerFactory;	18	import org.eclipse.ajdt.internal.core.ajde.ICompilerFactory;
18	import org.eclipse.core.resources.IProject;	19	import org.eclipse.core.resources.IProject;
19		20
		21	/**
		22	* ICompilerFactory implementation which returns AjCompilers with
		23	* core implementations of the required interfaces.
		24	*
		25	* If ajdt.ui plugin is not present, then CoreCompilerFactory is used instead
		26	*
		27	* @see CoreCompilerFactory
		28	*/
20	public class UICompilerFactory implements ICompilerFactory {	29	public class UICompilerFactory implements ICompilerFactory {
21		30
22	private Map compilerMap = new HashMap();	31	private Map compilerMap = new HashMap();
Lines 37-45 Link Here
37		46
38	public void removeCompilerForProject(IProject project) {	47	public void removeCompilerForProject(IProject project) {
39	// firstly clean up any state associated with the compiler	48	// firstly clean up any state associated with the compiler
40	getCompilerForProject(project).clearLastState();	49	AjCompiler compiler = (AjCompiler) compilerMap.get(project);
41	// remove compiler from the map	50	if (compiler != null) {
42	compilerMap.remove(project);	51	compiler.clearLastState();
		52	// remove compiler from the map
		53	compilerMap.remove(project);
		54	}
43	}	55	}
44		56
45	public boolean hasCompilerForProject(IProject project) {	57	public boolean hasCompilerForProject(IProject project) {




/*******************************************************************************
 * Copyright (c) 2000, 2004 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *******************************************************************************/
package org.eclipse.ajdt.internal.javamodel;
import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.CoreException;
/**
 * @author Luzius Meisser
 * 
 */
public class ResourceChangeListener implements IResourceChangeListener {
	private ResourceDeltaVisitor myDeltaVisitor;
	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public ResourceChangeListener() {
		myDeltaVisitor = new ResourceDeltaVisitor();
	}
	
	public void resourceChanged(IResourceChangeEvent event) {
		if (event.getType() == IResourceChangeEvent.POST_CHANGE){
			IResourceDelta delta = event.getDelta();
			// avoid processing deltas for non-AspectJ projects,
			if (delta != null) {
				IResourceDelta[] cd = delta.getAffectedChildren();
				if (cd == null) {
					try {
						delta.accept(myDeltaVisitor);
					} catch (CoreException e) {
					}
				} else {
					for (int i = 0; i < cd.length; i++) {
						try {
							IResource res = cd[i].getResource();
							if (res == null) {
								cd[i].accept(myDeltaVisitor);
							} else {
								IProject proj = res.getProject();
								// if we don't know the project, or it is
								// no longer accessible, we'd better process
								// the delta. Otherwise we only process it
								// if it is an AspectJ project.
								if ((proj == null) || !proj.isAccessible()
										|| AspectJPlugin.isAJProject(proj)) {
									cd[i].accept(myDeltaVisitor);
								}
							}
						} catch (CoreException e) {
						}
					}
				}
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *******************************************************************************/
package org.eclipse.ajdt.internal.javamodel;

import org.eclipse.ajdt.core.javaelements.AJCompilationUnitManager;
import org.eclipse.ajdt.internal.utils.AJDTUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;

/**
 * Notifies the AJCompilationUnitManager if files got added or removed.
 * 
 */
public class ResourceDeltaVisitor implements IResourceDeltaVisitor {

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public ResourceDeltaVisitor() {
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
	 */
	public boolean visit(IResourceDelta delta) {
		IResource myRes = delta.getResource();
		if (myRes.getType() == IResource.FILE) {
			switch (delta.getKind()) {
			case IResourceDelta.REMOVED:
				AJCompilationUnitUtils
						.removeFileFromModelAndCloseEditors((IFile) myRes);
				AJDTUtils.refreshPackageExplorer();
				break;
			case IResourceDelta.ADDED:
				AJCompilationUnitManager.INSTANCE
						.getAJCompilationUnit((IFile) myRes);
				AJDTUtils.refreshPackageExplorer();
				break;
			}
		}
		return true;
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2006 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *******************************************************************************/
package org.eclipse.ajdt.internal.javamodel;

import org.eclipse.ajdt.core.javaelements.AJCompilationUnitManager;
import org.eclipse.ajdt.internal.utils.AJDTUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;

/**
 * Notifies the AJCompilationUnitManager if files got added or removed.
 * 
 */
public class AJCompilationUnitResourceDeltaVisitor implements IResourceDeltaVisitor {

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public AJCompilationUnitResourceDeltaVisitor() {
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
	 */
	public boolean visit(IResourceDelta delta) {
		IResource myRes = delta.getResource();
		if (myRes.getType() == IResource.FILE) {
			switch (delta.getKind()) {
			case IResourceDelta.REMOVED:
				AJCompilationUnitUtils
						.removeFileFromModelAndCloseEditors((IFile) myRes);
				AJDTUtils.refreshPackageExplorer();
				break;
			case IResourceDelta.ADDED:
				AJCompilationUnitManager.INSTANCE
						.getAJCompilationUnit((IFile) myRes);
				AJDTUtils.refreshPackageExplorer();
				break;
			}
		}
		return true;
	}
}




/*******************************************************************************
 * Copyright (c) 2000, 2004 IBM Corporation and others.
 * 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:
 *     Luzius Meisser - initial implementation
 *******************************************************************************/
package org.eclipse.ajdt.internal.javamodel;
import org.eclipse.ajdt.core.AspectJPlugin;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.runtime.CoreException;
/**
 * @author Luzius Meisser
 * 
 */
public class AJCompilationUnitResourceChangeListener implements IResourceChangeListener {
	private AJCompilationUnitResourceDeltaVisitor myDeltaVisitor;
	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
	 */
	public AJCompilationUnitResourceChangeListener() {
		myDeltaVisitor = new AJCompilationUnitResourceDeltaVisitor();
	}
	
	public void resourceChanged(IResourceChangeEvent event) {
		if (event.getType() == IResourceChangeEvent.POST_CHANGE){
			IResourceDelta delta = event.getDelta();
			// avoid processing deltas for non-AspectJ projects,
			if (delta != null) {
				IResourceDelta[] cd = delta.getAffectedChildren();
				if (cd == null) {
					try {
						delta.accept(myDeltaVisitor);
					} catch (CoreException e) {
					}
				} else {
					for (int i = 0; i < cd.length; i++) {
						try {
							IResource res = cd[i].getResource();
							if (res == null) {
								cd[i].accept(myDeltaVisitor);
							} else {
								IProject proj = res.getProject();
								// if we don't know the project, or it is
								// no longer accessible, we'd better process
								// the delta. Otherwise we only process it
								// if it is an AspectJ project.
								if ((proj == null) || !proj.isAccessible()
										|| AspectJPlugin.isAJProject(proj)) {
									cd[i].accept(myDeltaVisitor);
								}
							}
						} catch (CoreException e) {
						}
					}
				}
			}
		}
	}
}

Return to bug 245566

Lines 28-33 Link Here

(-)src/org/eclipse/ajdt/ui/tests/UITestCase.java (+13 lines)
28	import org.eclipse.core.resources.IFile;	28	import org.eclipse.core.resources.IFile;
29	import org.eclipse.core.resources.IMarker;	29	import org.eclipse.core.resources.IMarker;
30	import org.eclipse.core.resources.IProject;	30	import org.eclipse.core.resources.IProject;
		31	import org.eclipse.core.resources.IWorkspace;
31	import org.eclipse.core.resources.IWorkspaceRoot;	32	import org.eclipse.core.resources.IWorkspaceRoot;
32	import org.eclipse.core.resources.ResourcesPlugin;	33	import org.eclipse.core.resources.ResourcesPlugin;
33	import org.eclipse.core.runtime.CoreException;	34	import org.eclipse.core.runtime.CoreException;
Lines 251-256 Link Here
251	}	252	}
252	}	253	}
253		254
		255	/**
		256	* Returns the IWorkspace this test suite is running on.
		257	*/
		258	public IWorkspace getWorkspace() {
		259	return ResourcesPlugin.getWorkspace();
		260	}
		261
		262	public IWorkspaceRoot getWorkspaceRoot() {
		263	return getWorkspace().getRoot();
		264	}
		265
		266
254	protected void waitForJobsToComplete(){	267	protected void waitForJobsToComplete(){
255	SynchronizationUtils.joinBackgroudActivities();	268	SynchronizationUtils.joinBackgroudActivities();
256	}	269	}

Added Link Here

(-)src/org/eclipse/ajdt/ui/tests/builder/BuildPathNavigationTests.java (+128 lines)
1	package org.eclipse.ajdt.ui.tests.builder;
2
3	import org.eclipse.jdt.core.IJavaProject;
4	import org.eclipse.ajdt.core.AspectJCorePreferences;
5	import org.eclipse.ajdt.ui.AspectJUIPlugin;
6	import org.eclipse.ajdt.ui.tests.UITestCase;
7	import org.eclipse.core.resources.IFile;
8	import org.eclipse.core.resources.IMarker;
9	import org.eclipse.core.resources.IProject;
10	import org.eclipse.core.resources.IncrementalProjectBuilder;
11	import org.eclipse.core.runtime.CoreException;
12	import org.eclipse.core.runtime.IPath;
13	import org.eclipse.core.runtime.Path;
14	import org.eclipse.jdt.core.IClasspathAttribute;
15	import org.eclipse.jdt.core.IClasspathContainer;
16	import org.eclipse.jdt.core.IClasspathEntry;
17	import org.eclipse.jdt.core.JavaCore;
18
19	public class BuildPathNavigationTests extends UITestCase {
20	IClasspathContainer container;
21	protected void setUp() throws Exception {
22	super.setUp();
23	final IProject containerProj = createPredefinedProject("PathTesting-ContainerOnAspectPath"); //$NON-NLS-1$
24	createPredefinedProject("PathTesting-JarOnAspectPath"); //$NON-NLS-1$
25	createPredefinedProject("PathTesting-ProjectOnAspectPath"); //$NON-NLS-1$
26	IProject varProj = createPredefinedProject("PathTesting-VariableOnAspectPath"); //$NON-NLS-1$
27	JavaCore.setClasspathVariable("Aspect_Path_Var", varProj.getFullPath(), null); //$NON-NLS-1$
28	IClasspathAttribute[] attribute = new IClasspathAttribute[] {AspectJCorePreferences.ASPECTPATH_ATTRIBUTE };
29	final IClasspathEntry entry =
30	JavaCore.newProjectEntry(
31	containerProj.getFullPath(),
32	null, false,
33	attribute,
34	false);
35
36	container = new IClasspathContainer() {
37	public IClasspathEntry[] getClasspathEntries() {
38	return new IClasspathEntry[] { entry };
39	}
40	public String getDescription() {
41	return "org.eclipse.jdt.USER_LIBRARY/Aspect_Path_Lib"; //$NON-NLS-1$
42	}
43	public int getKind() {
44	return IClasspathContainer.K_APPLICATION;
45	}
46	public IPath getPath() {
47	return new Path("org.eclipse.jdt.USER_LIBRARY/Aspect_Path_Lib"); //$NON-NLS-1$
48	}
49	};
50	}
51
52
53	/**
54	* Test to see that the extra location attributes are associated with advice markers for inpaths
55	*
56	* This attribute has the format FFFF:::NNNN:::NNNN:::NNNN
57	* - The FFFF is the file which contains the source of the advice or ITD in affect
58	* - The other three NNNN fields are integers indicating (in order) the
59	* start line number of the advice in that file, the end line number of the
60	* advice in that file and the column number for the advice.
61	*/
62	public void testInpathMarkers() throws Exception {
63	try {
64	IProject inpathProj = createPredefinedProject("PathTesting-HasInpath"); //$NON-NLS-1$
65	JavaCore.setClasspathContainer(container.getPath(), new IJavaProject[] { JavaCore.create(inpathProj) },
66	new IClasspathContainer[] { container }, null);
67
68	getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
69	waitForJobsToComplete();
70	IFile aspectFile = inpathProj.getFile("src/aspects/AdviseClassOnInpath.aj"); //$NON-NLS-1$
71
72	IMarker[] markers = aspectFile.findMarkers(IMarker.MARKER, true, 2);
73
74	// should have one marker for each advice (ie- 5)
75	assertEquals("Invalid number of markers on file " + aspectFile, 5, markers.length); //$NON-NLS-1$
76
77	// each marker should have extra information attached to it
78	for (int i = 0; i < markers.length; i++) {
79	IMarker marker = markers[i];
80	String loc = (String) marker.getAttribute(AspectJUIPlugin.RELATED_LOCATIONS_ATTRIBUTE_PREFIX + 0);
81	assertNotNull("No location attached to marker number " + i, loc); //$NON-NLS-1$
82
83	String[] s = loc.split(":::"); //$NON-NLS-1$
84	assertEquals("Invalid extra location attribute format\n " + loc, 4, s.length); //$NON-NLS-1$
85	}
86	} catch (CoreException e) {
87	fail();
88	}
89	}
90
91	/**
92	* Test to see that the extra location attributes are associated with advice markers for aspect paths
93	*
94	* This attribute has the format FFFF:::NNNN:::NNNN:::NNNN
95	* - The FFFF is the file which contains the source of the advice or ITD in affect
96	* - The other three NNNN fields are integers indicating (in order) the
97	* start line number of the advice in that file, the end line number of the
98	* advice in that file and the column number for the advice.
99	*/
100	public void testAspectPathMarkers() {
101	try {
102	IProject aspectPathProj = createPredefinedProject("PathTesting-HasAspectPath"); //$NON-NLS-1$
103	JavaCore.setClasspathContainer(container.getPath(), new IJavaProject[] { JavaCore.create(aspectPathProj) },
104	new IClasspathContainer[] { container }, null);
105
106	getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
107	waitForJobsToComplete();
108	IFile aspectFile = aspectPathProj.getFile("src/main/Main.java"); //$NON-NLS-1$
109
110	IMarker[] markers = aspectFile.findMarkers(IMarker.MARKER, true, 2);
111
112	System.out.println(getAllProblemViewMarkers()[0].getAttribute(IMarker.MESSAGE));
113	// should have one marker for each advised method (ie- 4)
114	assertEquals("Invalid number of markers on file " + aspectFile, 4, markers.length); //$NON-NLS-1$
115	// each marker should have extra information attached to it
116	for (int i = 0; i < markers.length; i++) {
117	IMarker marker = markers[i];
118	String loc = (String) marker.getAttribute(AspectJUIPlugin.RELATED_LOCATIONS_ATTRIBUTE_PREFIX + 0);
119	assertNotNull("No location attached to marker number " + i, loc); //$NON-NLS-1$
120
121	String[] s = loc.split(":::"); //$NON-NLS-1$
122	assertEquals("Invalid extra location attribute format\n " + loc, 4, s.length); //$NON-NLS-1$
123	}
124	} catch (CoreException e) {
125	fail();
126	}
127	}
128	}

Lines 400-406 Link Here

(-)src/org/eclipse/ajdt/core/tests/builder/AJBuilderTest.java (-3 / +3 lines)
400	assertTrue(	400	assertTrue(
401	"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$	401	"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$
402	listContainsString(buildLog, "build: Examined delta - no " + //$NON-NLS-1$	402	listContainsString(buildLog, "build: Examined delta - no " + //$NON-NLS-1$
403	"source file changes for project bug99133b")); //$NON-NLS-1$	403	"source file or classpath changes for project bug99133b")); //$NON-NLS-1$
404	assertFalse("There should be no errors in the build log", //$NON-NLS-1$	404	assertFalse("There should be no errors in the build log", //$NON-NLS-1$
405	listContainsString(buildLog, "error")); //$NON-NLS-1$	405	listContainsString(buildLog, "error")); //$NON-NLS-1$
406		406
Lines 471-477 Link Here
471	assertTrue(	471	assertTrue(
472	"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$	472	"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$
473	listContainsString(buildLog, "build: Examined delta - no " + //$NON-NLS-1$	473	listContainsString(buildLog, "build: Examined delta - no " + //$NON-NLS-1$
474	"source file changes for project bug99133b")); //$NON-NLS-1$	474	"source file or classpath changes for project bug99133b")); //$NON-NLS-1$
475	assertFalse("There should be no errors in the build log", //$NON-NLS-1$	475	assertFalse("There should be no errors in the build log", //$NON-NLS-1$
476	listContainsString(buildLog, "error")); //$NON-NLS-1$	476	listContainsString(buildLog, "error")); //$NON-NLS-1$
477		477
Lines 550-556 Link Here
550	assertTrue(	550	assertTrue(
551	"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$	551	"AJDT should have found no source file changes and decided not to build", //$NON-NLS-1$
552	listContainsString(buildLogB, "build: Examined delta - no " + //$NON-NLS-1$	552	listContainsString(buildLogB, "build: Examined delta - no " + //$NON-NLS-1$
553	"source file changes for project bug99133b")); //$NON-NLS-1$	553	"source file or classpath changes for project bug99133b")); //$NON-NLS-1$
554		554
555	// by checking that we don't have the following messages in the	555	// by checking that we don't have the following messages in the
556	// log (and the previous checking for no errors) we know that	556	// log (and the previous checking for no errors) we know that

Added Link Here

(-)workspace/AspectProj2-On (+18 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>AspectProj2-On AspectPath</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.ajdt.core.ajbuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	</buildSpec>
14	<natures>
15	<nature>org.eclipse.ajdt.ui.ajnature</nature>
16	<nature>org.eclipse.jdt.core.javanature</nature>
17	</natures>
18	</projectDescription>

Added Link Here

(-)workspace/AspectProj1/.project (+18 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>AspectProj1</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.ajdt.core.ajbuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	</buildSpec>
14	<natures>
15	<nature>org.eclipse.ajdt.ui.ajnature</nature>
16	<nature>org.eclipse.jdt.core.javanature</nature>
17	</natures>
18	</projectDescription>

Added Link Here

(-)workspace/AspectProjWeCareAbout/.project (+18 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>AspectProjWeCareAbout</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.ajdt.core.ajbuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	</buildSpec>
14	<natures>
15	<nature>org.eclipse.ajdt.ui.ajnature</nature>
16	<nature>org.eclipse.jdt.core.javanature</nature>
17	</natures>
18	</projectDescription>

Added Link Here

(-)workspace/AspectProjWeCareAbout/.classpath (+21 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
6	<classpathentry kind="src" path="/JavaProj2-On Inpath">
7	<attributes>
8	<attribute name="org.eclipse.ajdt.inpath" value="org.eclipse.ajdt.aspectpath"/>
9	</attributes>
10	</classpathentry>
11	<classpathentry kind="src" path="/AspectProj2-On AspectPath">
12	<attributes>
13	<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
14	</attributes>
15	</classpathentry>
16	<classpathentry combineaccessrules="false" kind="src" path="/AspectProj1"/>
17	<classpathentry combineaccessrules="false" kind="src" path="/JavaProj1"/>
18	<classpathentry kind="lib" path="/JavaProj3-ClassFolder/bin"/>
19	<classpathentry kind="lib" path="/AspectProj3-Has Outjar/output.jar"/>
20	<classpathentry kind="output" path="bin"/>
21	</classpath>

Added Link Here

(-)workspace/JavaProj2-On (+17 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>JavaProj2-On Inpath</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.jdt.core.javabuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	</buildSpec>
14	<natures>
15	<nature>org.eclipse.jdt.core.javanature</nature>
16	</natures>
17	</projectDescription>

Added Link Here

(-)workspace/AspectProj3-Has (+18 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>AspectProj3-Has Outjar</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.ajdt.core.ajbuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	</buildSpec>
14	<natures>
15	<nature>org.eclipse.ajdt.ui.ajnature</nature>
16	<nature>org.eclipse.jdt.core.javanature</nature>
17	</natures>
18	</projectDescription>

Added Link Here

(-)src/org/eclipse/ajdt/core/tests/ajde/CoreCompilerConfigurationTests.java (+280 lines)
1	package org.eclipse.ajdt.core.tests.ajde;
2
3	import java.io.StringReader;
4
5	import org.eclipse.ajdt.core.AspectJCorePreferences;
6	import org.eclipse.ajdt.core.AspectJPlugin;
7	import org.eclipse.ajdt.core.tests.AJDTCoreTestCase;
8	import org.eclipse.ajdt.core.tests.testutils.ReaderInputStream;
9	import org.eclipse.ajdt.core.tests.testutils.TestLogger;
10	import org.eclipse.ajdt.core.tests.testutils.Utils;
11	import org.eclipse.core.resources.IProject;
12	import org.eclipse.core.resources.IncrementalProjectBuilder;
13
14
15	/**
16	* This class tests Bug 245566. The use of ICompilerConfiguration's
17	* api should reduce overhead in preparing for incremenental builds
18	*/
19	public class CoreCompilerConfigurationTests extends AJDTCoreTestCase {
20	private TestLogger testLog;
21
22	protected void setUp() throws Exception {
23	super.setUp();
24	Utils.setAutobuilding(false);
25	testLog = new TestLogger();
26	AspectJPlugin.getDefault().setAJLogger(testLog);
27	AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(true);
28	}
29
30	protected void tearDown() throws Exception {
31	super.tearDown();
32	Utils.setAutobuilding(true);
33	AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(false);
34	}
35
36	// test to ensure that when the switch is turned off, optimization does not occur
37	public void testIncrementalCompilationOptimizationsEnabled() throws Exception {
38
39	assertTrue(AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled());
40	AspectJCorePreferences.setIncrementalCompilationOptimizationsEnabled(false);
41	assertFalse(AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled());
42
43	// load project and full build
44	IProject proj = createPredefinedProject("Bean Example");
45
46	testLog.clearLog();
47
48	proj.getFile("src/bean/Point.java").touch(null);
49
50	// incremental build
51	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
52	waitForAutoBuild();
53
54	// ensure that the classpath entries list has not been set
55	assertEquals(0, testLog.numberOfEntriesForMessage("Setting list of classpath elements with modified contents:"));
56	assertEquals(1, testLog.numberOfEntriesForMessage("Optimizations turned off, so assuming all parts of configuration have changed"));
57	assertEquals(1, testLog.numberOfEntriesForMessage("Configuration was []"));
58	assertEquals(1, testLog.numberOfEntriesForMessage("Resetting list of modified source files. Was [/Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java]"));
59	}
60
61
62	public void testChangeSourceFiles() throws Exception {
63
64	// load project and full build
65	IProject proj = createPredefinedProject("Bean Example");
66
67	// touch source files (one Java and one AJ)
68	proj.getFile("src/bean/Point.java").touch(null);
69	proj.getFile("src/bean/BoundPoint.aj").touch(null);
70
71	testLog.clearLog();
72
73	// incremental build
74	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
75	waitForAutoBuild();
76
77	// look at AJDT Event trace
78	// when build is determining which source files have changed
79	assertEquals(1, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java has changed."));
80	assertEquals(1, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/BoundPoint.aj has changed."));
81
82	// should not happen. this line should only be logged when a file is added or deleted
83	assertEquals(0, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCEFILES_CHANGED]"));
84
85	// during a callback from ajc
86	assertEquals(1, testLog.numberOfEntriesForMessage("build: Examined delta - 2 changed, 0 added, and 0 deleted source files in required project Bean Example"));
87
88	// after compilation can reset configuration
89	assertEquals(1, testLog.numberOfEntriesForMessage("Resetting list of modified source files. Was [/Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/BoundPoint.aj, /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java]"));
90
91	// when the configuration is being reset
92	assertEquals(1, testLog.numberOfEntriesForMessage("Configuration was []"));
93	}
94
95	// also test creating and deleting source files and resources
96	public void testAddDeleteSourceFiles() throws Exception {
97	// load project and full build
98	IProject proj = createPredefinedProject("Bean Example");
99
100	testLog.clearLog();
101
102	// create a Java file and an Aspect file
103	proj.getFile("src/MyJavaFile.java").create(new ReaderInputStream(new StringReader("public class MyJavaFile { }")),
104	true, null);
105	proj.getFile("src/MyAspectFile.aj").create(new ReaderInputStream(new StringReader("public aspect MyAspectFile { }")),
106	true, null);
107
108	// incremental build
109	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
110	waitForAutoBuild();
111
112	// now delete the files
113	proj.getFile("src/MyJavaFile.java").delete(true, null);
114	proj.getFile("src/MyAspectFile.aj").delete(true, null);
115
116	// incremental build
117	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
118	waitForAutoBuild();
119
120	// check log
121
122	// should not have found any changes, only additions and deletions
123	assertEquals(1, testLog.numberOfEntriesForMessage("build: Examined delta - 0 changed, 2 added, and 0 deleted source files in required project Bean Example"));
124	assertEquals(1, testLog.numberOfEntriesForMessage("build: Examined delta - 0 changed, 0 added, and 2 deleted source files in required project Bean Example"));
125
126	// all of these items should appear twice: once on creation and once on deletion
127	assertEquals(2, testLog.numberOfEntriesForMessage("Compiler configuration for project Bean Example has been read by compiler. Resetting."));
128	assertEquals(2, testLog.numberOfEntriesForMessage("Configuration was [PROJECTSOURCEFILES_CHANGED]"));
129	assertEquals(2, testLog.numberOfEntriesForMessage("Resetting list of modified source files. Was []"));
130
131	// occurs 4 times: twice on creation and twice on deletion
132	assertEquals(4, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCEFILES_CHANGED]"));
133
134	// this last entry occurs only once after the aspect is deleted
135	assertEquals(1, testLog.numberOfEntriesForMessage("Preparing for build: not going to be incremental because an aspect was deleted"));
136	}
137
138	public void testClasspathChange() throws Exception {
139	// load project and full build
140	IProject proj = createPredefinedProject("Bean Example");
141
142	// touch classpath
143	proj.getFile(".classpath").touch(null);
144
145	testLog.clearLog();
146
147	// incremental build
148	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
149	waitForAutoBuild();
150
151	// look at AJDT Event trace
152	// the configuration should have registered a change:
153	assertEquals(1, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [ASPECTPATH_CHANGED, CLASSPATH_CHANGED, INPATH_CHANGED]"));
154
155	// classpath has been changed, so should not see this message
156	assertEquals(0, testLog.numberOfEntriesForMessage("build: Examined delta - no source file or classpath changes for project Bean Example"));
157	}
158
159	/**
160	* before the first build after a clean, any changes to the
161	* configuration should not be recorded because the compiler has
162	* nothing to compare the changes to.
163	* @throws Exception
164	*/
165	public void testChangeBeforeBuild() throws Exception {
166	// load project and full build
167	IProject proj = createPredefinedProject("Bean Example");
168
169	testLog.clearLog();
170
171	// now do a clean so that the previous build is forgotten
172	getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, null);
173
174	proj.getFile("src/bean/Point.java").touch(null);
175	proj.getFile("src/bean/BoundPoint.aj").touch(null);
176	proj.getFile(".classpath").touch(null);
177
178	// incremental build
179	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
180	waitForAutoBuild();
181
182
183	// since there was no state before and hence no ResourceDelta,
184	// we know that there must be certain entries missing from the log
185	assertEquals(0, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/Point.java has changed."));
186	assertEquals(0, testLog.numberOfEntriesForMessage("File: /Users/andrew/Eclipse/Workspaces/junit-workspace/Bean Example/src/bean/BoundPoint.aj has changed."));
187	assertEquals(0, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCEFILES_CHANGED]"));
188
189	assertEquals(1, testLog.numberOfEntriesForMessage("Compiler configuration for project Bean Example doesn't know previous state, so assuming EVERYTHING has changed."));
190
191	// and what should we be seeing about the classpath?
192
193	// the previous set of config changes was everything, so
194	// this was sent to the compiler
195	assertEquals(1, testLog.numberOfEntriesForMessage("Configuration was [PROJECTSOURCEFILES_CHANGED, JAVAOPTIONS_CHANGED, ASPECTPATH_CHANGED, CLASSPATH_CHANGED, INPATH_CHANGED, NONSTANDARDOPTIONS_CHANGED, OUTJAR_CHANGED, PROJECTSOURCERESOURCES_CHANGED, OUTPUTDESTINATIONS_CHANGED, INJARS_CHANGED]"));
196	}
197
198	// also test creating and deleting source files and resources
199	public void testAddDeleteChangeReources() throws Exception {
200	// load project and full build
201	IProject proj = createPredefinedProject("Bean Example");
202
203	testLog.clearLog();
204
205	// create a resource
206	proj.getFile("src/nothing.txt").create(new ReaderInputStream(new StringReader("nothing interesting")),
207	true, null);
208
209	// incremental build
210	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
211	waitForAutoBuild();
212
213	// touch the resource
214	proj.getFile("src/nothing.txt").touch(null);
215
216	// incremental build
217	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
218	waitForAutoBuild();
219
220	// delete the resource
221	proj.getFile("src/nothing.txt").delete(true, null);
222
223	// incremental build
224	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
225	waitForAutoBuild();
226
227	// check log
228	// 3 builds, but only 2 should have resource files changed in it
229	// only occurs when resources are added or deleted.
230	assertEquals(2, testLog.numberOfEntriesForMessage("CoreCompilerConfiguration for project Bean Example registered a configuration change: [PROJECTSOURCERESOURCES_CHANGED]"));
231
232	// no source files have changed, though
233	assertEquals(3, testLog.numberOfEntriesForMessage("build: Examined delta - no source file or classpath changes for project Bean Example"));
234
235	// also make sure the file was copied and deleted properly
236	assertEquals(1, testLog.numberOfEntriesForMessage("Copying added file nothing.txt"));
237	assertEquals(1, testLog.numberOfEntriesForMessage("Deleting existing file nothing.txt"));
238	assertEquals(1, testLog.numberOfEntriesForMessage("Copying changed file nothing.txt"));
239	assertEquals(1, testLog.numberOfEntriesForMessage("Deleting removed file nothing.txt"));
240	}
241
242	// now test what happens when the build is broken
243	// not really sure what the behavior should be.
244	public void testBadBuild() throws Exception {
245	// load project and full build
246	IProject proj = createPredefinedProject("Bean Example");
247
248	testLog.clearLog();
249
250	// create a source file
251	proj.getFile("src/MyAspectFile.aj").create(new ReaderInputStream(new StringReader("public aspect MyAspectFile { }")),
252	true, null);
253
254	// incremental build
255	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
256	waitForAutoBuild();
257
258	// add an error to the source file
259	proj.getFile("src/MyAspectFile.aj").appendContents(new ReaderInputStream(new StringReader("XXX")),
260	true, false, null);
261
262	// incremental build
263	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
264	waitForAutoBuild();
265
266
267	// remove the error
268	proj.getFile("src/MyAspectFile.aj").setContents(new ReaderInputStream(new StringReader("public aspect MyAspectFile { }")), 0, null);
269
270	// incremental build
271	getWorkspace().build(IncrementalProjectBuilder.AUTO_BUILD, null);
272	waitForAutoBuild();
273
274	// check log
275	testLog.printLog();
276	}
277
278
279
280	}

Added Link Here

(-)workspace/JavaProj1/.project (+17 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>JavaProj1</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.jdt.core.javabuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	</buildSpec>
14	<natures>
15	<nature>org.eclipse.jdt.core.javanature</nature>
16	</natures>
17	</projectDescription>

Added Link Here

(-)workspace/JavaProj3-ClassFolder/.project (+17 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>JavaProj3-ClassFolder</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.jdt.core.javabuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	</buildSpec>
14	<natures>
15	<nature>org.eclipse.jdt.core.javanature</nature>
16	</natures>
17	</projectDescription>

Removed Link Here

(-)src/org/eclipse/ajdt/internal/core/ResourceChangeListener.java (-69 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.
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	* Luzius Meisser - initial implementation
10	*******************************************************************************/
11	package org.eclipse.ajdt.internal.core;
12
13	import org.eclipse.ajdt.core.AspectJPlugin;
14	import org.eclipse.core.resources.IProject;
15	import org.eclipse.core.resources.IResource;
16	import org.eclipse.core.resources.IResourceChangeEvent;
17	import org.eclipse.core.resources.IResourceChangeListener;
18	import org.eclipse.core.resources.IResourceDelta;
19	import org.eclipse.core.runtime.CoreException;
20
21	public class ResourceChangeListener implements IResourceChangeListener {
22
23	private ResourceDeltaVisitor myDeltaVisitor;
24
25	/*
26	* (non-Javadoc)
27	*
28	* @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
29	*/
30	public ResourceChangeListener() {
31	myDeltaVisitor = new ResourceDeltaVisitor();
32	}
33
34	public void resourceChanged(IResourceChangeEvent event) {
35	if (event.getType() == IResourceChangeEvent.POST_CHANGE) {
36	IResourceDelta delta = event.getDelta();
37	// avoid processing deltas for non-AspectJ projects,
38	if (delta != null) {
39	IResourceDelta[] cd = delta.getAffectedChildren();
40	if (cd == null) {
41	try {
42	delta.accept(myDeltaVisitor);
43	} catch (CoreException e) {
44	}
45	} else {
46	for (int i = 0; i < cd.length; i++) {
47	try {
48	IResource res = cd[i].getResource();
49	if (res == null) {
50	cd[i].accept(myDeltaVisitor);
51	} else {
52	IProject proj = res.getProject();
53	// if we don't know the project, or it is
54	// no longer accessible, we'd better process
55	// the delta. Otherwise we only process it
56	// if it is an AspectJ project.
57	if ((proj == null) \|\| !proj.isAccessible()
58	\|\| AspectJPlugin.isAJProject(proj)) {
59	cd[i].accept(myDeltaVisitor);
60	}
61	}
62	} catch (CoreException e) {
63	}
64	}
65	}
66	}
67	}
68	}
69	}

Lines 22-27 Link Here

(-)src/org/eclipse/ajdt/internal/core/ajde/CoreCompilerConfiguration.java (-20 / +176 lines)
22		22
23	import org.aspectj.ajde.core.ICompilerConfiguration;	23	import org.aspectj.ajde.core.ICompilerConfiguration;
24	import org.aspectj.ajde.core.IOutputLocationManager;	24	import org.aspectj.ajde.core.IOutputLocationManager;
		25	import org.aspectj.ajdt.internal.core.builder.CompilerConfigurationChangeFlags;
25	import org.eclipse.ajdt.core.AJLog;	26	import org.eclipse.ajdt.core.AJLog;
26	import org.eclipse.ajdt.core.AspectJCorePreferences;	27	import org.eclipse.ajdt.core.AspectJCorePreferences;
27	import org.eclipse.ajdt.core.AspectJPlugin;	28	import org.eclipse.ajdt.core.AspectJPlugin;
Lines 47-54 Link Here
47	import org.eclipse.osgi.util.NLS;	48	import org.eclipse.osgi.util.NLS;
48		49
49	/**	50	/**
50	* ICompilerConfiguration implementation which returns information for all methods except getNonStandardOptions().	51	* ICompilerConfiguration implementation which returns information for all
51	*	52	* methods except getNonStandardOptions(). This implementation is used
		53	* if ajdt.core plugin is not present in the platform
52	*/	54	*/
53	public class CoreCompilerConfiguration implements ICompilerConfiguration {	55	public class CoreCompilerConfiguration implements ICompilerConfiguration {
54		56
Lines 56-63 Link Here
56	protected IProject project;	58	protected IProject project;
57	private CoreOutputLocationManager locationManager;	59	private CoreOutputLocationManager locationManager;
58		60
59	public CoreCompilerConfiguration(IProject project) {	61	// fully qualified list of file names that have been touched since
		62	// last build
		63	// set to null originally since we don't know anything
		64	// about build state when first created. Assume everything
		65	// has changed.
		66	private List/* File */ modifiedFiles = null;
		67	// set of flags describing what has changed since last
		68	// build
		69	// initially set to EVERYTHING since we don't know
		70	// build state when first created.
		71	private int configurationChanges;
		72
		73	// list of classpath entries that have been rebuilt since last build
		74	private List /String/ classpathElementsWithModifiedContents = null;
		75
		76	public CoreCompilerConfiguration(IProject project) {
60	this.project = project;	77	this.project = project;
		78	AJLog.log(AJLog.BUILDER, "Compiler configuration for project " + project.getName() + " doesn't know previous state, so assuming EVERYTHING has changed.");
		79	configurationChanges = EVERYTHING;
61	}	80	}
62		81
63	public Map getJavaOptionsMap() {	82	public Map getJavaOptionsMap() {
Lines 434-443 Link Here
434	return result;	453	return result;
435	}	454	}
436		455
437	// List modifiedFiles = new ArrayList();	456	public void addModifiedFile(File changedFile) {
438		457	AJLog.log(AJLog.BUILDER, "File: " + changedFile + " has changed.");
439	public void addModifiedFile(String string) {	458	if (modifiedFiles != null) {
440	// modifiedFiles.add(string);	459	modifiedFiles.add(changedFile);
		460	} else {
		461	AJLog.log(AJLog.BUILDER, " but, we don't have any state yet, so not recording the change.");
		462	}
		463	}
		464
		465	/**
		466	* Flag this compiler configuration as having had a change.
		467	* This is reset after a call to {@link #configurationRead()}
		468	* @param changeFlag change flag from
		469	* {@link CompilerConfigurationChangeFlags}
		470	*/
		471	public void configurationChanged(int changeFlag) {
		472	configurationChanges \|= changeFlag;
		473	logConfigurationChange(changeFlag);
		474	}
		475
		476	private void logConfigurationChange(int changeFlag) {
		477	List changeKind = new ArrayList();
		478	if ((changeFlag & PROJECTSOURCEFILES_CHANGED) != NO_CHANGES) {
		479	changeKind.add("PROJECTSOURCEFILES_CHANGED");
		480	}
		481	if ((changeFlag & JAVAOPTIONS_CHANGED) != NO_CHANGES) {
		482	changeKind.add("JAVAOPTIONS_CHANGED");
		483	}
		484	if ((changeFlag & ASPECTPATH_CHANGED) != NO_CHANGES) {
		485	changeKind.add("ASPECTPATH_CHANGED");
		486	}
		487	if ((changeFlag & CLASSPATH_CHANGED) != NO_CHANGES) {
		488	changeKind.add("CLASSPATH_CHANGED");
		489	}
		490	if ((changeFlag & INPATH_CHANGED) != NO_CHANGES) {
		491	changeKind.add("INPATH_CHANGED");
		492	}
		493	if ((changeFlag & NONSTANDARDOPTIONS_CHANGED) != NO_CHANGES) {
		494	changeKind.add("NONSTANDARDOPTIONS_CHANGED");
		495	}
		496	if ((changeFlag & OUTJAR_CHANGED) != NO_CHANGES) {
		497	changeKind.add("OUTJAR_CHANGED");
		498	}
		499	if ((changeFlag & PROJECTSOURCERESOURCES_CHANGED) != NO_CHANGES) {
		500	changeKind.add("PROJECTSOURCERESOURCES_CHANGED");
		501	}
		502	if ((changeFlag & OUTPUTDESTINATIONS_CHANGED) != NO_CHANGES) {
		503	changeKind.add("OUTPUTDESTINATIONS_CHANGED");
		504	}
		505	// deprecated
		506	if ((changeFlag & INJARS_CHANGED) != NO_CHANGES) {
		507	changeKind.add("INJARS_CHANGED");
		508	}
		509	AJLog.log(AJLog.BUILDER, "CoreCompilerConfiguration for project " + project.getName() + " registered a configuration change: " + changeKind);
		510	}
		511
		512	/**
		513	* converts the current configuration change list to a
		514	* human readable string
		515	* @return human readable string denoting all configuration
		516	* changes since last read.
		517	*/
		518	private String toConfigurationString() {
		519	List changeKind = new ArrayList();
		520	if ((configurationChanges & PROJECTSOURCEFILES_CHANGED) != NO_CHANGES) {
		521	changeKind.add("PROJECTSOURCEFILES_CHANGED");
		522	}
		523	if ((configurationChanges & JAVAOPTIONS_CHANGED) != NO_CHANGES) {
524	changeKind.add("JAVAOPTIONS_CHANGED");
525	}
526	if ((configurationChanges & ASPECTPATH_CHANGED) != NO_CHANGES) {
527	changeKind.add("ASPECTPATH_CHANGED");
528	}
529	if ((configurationChanges & CLASSPATH_CHANGED) != NO_CHANGES) {
530	changeKind.add("CLASSPATH_CHANGED");
531	}
532	if ((configurationChanges & INPATH_CHANGED) != NO_CHANGES) {
533	changeKind.add("INPATH_CHANGED");
534	}
535	if ((configurationChanges & NONSTANDARDOPTIONS_CHANGED) != NO_CHANGES) {
536	changeKind.add("NONSTANDARDOPTIONS_CHANGED");
537	}
538	if ((configurationChanges & OUTJAR_CHANGED) != NO_CHANGES) {
539	changeKind.add("OUTJAR_CHANGED");
540	}
541	if ((configurationChanges & PROJECTSOURCERESOURCES_CHANGED) != NO_CHANGES) {
542	changeKind.add("PROJECTSOURCERESOURCES_CHANGED");
543	}
544	if ((configurationChanges & OUTPUTDESTINATIONS_CHANGED) != NO_CHANGES) {
545	changeKind.add("OUTPUTDESTINATIONS_CHANGED");
546	}
547	// deprecated
548	if ((configurationChanges & INJARS_CHANGED) != NO_CHANGES) {
549	changeKind.add("INJARS_CHANGED");
550	}
551	return changeKind.toString();
441	}	552	}
442		553
443	/**	554	/**
Lines 445-458 Link Here
445	* build.	556	* build.
446	*/	557	*/
447	public void configurationRead() {	558	public void configurationRead() {
		559	// we now know nothing has changed
		560	AJLog.log(AJLog.BUILDER, "Compiler configuration for project " + project.getName() + " has been read by compiler. Resetting.");
		561	AJLog.log(AJLog.BUILDER, " Configuration was " + toConfigurationString());
		562
		563	// we are still not keeping track of some changes:
		564	// JAVAOPTIONS_CHANGED \| NONSTANDARDOPTIONS_CHANGED \| OUTJAR_CHANGED \|
		565	// OUTPUTDESTINATIONS_CHANGED \| INJARS_CHANGED
		566	configurationChanges = NO_CHANGES;
		567	resetModifiedList();
448	}	568	}
449		569
450	/**	570	/**
451	* Need to tell AspectJ what has changed in the configuration since the last build was done - the lazy answer (which causes it	571	* Need to tell AspectJ what has changed in the configuration since the last build was done - the lazy answer (which causes it
452	* to behave as it always used to) is EVERYTHING.	572	* to behave as it always used to) is EVERYTHING.
		573	*
		574	* @see CompilerConfigurationChangeFlags
		575	* @see AspectJCorePreferences#isIncrementalCompilationOptimizationsEnabled
453	*/	576	*/
454	public int getConfigurationChanges() {	577	public int getConfigurationChanges() {
455	return EVERYTHING;	578	// if the optimization flag is turned off, then return EVERYTHING
		579	if (!AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled()) {
		580	AJLog.log(AJLog.BUILDER, "Optimizations turned off, so assuming all parts of configuration have changed");
		581	return EVERYTHING;
		582	} else {
		583	AJLog.log(AJLog.BUILDER, "Sending the following configuration changes to the compiler: " + toConfigurationString());
		584	return AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled() ? configurationChanges : EVERYTHING;
		585	}
456	}	586	}
457		587
458	/**	588	/**
Lines 460-481 Link Here
460	* analysing delta changes. Returning null means we have no idea and will cause AspectJ to do the analysis to work it out.	590	* analysing delta changes. Returning null means we have no idea and will cause AspectJ to do the analysis to work it out.
461	*/	591	*/
462	public List getProjectSourceFilesChanged() {	592	public List getProjectSourceFilesChanged() {
463	return null;// null means we dont know	593	if (!AspectJCorePreferences.isIncrementalCompilationOptimizationsEnabled()) {
464	// if (modifiedFiles == null) {	594	AJLog.log(AJLog.BUILDER, "Optimizations turned off, so assuming all source files have changed");
465	// AJLog.log("Nothing changed??");	595	return null;
466	// } else {	596	} else if (modifiedFiles == null) {
467	// AJLog.log(modifiedFiles.size() + " changes");	597	// null means we dont know
468	// }	598	AJLog.log(AJLog.BUILDER, "We don't know what has changed since last build, so assuming all source files have changed");
469	// if (modifiedFiles.isEmpty())	599	return null;
470	// return null;	600	} else {
471	// return modifiedFiles;	601	AJLog.log(AJLog.BUILDER, modifiedFiles.size() + " source file changes since last build");
		602	return modifiedFiles;
		603	}
472	}	604	}
473		605
474	public void resetModifiedList() {	606	public void resetModifiedList() {
475	// modifiedFiles.clear();	607	AJLog.log(AJLog.BUILDER, "Resetting list of modified source files. Was " +
		608	(modifiedFiles == null ? "null" : modifiedFiles.toString()));
		609	modifiedFiles = new ArrayList();
		610	}
		611
		612	public void resetClasspathElementsWithModifiedContents() {
		613	classpathElementsWithModifiedContents = null;
		614	}
		615	public void setClasspathElementsWithModifiedContents(List /String/ modifiedContents) {
		616	AJLog.log(AJLog.BUILDER, "Setting list of classpath elements with modified contents:");
		617	AJLog.log(AJLog.BUILDER, " " + modifiedContents.toString());
		618	classpathElementsWithModifiedContents = modifiedContents;
		619	}
		620
		621	// must go through the classpath and look at projects we depend on that have been built before our
		622	// most recent last build
		623	public List getClasspathElementsWithModifiedContents() {
		624	return classpathElementsWithModifiedContents;
476	}	625	}
477		626
478	public List getClasspathElementsWithModifiedContents() {	627
479	return null;	628	/**
		629	* helper method that grabs the compiler configuration for a particular project
		630	* creates one if it does not exist
		631	* @param project
		632	* @return the project's compiler configuration
		633	*/
		634	public static CoreCompilerConfiguration getCompilerConfigurationForProject(IProject project) {
		635	return (CoreCompilerConfiguration) AspectJPlugin.getDefault().getCompilerFactory().getCompilerForProject(project).getCompilerConfiguration();
480	}	636	}
481	}	637	}

Lines 12-20 Link Here

(-)src/org/eclipse/ajdt/core/BuildConfig.java (-1 / +45 lines)
12	package org.eclipse.ajdt.core;	12	package org.eclipse.ajdt.core;
13		13
14	import java.util.ArrayList;	14	import java.util.ArrayList;
		15	import java.util.HashSet;
15	import java.util.Iterator;	16	import java.util.Iterator;
16	import java.util.List;	17	import java.util.List;
17	import java.util.Map;	18	import java.util.Map;
		19	import java.util.Set;
18	import java.util.WeakHashMap;	20	import java.util.WeakHashMap;
19		21
20	import org.eclipse.core.resources.IContainer;	22	import org.eclipse.core.resources.IContainer;
Lines 33-39 Link Here
33		35
34	public class BuildConfig {	36	public class BuildConfig {
35		37
36	private static Map projectsToIncludedSourceFiles = new WeakHashMap();	38	private static Map /IProject, List<IFile>/ projectsToIncludedSourceFiles = new WeakHashMap();
37		39
38	/**	40	/**
39	* Returns all of the currently included source files in a project	41	* Returns all of the currently included source files in a project
Lines 74-79 Link Here
74	projectsToIncludedSourceFiles.put(project, sourceFiles);	76	projectsToIncludedSourceFiles.put(project, sourceFiles);
75	return sourceFiles;	77	return sourceFiles;
76	}	78	}
		79
		80
		81
		82	/**
		83	* Experimental version of above that uses a set, not a list
		84	* @param project
		85	* @return
		86	*/
		87	public static Set /* IFile */getIncludedSourceFilesSet(IProject project) {
		88	if (projectsToIncludedSourceFiles.get(project) instanceof List) {
		89	return (Set) projectsToIncludedSourceFiles.get(project);
		90	}
		91	Set sourceFiles = new HashSet();
		92	try {
		93	IJavaProject jp = JavaCore.create(project);
		94	IClasspathEntry[] cpes = jp.getRawClasspath();
		95	for (int i = 0; i < cpes.length; i++) {
		96	if ((cpes[i] instanceof ClasspathEntry)
		97	&& (cpes[i].getEntryKind() == IClasspathEntry.CPE_SOURCE)) {
		98	ClasspathEntry cp = (ClasspathEntry) cpes[i];
		99	char[][] incl = cp.fullInclusionPatternChars();
		100	char[][] excl = cp.fullExclusionPatternChars();
		101	IPath path = cpes[i].getPath();
		102	IResource res = project.findMember(path
		103	.removeFirstSegments(1));
		104	if ((res != null) && (res instanceof IContainer)) {
		105	List l = allFiles((IContainer) res);
		106	for (Iterator iter = l.iterator(); iter.hasNext();) {
		107	IFile file = (IFile) iter.next();
		108	if (!Util.isExcluded(file, incl, excl)) {
		109	sourceFiles.add(file);
		110	}
		111	}
		112	}
		113	}
		114	}
		115	} catch (JavaModelException e) {
		116	}
		117	projectsToIncludedSourceFiles.put(project, sourceFiles);
		118	return sourceFiles;
		119	}
		120
77		121
78	/**	122	/**
79	* Invalidate the list of included source files for a project	123	* Invalidate the list of included source files for a project

Lines 45-50 Link Here

(-)src/org/eclipse/ajdt/core/AspectJCorePreferences.java (+18 lines)
45	public class AspectJCorePreferences {	45	public class AspectJCorePreferences {
46		46
47	public static final String OPTION_AutobuildSuppressed = "org.eclipse.ajdt.ui.builder.autobuildSuppressed"; //$NON-NLS-1$	47	public static final String OPTION_AutobuildSuppressed = "org.eclipse.ajdt.ui.builder.autobuildSuppressed"; //$NON-NLS-1$
		48	public static final String OPTION_IncrementalCompilationOptimizations = "org.eclipse.ajdt.ui.builder.incrementalCompilationOptimizations"; //$NON-NLS-1$
48		49
49		50
50	private static final String ASPECTPATH_ATTRIBUTE_NAME = "org.eclipse.ajdt.aspectpath"; //$NON-NLS-1$	51	private static final String ASPECTPATH_ATTRIBUTE_NAME = "org.eclipse.ajdt.aspectpath"; //$NON-NLS-1$
Lines 990-994 Link Here
990	.getPluginPreferences();	991	.getPluginPreferences();
991	store.setValue(OPTION_AutobuildSuppressed, done);	992	store.setValue(OPTION_AutobuildSuppressed, done);
992	}	993	}
		994
		995	/**
		996	* Checks to see if the compiler option for incremental build optimizations
		997	* is on or off
		998	* @return
		999	*/
		1000	public static boolean isIncrementalCompilationOptimizationsEnabled() {
		1001	Preferences store = AspectJPlugin.getDefault()
		1002	.getPluginPreferences();
		1003	return store.getBoolean(OPTION_IncrementalCompilationOptimizations);
		1004	}
		1005
		1006	public static void setIncrementalCompilationOptimizationsEnabled(boolean value) {
		1007	Preferences store = AspectJPlugin.getDefault()
		1008	.getPluginPreferences();
		1009	store.setValue(OPTION_IncrementalCompilationOptimizations, value);
		1010	}
993		1011
994	}	1012	}

Added Link Here

(-)src/org/eclipse/ajdt/internal/core/CompilerConfigResourceDeltaVisitor.java (+61 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.
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	* Luzius Meisser - initial implementation
10	* Matthew Ford - Bug 154339
11	* Helen Hawkins - updated for new ajde interface (bug 148190)
12	*******************************************************************************/
13	package org.eclipse.ajdt.internal.core;
14
15	import org.eclipse.ajdt.core.AspectJPlugin;
16	import org.eclipse.core.resources.IResource;
17	import org.eclipse.core.resources.IResourceDelta;
18	import org.eclipse.core.resources.IResourceDeltaVisitor;
19
20	/**
21	* Removes stored compiler info for projects when they are deleted or closed.
22	*
23	*/
24	public class CompilerConfigResourceDeltaVisitor implements IResourceDeltaVisitor {
25
26	/*
27	* (non-Javadoc)
28	*
29	* @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
30	*/
31	public CompilerConfigResourceDeltaVisitor() {
32	}
33
34	/*
35	* (non-Javadoc)
36	*
37	* @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
38	*/
39	public boolean visit(IResourceDelta delta) {
40	IResource myRes = delta.getResource();
41	if (myRes.getType() == IResource.PROJECT) {
42	switch (delta.getKind()) {
43	case IResourceDelta.REMOVED:
44	// remove the compiler associated with this project from the factory
45	AspectJPlugin.getDefault().getCompilerFactory()
46	.removeCompilerForProject(myRes.getProject());
47	break;
48	case IResourceDelta.CHANGED:
49	if (!myRes.getProject().isOpen()) {
50	// remove the compiler associated with this project from the
51	// factory - project could remain closed indefinitely, therefore,
52	// don't want to hang on to the compiler instance
53	AspectJPlugin.getDefault().getCompilerFactory()
54	.removeCompilerForProject(myRes.getProject());
55	}
56	break;
57	}
58	}
59	return true;
60	}
61	}

Lines 24-30 Link Here

(-)src/org/eclipse/ajdt/ui/AspectJUIPlugin.java (-2 / +2 lines)
24	import org.eclipse.ajdt.core.javaelements.AJCompilationUnitManager;	24	import org.eclipse.ajdt.core.javaelements.AJCompilationUnitManager;
25	import org.eclipse.ajdt.internal.builder.UIBuildListener;	25	import org.eclipse.ajdt.internal.builder.UIBuildListener;
26	import org.eclipse.ajdt.internal.core.ajde.ICompilerFactory;	26	import org.eclipse.ajdt.internal.core.ajde.ICompilerFactory;
27	import org.eclipse.ajdt.internal.javamodel.ResourceChangeListener;	27	import org.eclipse.ajdt.internal.javamodel.AJCompilationUnitResourceChangeListener;
28	import org.eclipse.ajdt.internal.ui.ajde.UICompilerFactory;	28	import org.eclipse.ajdt.internal.ui.ajde.UICompilerFactory;
29	import org.eclipse.ajdt.internal.ui.editor.AspectJTextTools;	29	import org.eclipse.ajdt.internal.ui.editor.AspectJTextTools;
30	import org.eclipse.ajdt.internal.ui.lazystart.Utils;	30	import org.eclipse.ajdt.internal.ui.lazystart.Utils;
Lines 277-283 Link Here
277	// listener for aspectj model	277	// listener for aspectj model
278	if (!AspectJPlugin.usingCUprovider) {	278	if (!AspectJPlugin.usingCUprovider) {
279	AspectJPlugin.getWorkspace().addResourceChangeListener(	279	AspectJPlugin.getWorkspace().addResourceChangeListener(
280	new ResourceChangeListener(),	280	new AJCompilationUnitResourceChangeListener(),
281	IResourceChangeEvent.PRE_CLOSE	281	IResourceChangeEvent.PRE_CLOSE
282	\| IResourceChangeEvent.PRE_DELETE	282	\| IResourceChangeEvent.PRE_DELETE
283	\| IResourceChangeEvent.POST_CHANGE	283	\| IResourceChangeEvent.POST_CHANGE

Removed Link Here

(-)src/org/eclipse/ajdt/internal/javamodel/ResourceChangeListener.java (-69 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.
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	* Luzius Meisser - initial implementation
10	*******************************************************************************/
11	package org.eclipse.ajdt.internal.javamodel;
12	import org.eclipse.ajdt.core.AspectJPlugin;
13	import org.eclipse.core.resources.IProject;
14	import org.eclipse.core.resources.IResource;
15	import org.eclipse.core.resources.IResourceChangeEvent;
16	import org.eclipse.core.resources.IResourceChangeListener;
17	import org.eclipse.core.resources.IResourceDelta;
18	import org.eclipse.core.runtime.CoreException;
19	/**
20	* @author Luzius Meisser
21	*
22	*/
23	public class ResourceChangeListener implements IResourceChangeListener {
24	private ResourceDeltaVisitor myDeltaVisitor;
25	/*
26	* (non-Javadoc)
27	*
28	* @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
29	*/
30	public ResourceChangeListener() {
31	myDeltaVisitor = new ResourceDeltaVisitor();
32	}
33
34	public void resourceChanged(IResourceChangeEvent event) {
35	if (event.getType() == IResourceChangeEvent.POST_CHANGE){
36	IResourceDelta delta = event.getDelta();
37	// avoid processing deltas for non-AspectJ projects,
38	if (delta != null) {
39	IResourceDelta[] cd = delta.getAffectedChildren();
40	if (cd == null) {
41	try {
42	delta.accept(myDeltaVisitor);
43	} catch (CoreException e) {
44	}
45	} else {
46	for (int i = 0; i < cd.length; i++) {
47	try {
48	IResource res = cd[i].getResource();
49	if (res == null) {
50	cd[i].accept(myDeltaVisitor);
51	} else {
52	IProject proj = res.getProject();
53	// if we don't know the project, or it is
54	// no longer accessible, we'd better process
55	// the delta. Otherwise we only process it
56	// if it is an AspectJ project.
57	if ((proj == null) \|\| !proj.isAccessible()
58	\|\| AspectJPlugin.isAJProject(proj)) {
59	cd[i].accept(myDeltaVisitor);
60	}
61	}
62	} catch (CoreException e) {
63	}
64	}
65	}
66	}
67	}
68	}
69	}